X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c82c42d498ac1e35a395c9ecba681921c4817a7c..822e690b221486b63895b5f14a7fbee2bc966fe5:/contrib/src/fl/frmview.cpp?ds=sidebyside diff --git a/contrib/src/fl/frmview.cpp b/contrib/src/fl/frmview.cpp index 4246df8caf..22e59c57ad 100644 --- a/contrib/src/fl/frmview.cpp +++ b/contrib/src/fl/frmview.cpp @@ -168,7 +168,7 @@ void wxFrameManager::DestroyViews() { DeactivateCurrentView(); - wxNode* pNode = mViews.GetFirst(); + wxObjectList::compatibility_iterator pNode = mViews.GetFirst(); while ( pNode ) { @@ -184,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 ) @@ -208,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 ) @@ -225,7 +225,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 +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 ) { @@ -318,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 ); } @@ -341,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;