wxUSE_STL fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/fl/frmview.h b/contrib/include/wx/fl/frmview.h
index 2c9513c1f2b66409eefd299359589985a28a1c5d..7d339c3b8ce9b1510dc4a0b394dbb39684271b91 100644 (file)
--- a/contrib/include/wx/fl/frmview.h
+++ b/contrib/include/wx/fl/frmview.h
@@ -123,7 +123,7 @@ public:
 
     int GetActiveViewNo();
     wxFrameView* GetActiveView();
 
     int GetActiveViewNo();
     wxFrameView* GetActiveView();

-    wxNode* GetActiveViewNode();
+    wxObjectList::compatibility_iterator GetActiveViewNode();

 
     wxFrameView* GetView( int viewNo );
 
 
     wxFrameView* GetView( int viewNo );
 

diff --git a/contrib/include/wx/fl/garbagec.h b/contrib/include/wx/fl/garbagec.h
index a80595daab325b1d41ded69546d137e6de5e5b50..5e3da01ef7184903535363e6353cd5749fda5e08 100644 (file)
--- a/contrib/include/wx/fl/garbagec.h
+++ b/contrib/include/wx/fl/garbagec.h
@@ -25,7 +25,7 @@ struct GCItem
     wxList    mRefs;   // references to other nodes
 };
 
     wxList    mRefs;   // references to other nodes
 };
 

-inline void* gc_node_to_obj( wxNode* pGCNode )
+inline void* gc_node_to_obj( wxObjectList::compatibility_iterator pGCNode )

 {
     return ( (GCItem*) (pGCNode->GetData()) )->mpObj;
 }
 {
     return ( (GCItem*) (pGCNode->GetData()) )->mpObj;
 }

diff --git a/contrib/src/fl/controlbar.cpp b/contrib/src/fl/controlbar.cpp
index 5adc722a20cb8f2cc8c82cf3386734b65d46d86b..ab23f7e10e70ef60130d88a37e784c99cee03f05 100644 (file)
--- a/contrib/src/fl/controlbar.cpp
+++ b/contrib/src/fl/controlbar.cpp
@@ -406,7 +406,7 @@ void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
 
 void wxFrameLayout::DestroyBarWindows()
 {
 
 void wxFrameLayout::DestroyBarWindows()
 {

-    wxNode* pSpy = mBarSpyList.GetFirst();
+    wxObjectList::compatibility_iterator pSpy = mBarSpyList.GetFirst();

 
     while( pSpy )
     {
 
     while( pSpy )
     {


@@ -436,7 +436,7 @@ void wxFrameLayout::DestroyBarWindows()
 
 void wxFrameLayout::ShowFloatedWindows( bool show )
 {
 
 void wxFrameLayout::ShowFloatedWindows( bool show )
 {

-    wxNode* pNode = mFloatedFrames.GetFirst();
+    wxObjectList::compatibility_iterator pNode = mFloatedFrames.GetFirst();

 
     while( pNode )
     {
 
     while( pNode )
     {


@@ -496,7 +496,7 @@ wxFrameLayout::~wxFrameLayout()
     if ( mpNECursor     ) 
         delete mpNECursor;
 
     if ( mpNECursor     ) 
         delete mpNECursor;
 

-    wxNode* pSpy = mBarSpyList.GetFirst();
+    wxObjectList::compatibility_iterator pSpy = mBarSpyList.GetFirst();

 
     while( pSpy )
     {
 
     while( pSpy )
     {


@@ -723,7 +723,7 @@ void wxFrameLayout::SetBarState( cbBarInfo* pBar, int newState, bool updateNow )
         {
             pBar->mpBarWnd->Show(false); // to avoid flicker upon reparenting
 
         {
             pBar->mpBarWnd->Show(false); // to avoid flicker upon reparenting
 

-            wxNode* pNode = mFloatedFrames.GetFirst();
+            wxObjectList::compatibility_iterator pNode = mFloatedFrames.GetFirst();

 
             while( pNode )
             {
 
             while( pNode )
             {


@@ -741,7 +741,7 @@ void wxFrameLayout::SetBarState( cbBarInfo* pBar, int newState, bool updateNow )
 
                         pBar->mAlignment = pBar->mDimInfo.mLRUPane;
 
 
                         pBar->mAlignment = pBar->mDimInfo.mLRUPane;
 

-                    mFloatedFrames.DeleteNode( pNode );
+                    mFloatedFrames.Erase( pNode );

 
                     pFFrm->Show( false );
                     pFFrm->Destroy(); break;
 
                     pFFrm->Show( false );
                     pFFrm->Destroy(); break;


@@ -834,7 +834,7 @@ void wxFrameLayout::RepositionFloatedBar( cbBarInfo* pBar )
 {
     if ( !(mFloatingOn && pBar->mFloatingOn)) return;
 
 {
     if ( !(mFloatingOn && pBar->mFloatingOn)) return;
 

-    wxNode* pNode = mFloatedFrames.GetFirst();
+    wxObjectList::compatibility_iterator pNode = mFloatedFrames.GetFirst();

 
     while( pNode )
     {
 
     while( pNode )
     {


@@ -2181,7 +2181,7 @@ cbDockPane::~cbDockPane()
     for ( i = 0; i != mRows.Count(); ++i )
         delete mRows[i];
 
     for ( i = 0; i != mRows.Count(); ++i )
         delete mRows[i];
 

-    mRowShapeData.DeleteContents( true );
+    WX_CLEAR_LIST(wxList,mRowShapeData)

     
     // NOTE:: control bar infromation structures are cleaned-up
     //        in wxFrameLayout's destructor, using global control-bar list
     
     // NOTE:: control bar infromation structures are cleaned-up
     //        in wxFrameLayout's destructor, using global control-bar list


@@ -3472,7 +3472,11 @@ cbBarInfo* cbDockPane::GetBarInfoByWindow( wxWindow* pBarWnd )
 
 void cbDockPane::GetRowShapeData( cbRowInfo* pRow, wxList* pLst )
 {
 
 void cbDockPane::GetRowShapeData( cbRowInfo* pRow, wxList* pLst )
 {

-    pLst->DeleteContents( true );
+    if(pLst)
+    {
+        WX_CLEAR_LIST(wxList,*pLst);
+    }
+

     pLst->Clear();
 
     size_t i;
     pLst->Clear();
 
     size_t i;


@@ -3494,7 +3498,7 @@ void cbDockPane::SetRowShapeData( cbRowInfo* pRow, wxList* pLst )
     if ( pLst->GetFirst() == NULL )
         return;
 
     if ( pLst->GetFirst() == NULL )
         return;
 

-    wxNode* pData = pLst->GetFirst();
+    wxObjectList::compatibility_iterator pData = pLst->GetFirst();

 
     size_t i;
     for ( i = 0; i != pRow->mBars.Count(); ++i )
 
     size_t i;
     for ( i = 0; i != pRow->mBars.Count(); ++i )

diff --git a/contrib/src/fl/frmview.cpp b/contrib/src/fl/frmview.cpp
index 4246df8caf95049fc0b735e82d855286adefb27c..67ee842b1a4560dc9d1c24c333e18dadec2c4bcd 100644 (file)
--- a/contrib/src/fl/frmview.cpp
+++ b/contrib/src/fl/frmview.cpp
@@ -168,7 +168,7 @@ void wxFrameManager::DestroyViews()
 {
     DeactivateCurrentView();
 
 {
     DeactivateCurrentView();
 

-    wxNode* pNode = mViews.GetFirst();
+    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();

 
     while ( pNode )
     {
 
     while ( pNode )
     {


@@ -184,7 +184,7 @@ void wxFrameManager::DestroyViews()
 
 int wxFrameManager::GetViewNo( wxFrameView* pView )
 {
 
 int wxFrameManager::GetViewNo( wxFrameView* pView )
 {

-    wxNode* pNode = mViews.GetFirst();
+    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();

     int n = 0;
 
     while ( pNode )
     int n = 0;
 
     while ( pNode )


@@ -225,7 +225,7 @@ void wxFrameManager::EnableMenusForView( wxFrameView* pView, bool enable )
 
 void wxFrameManager::SyncAllMenus()
 {
 
 void wxFrameManager::SyncAllMenus()
 {

-    wxNode* pNode = mViews.GetFirst();
+    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();

     int i = 0;
 
     while ( pNode )
     int i = 0;
 
     while ( pNode )


@@ -261,7 +261,7 @@ void wxFrameManager::Init( wxWindow* pMainFrame, const wxString& settingsFile )
     mSettingsFile = settingsFile;
     mpFrameWnd    = pMainFrame;
 
     mSettingsFile = settingsFile;
     mpFrameWnd    = pMainFrame;
 

-    wxNode* pNode = mViews.GetFirst();
+    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();

 
     while ( pNode )
     {
 
     while ( pNode )
     {


@@ -318,13 +318,13 @@ int wxFrameManager::GetActiveViewNo()
 
 wxFrameView* wxFrameManager::GetActiveView()
 {
 
 wxFrameView* wxFrameManager::GetActiveView()
 {

-    wxNode* pNode = mViews.Item( mActiveViewNo );
+    wxObjectList::compatibility_iterator pNode = mViews.Item( mActiveViewNo );

 
     if ( pNode ) return (wxFrameView*)pNode->GetData();
             else return NULL;
 }
 
 
     if ( pNode ) return (wxFrameView*)pNode->GetData();
             else return NULL;
 }
 

-wxNode* wxFrameManager::GetActiveViewNode()
+wxObjectList::compatibility_iterator wxFrameManager::GetActiveViewNode()

 {
     return mViews.Item( mActiveViewNo );
 }
 {
     return mViews.Item( mActiveViewNo );
 }


@@ -341,7 +341,7 @@ wxWindow* wxFrameManager::GetParentWindow()
 
 wxFrameView* wxFrameManager::GetView( int viewNo )
 {
 
 wxFrameView* wxFrameManager::GetView( int viewNo )
 {

-    wxNode* pNode = mViews.Item( viewNo );
+    wxObjectList::compatibility_iterator pNode = mViews.Item( viewNo );

 
     if ( pNode ) return (wxFrameView*)pNode->GetData();
             else return NULL;
 
     if ( pNode ) return (wxFrameView*)pNode->GetData();
             else return NULL;