fix evaluation order bug (patch 1158099)

[wxWidgets.git] / contrib / src / fl / frmview.cpp

diff --git a/contrib/src/fl/frmview.cpp b/contrib/src/fl/frmview.cpp
index 19d65e5efde03596aba9e84238c9c506eb2192e7..22e59c57ad46c234655276e4c5a00ab9dbce9145 100644 (file)
--- a/contrib/src/fl/frmview.cpp
+++ b/contrib/src/fl/frmview.cpp
@@ -41,9 +41,6 @@ void wxFrameView::OnIdle( wxIdleEvent& event)
 
     if ( mDoToolUpdates )
     {
-        int o = 0;  //glt
-        ++o;
-
         // TBD::
     }
 }
@@ -83,7 +80,7 @@ void wxFrameView::Deactivate()
 
 void wxFrameView::CreateLayout()
 {
-    mpLayout = new wxFrameLayout( GetParentFrame(), mpFrameMgr->GetClientWindow(), FALSE );
+    mpLayout = new wxFrameLayout( GetParentFrame(), mpFrameMgr->GetClientWindow(), false );
 }
 
 wxFrameLayout* wxFrameView::GetLayout()
@@ -171,7 +168,7 @@ void wxFrameManager::DestroyViews()
 {
     DeactivateCurrentView();
 
-    wxNode* pNode = mViews.GetFirst();
+    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
 
     while ( pNode )
     {
@@ -187,7 +184,7 @@ void wxFrameManager::DestroyViews()
 
 int wxFrameManager::GetViewNo( wxFrameView* pView )
 {
-    wxNode* pNode = mViews.GetFirst();
+    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
     int n = 0;
 
     while ( pNode )
@@ -211,7 +208,7 @@ void wxFrameManager::EnableMenusForView( wxFrameView* pView, bool enable )
     if ( !pMenuBar )
         return;
 
-    wxStringListNode* pNode = pView->mTopMenus.GetFirst();
+    wxStringList::compatibility_iterator pNode = pView->mTopMenus.GetFirst();
 
     int i;
     while ( pNode )
@@ -228,19 +225,19 @@ void wxFrameManager::EnableMenusForView( wxFrameView* pView, bool enable )
 
 void wxFrameManager::SyncAllMenus()
 {
-    wxNode* pNode = mViews.GetFirst();
+    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
     int i = 0;
 
     while ( pNode )
     {
         if ( i != mActiveViewNo )
 
-            EnableMenusForView( (wxFrameView*)pNode->GetData(), FALSE );
+            EnableMenusForView( (wxFrameView*)pNode->GetData(), false );
 
         pNode = pNode->GetNext();
     }
 
-    EnableMenusForView( GetView( mActiveViewNo ), TRUE );
+    EnableMenusForView( GetView( mActiveViewNo ), true );
 }
 
 /*** public methods ***/
@@ -264,7 +261,7 @@ void wxFrameManager::Init( wxWindow* pMainFrame, const wxString& settingsFile )
     mSettingsFile = settingsFile;
     mpFrameWnd    = pMainFrame;
 
-    wxNode* pNode = mViews.GetFirst();
+    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
 
     while ( pNode )
     {
@@ -321,13 +318,13 @@ int wxFrameManager::GetActiveViewNo()
 
 wxFrameView* wxFrameManager::GetActiveView()
 {
-    wxNode* pNode = mViews.Item( mActiveViewNo );
+    wxObjectList::compatibility_iterator pNode = mViews.Item( mActiveViewNo );
 
     if ( pNode ) return (wxFrameView*)pNode->GetData();
             else return NULL;
 }
 
-wxNode* wxFrameManager::GetActiveViewNode()
+wxObjectList::compatibility_iterator wxFrameManager::GetActiveViewNode()
 {
     return mViews.Item( mActiveViewNo );
 }
@@ -344,7 +341,7 @@ wxWindow* wxFrameManager::GetParentWindow()
 
 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;
@@ -371,7 +368,7 @@ void wxFrameManager::ActivateView( wxFrameView* pFrmView )
 
     GetParentFrame()->PushEventHandler( pFrmView );
 
-    EnableMenusForView( pFrmView, TRUE );
+    EnableMenusForView( pFrmView, true );
 }
 
 void wxFrameManager::SetClinetWindow( wxWindow* pFrameClient )
@@ -405,7 +402,7 @@ void wxFrameManager::DeactivateCurrentView()
     if ( pView->mpLayout )
         pView->mpLayout->Deactivate();
 
-    EnableMenusForView( pView, FALSE );
+    EnableMenusForView( pView, false );
 }
 
 void wxFrameManager::SaveViewsNow()
@@ -423,12 +420,12 @@ void wxFrameManager::SaveViewsNow()
 
 bool wxFrameManager::ReloadViews()
 {
-    return FALSE;
+    return false;
 
     // TBD: ????
 #if 0
     if ( mSettingsFile == "" || !wxFileExists( mSettingsFile ) ) 
-        return FALSE;
+        return false;
 
     DestroyViews();
 
@@ -438,7 +435,7 @@ bool wxFrameManager::ReloadViews()
     mStore.SetDataStream( stm );
     DoSerialize( mStore );
 
-    return TRUE;
+    return true;
 #endif
 }