Include wx/dialog.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/contrib/src/fl/frmview.cpp b/contrib/src/fl/frmview.cpp
index 0ed194084f204b2fe5d6e13a08df8cd18a169419..56730f2cd33538e9c88c722c0780f41b85fdfe6f 100644 (file)
--- a/contrib/src/fl/frmview.cpp
+++ b/contrib/src/fl/frmview.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
  
-#ifdef __GNUG__
-    #pragma implementation "frmview.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -41,9 +37,6 @@ void wxFrameView::OnIdle( wxIdleEvent& event)
 
     if ( mDoToolUpdates )
     {
-        int o = 0;  //glt
-        ++o;
-
         // TBD::
     }
 }
@@ -83,7 +76,7 @@ void wxFrameView::Deactivate()
 
 void wxFrameView::CreateLayout()
 {
-    mpLayout = new wxFrameLayout( GetParentFrame(), mpFrameMgr->GetClientWindow(), FALSE );
+    mpLayout = new wxFrameLayout( GetParentFrame(), mpFrameMgr->GetClientWindow(), false );
 }
 
 wxFrameLayout* wxFrameView::GetLayout()
@@ -153,7 +146,7 @@ void wxFrameViewSerializer::Serialize( wxObject* pObj, wxObjectStorage& store )
 
 /***** Implementation for class wxFrameManager *****/
 
-void wxFrameManager::DoSerialize( wxObjectStorage& store )
+void wxFrameManager::DoSerialize( wxObjectStorage& WXUNUSED(store) )
 {
 #if 0
     store.AddInitialRef( mpFrameWnd );
@@ -171,13 +164,13 @@ void wxFrameManager::DestroyViews()
 {
     DeactivateCurrentView();
 
-    wxNode* pNode = mViews.First();
+    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
 
     while ( pNode )
     {
-        delete (wxFrameView*)pNode->Data();
+        delete (wxFrameView*)pNode->GetData();
 
-        pNode = pNode->Next();
+        pNode = pNode->GetNext();
     }
 
     if ( mActiveViewNo != -1 && GetParentFrame() )
@@ -187,17 +180,17 @@ void wxFrameManager::DestroyViews()
 
 int wxFrameManager::GetViewNo( wxFrameView* pView )
 {
-    wxNode* pNode = mViews.First();
+    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
     int n = 0;
 
     while ( pNode )
     {
-        if ( (wxFrameView*)pNode->Data() == pView )
+        if ( (wxFrameView*)pNode->GetData() == pView )
 
             return n;
 
         ++n;
-        pNode = pNode->Next();
+        pNode = pNode->GetNext();
     }
 
     return -1;
@@ -211,7 +204,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 +221,19 @@ void wxFrameManager::EnableMenusForView( wxFrameView* pView, bool enable )
 
 void wxFrameManager::SyncAllMenus()
 {
-    wxNode* pNode = mViews.First();
+    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->Next();
+        pNode = pNode->GetNext();
     }
 
-    EnableMenusForView( GetView( mActiveViewNo ), TRUE );
+    EnableMenusForView( GetView( mActiveViewNo ), true );
 }
 
 /*** public methods ***/
@@ -264,16 +257,16 @@ void wxFrameManager::Init( wxWindow* pMainFrame, const wxString& settingsFile )
     mSettingsFile = settingsFile;
     mpFrameWnd    = pMainFrame;
 
-    wxNode* pNode = mViews.First();
+    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
 
     while ( pNode )
     {
-        wxFrameView* pView = (wxFrameView*)pNode->Data();
+        wxFrameView* pView = (wxFrameView*)pNode->GetData();
 
         pView->OnInit();
         pView->OnInitMenus();
 
-        pNode = pNode->Next();
+        pNode = pNode->GetNext();
     }
 
     if ( !ReloadViews() )
@@ -281,19 +274,19 @@ void wxFrameManager::Init( wxWindow* pMainFrame, const wxString& settingsFile )
         // if loading of settings file failed (e.g. was not found), 
         // do recreation of items in each view
 
-        pNode = mViews.First();
+        pNode = mViews.GetFirst();
 
         while ( pNode )
         {
-            wxFrameView* pView = (wxFrameView*)pNode->Data();
+            wxFrameView* pView = (wxFrameView*)pNode->GetData();
 
             pView->OnRecreate();
 
-            pNode = pNode->Next();
+            pNode = pNode->GetNext();
         }
     }
 
-    if ( mActiveViewNo >= mViews.Number() )
+    if ( mActiveViewNo >= (int)mViews.GetCount() )
         mActiveViewNo = -1;
 
     ActivateView( GetView( ( mActiveViewNo == -1 ) ? 0 : mActiveViewNo ) );
@@ -308,10 +301,10 @@ void wxFrameManager::AddView( wxFrameView* pFrmView )
     pFrmView->mpFrameMgr = this; // back ref.
 }
 
-void wxFrameManager::RemoveView( wxFrameView* pFrmView )
+void wxFrameManager::RemoveView( wxFrameView* WXUNUSED(pFrmView) )
 {
     // TBD::
-    wxFAIL_MSG("wxFrameManager::RemoveView() has not been implemented yet.");
+    wxFAIL_MSG( _T("wxFrameManager::RemoveView() has not been implemented yet.") );
 }
 
 int wxFrameManager::GetActiveViewNo()
@@ -321,15 +314,15 @@ int wxFrameManager::GetActiveViewNo()
 
 wxFrameView* wxFrameManager::GetActiveView()
 {
-    wxNode* pNode = mViews.Nth( mActiveViewNo );
+    wxObjectList::compatibility_iterator pNode = mViews.Item( mActiveViewNo );
 
-    if ( pNode ) return (wxFrameView*)pNode->Data();
+    if ( pNode ) return (wxFrameView*)pNode->GetData();
             else return NULL;
 }
 
-wxNode* wxFrameManager::GetActiveViewNode()
+wxObjectList::compatibility_iterator wxFrameManager::GetActiveViewNode()
 {
-    return mViews.Nth( mActiveViewNo );
+    return mViews.Item( mActiveViewNo );
 }
 
 wxFrame* wxFrameManager::GetParentFrame()
@@ -344,9 +337,9 @@ wxWindow* wxFrameManager::GetParentWindow()
 
 wxFrameView* wxFrameManager::GetView( int viewNo )
 {
-    wxNode* pNode = mViews.Nth( viewNo );
+    wxObjectList::compatibility_iterator pNode = mViews.Item( viewNo );
 
-    if ( pNode ) return (wxFrameView*)pNode->Data();
+    if ( pNode ) return (wxFrameView*)pNode->GetData();
             else return NULL;
 }
 
@@ -371,7 +364,7 @@ void wxFrameManager::ActivateView( wxFrameView* pFrmView )
 
     GetParentFrame()->PushEventHandler( pFrmView );
 
-    EnableMenusForView( pFrmView, TRUE );
+    EnableMenusForView( pFrmView, true );
 }
 
 void wxFrameManager::SetClinetWindow( wxWindow* pFrameClient )
@@ -405,7 +398,7 @@ void wxFrameManager::DeactivateCurrentView()
     if ( pView->mpLayout )
         pView->mpLayout->Deactivate();
 
-    EnableMenusForView( pView, FALSE );
+    EnableMenusForView( pView, false );
 }
 
 void wxFrameManager::SaveViewsNow()
@@ -423,12 +416,12 @@ void wxFrameManager::SaveViewsNow()
 
 bool wxFrameManager::ReloadViews()
 {
-    return FALSE;
+    return false;
 
     // TBD: ????
 #if 0
     if ( mSettingsFile == "" || !wxFileExists( mSettingsFile ) ) 
-        return FALSE;
+        return false;
 
     DestroyViews();
 
@@ -438,12 +431,12 @@ bool wxFrameManager::ReloadViews()
     mStore.SetDataStream( stm );
     DoSerialize( mStore );
 
-    return TRUE;
+    return true;
 #endif
 }
 
 bool wxFrameManager::ViewsAreLoaded()
 {
-    return ( mViews.Number() != 0 );
+    return ( mViews.GetCount() != 0 );
 }