X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c82c42d498ac1e35a395c9ecba681921c4817a7c..b836b6ea08c2cc7a22f1d44d88f0ce92ecc8a5a3:/contrib/src/fl/frmview.cpp?ds=sidebyside diff --git a/contrib/src/fl/frmview.cpp b/contrib/src/fl/frmview.cpp index 4246df8caf..56730f2cd3 100644 --- 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" @@ -168,7 +164,7 @@ void wxFrameManager::DestroyViews() { DeactivateCurrentView(); - wxNode* pNode = mViews.GetFirst(); + wxObjectList::compatibility_iterator pNode = mViews.GetFirst(); while ( pNode ) { @@ -184,7 +180,7 @@ void wxFrameManager::DestroyViews() int wxFrameManager::GetViewNo( wxFrameView* pView ) { - wxNode* pNode = mViews.GetFirst(); + wxObjectList::compatibility_iterator pNode = mViews.GetFirst(); int n = 0; while ( pNode ) @@ -208,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 ) @@ -225,7 +221,7 @@ 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 ) @@ -261,7 +257,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 ) { @@ -318,13 +314,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 ); } @@ -341,7 +337,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;