X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cbc57f086cee690f397ac5622d3f1d7153b300e..d66c3960d541cf9e3ba10519a49a9e34b4ddfc81:/contrib/src/fl/frmview.cpp

diff --git a/contrib/src/fl/frmview.cpp b/contrib/src/fl/frmview.cpp
index 0ed194084f..f06c94e6db 100644
--- 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::
     }
 }
@@ -153,7 +150,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 +168,13 @@ void wxFrameManager::DestroyViews()
 {
     DeactivateCurrentView();
 
-    wxNode* pNode = mViews.First();
+    wxNode* 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 +184,17 @@ void wxFrameManager::DestroyViews()
 
 int wxFrameManager::GetViewNo( wxFrameView* pView )
 {
-    wxNode* pNode = mViews.First();
+    wxNode* 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;
@@ -228,7 +225,7 @@ void wxFrameManager::EnableMenusForView( wxFrameView* pView, bool enable )
 
 void wxFrameManager::SyncAllMenus()
 {
-    wxNode* pNode = mViews.First();
+    wxNode* pNode = mViews.GetFirst();
     int i = 0;
 
     while ( pNode )
@@ -237,7 +234,7 @@ void wxFrameManager::SyncAllMenus()
 
             EnableMenusForView( (wxFrameView*)pNode->GetData(), FALSE );
 
-        pNode = pNode->Next();
+        pNode = pNode->GetNext();
     }
 
     EnableMenusForView( GetView( mActiveViewNo ), TRUE );
@@ -264,16 +261,16 @@ void wxFrameManager::Init( wxWindow* pMainFrame, const wxString& settingsFile )
     mSettingsFile = settingsFile;
     mpFrameWnd    = pMainFrame;
 
-    wxNode* pNode = mViews.First();
+    wxNode* 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 +278,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 +305,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 +318,15 @@ int wxFrameManager::GetActiveViewNo()
 
 wxFrameView* wxFrameManager::GetActiveView()
 {
-    wxNode* pNode = mViews.Nth( mActiveViewNo );
+    wxNode* pNode = mViews.Item( mActiveViewNo );
 
-    if ( pNode ) return (wxFrameView*)pNode->Data();
+    if ( pNode ) return (wxFrameView*)pNode->GetData();
             else return NULL;
 }
 
 wxNode* wxFrameManager::GetActiveViewNode()
 {
-    return mViews.Nth( mActiveViewNo );
+    return mViews.Item( mActiveViewNo );
 }
 
 wxFrame* wxFrameManager::GetParentFrame()
@@ -344,9 +341,9 @@ wxWindow* wxFrameManager::GetParentWindow()
 
 wxFrameView* wxFrameManager::GetView( int viewNo )
 {
-    wxNode* pNode = mViews.Nth( viewNo );
+    wxNode* pNode = mViews.Item( viewNo );
 
-    if ( pNode ) return (wxFrameView*)pNode->Data();
+    if ( pNode ) return (wxFrameView*)pNode->GetData();
             else return NULL;
 }
 
@@ -444,6 +441,6 @@ bool wxFrameManager::ReloadViews()
 
 bool wxFrameManager::ViewsAreLoaded()
 {
-    return ( mViews.Number() != 0 );
+    return ( mViews.GetCount() != 0 );
 }