AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxUSE_STL fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2004-07-30 15:41:00 +00:00
parent c7f8ebf848
commit 8b567f9b46
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
demos/dbbrowse/tabpgwin.cpp
View File

@ -157,7 +157,7 @@ wxTabbedWindow::wxTabbedWindow()
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
wxTabbedWindow::~wxTabbedWindow() wxTabbedWindow::~wxTabbedWindow()
{ {
wxNode* pTab = mTabs.GetFirst(); wxObjectList::compatibility_iterator pTab = mTabs.GetFirst();
while( pTab ) while( pTab )
{ {
@ -169,7 +169,7 @@ wxTabbedWindow::~wxTabbedWindow()
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void wxTabbedWindow::SizeTabs(int x,int y, int width, int height, bool WXUNUSED(repant)) void wxTabbedWindow::SizeTabs(int x,int y, int width, int height, bool WXUNUSED(repant))
{ {
wxNode* pTabNode = mTabs.GetFirst(); wxObjectList::compatibility_iterator pTabNode = mTabs.GetFirst();
size_t n = 0; size_t n = 0;
while( pTabNode ) while( pTabNode )
@ -252,7 +252,7 @@ void wxTabbedWindow::RemoveTab( int tabNo )
twTabInfo* pTab = ((twTabInfo*)(mTabs.Item( tabNo )->GetData())); twTabInfo* pTab = ((twTabInfo*)(mTabs.Item( tabNo )->GetData()));
pTab->mpContent->Destroy(); pTab->mpContent->Destroy();
delete pTab; delete pTab;
mTabs.DeleteNode( mTabs.Item( tabNo ) ); mTabs.Erase( mTabs.Item( tabNo ) );
// if ( mActiveTab >= mTabs.GetCount() ); // if ( mActiveTab >= mTabs.GetCount() );
if ( mActiveTab >= mTabs.GetCount() ) if ( mActiveTab >= mTabs.GetCount() )
mActiveTab = mTabs.GetCount() - 1; mActiveTab = mTabs.GetCount() - 1;
@ -364,7 +364,7 @@ void wxTabbedWindow::DrawDecorations( wxDC& dc )
curY = height - mVertGap - mTitleHeight; curY = height - mVertGap - mTitleHeight;
size_t tabNo = 0; size_t tabNo = 0;
wxNode* pNode = mTabs.GetFirst(); wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
while( pNode ) while( pNode )
{ {
@ -453,7 +453,7 @@ int wxTabbedWindow::HitTest( const wxPoint& pos )
int curY = height - mVertGap - mTitleHeight; int curY = height - mVertGap - mTitleHeight;
int tabNo = 0; int tabNo = 0;
wxNode* pNode = mTabs.GetFirst(); wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
while( pNode ) while( pNode )
{ {
@ -482,7 +482,7 @@ void wxTabbedWindow::HideInactiveTabs( bool andRepaint )
if ( !andRepaint ) if ( !andRepaint )
return; return;
wxNode* pNode = mTabs.GetFirst(); wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
size_t tabNo = 0; size_t tabNo = 0;
while( pNode ) while( pNode )
@ -541,7 +541,7 @@ void wxTabbedWindow::RecalcLayout(bool andRepaint)
mLayoutType = wxTITLE_IMG_AND_TEXT; mLayoutType = wxTITLE_IMG_AND_TEXT;
wxNode* pNode = mTabs.GetFirst(); wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
curX = mFirstTitleGap; // the left-side gap curX = mFirstTitleGap; // the left-side gap
mTitleHeight = 0; mTitleHeight = 0;
@ -768,7 +768,7 @@ wxScrollBar& wxPagedWindow::GetHorizontalScrollBar()
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
int wxPagedWindow::GetWholeTabRowLen() int wxPagedWindow::GetWholeTabRowLen()
{ {
wxNode* pNode = mTabs.GetFirst(); wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
int len = 0; int len = 0;
@ -861,7 +861,7 @@ void wxPagedWindow::DrawDecorations( wxDC& dc )
// draw inactive tab title bars frist (left-to-right) // draw inactive tab title bars frist (left-to-right)
wxNode* pNode = mTabs.GetFirst(); wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
size_t tabNo = 0; size_t tabNo = 0;
/* OLD STUFF:: /* OLD STUFF::
@ -1033,7 +1033,7 @@ void wxPagedWindow::RecalcLayout(bool andRepaint)
mLayoutType = wxTITLE_IMG_AND_TEXT; mLayoutType = wxTITLE_IMG_AND_TEXT;
wxNode* pNode = mTabs.GetFirst(); wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
while( pNode ) while( pNode )
{ {