Revert "Update package dependency from libwxgtk3.0-dev to libwxgtk3.0-gtk3-dev for...

[ctsim.git] / src / ctsim.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 7097857d6662a09674662c57b5a2ee1722cccfdb..2d85a4739f9fae7144f06380c059a24a3323d0a3 100644 (file)
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -247,14 +247,13 @@ CTSimApp::OnInit()
       m_docManager->OnFileClose (nullEvent);
     }
   }
-#ifdef KMR_FIXME
-  // Move to wx3.0 event processing
+
   if (m_bPrintCmdLineImages) {
     wxCommandEvent closeEvent;
     closeEvent.SetInt (MAINMENU_FILE_EXIT);
-    m_pFrame->AddPendingEvent(closeEvent);
+    m_pFrame->GetEventHandler()->ProcessEvent(closeEvent);
   }
-#endif
+
   if (getStartupTips())
     ShowTips();
 
@@ -391,10 +390,7 @@ EVT_MENU(MAINMENU_FILE_CREATE_PHANTOM, MainFrame::OnCreatePhantom)
 EVT_MENU(MAINMENU_FILE_CREATE_FILTER, MainFrame::OnCreateFilter)
 EVT_MENU(MAINMENU_FILE_EXIT, MainFrame::OnExit)
 
-// Unsure how to fix, OnMRUFile procedure not found in packge
-#ifdef KMR_FIXME
 EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, MainFrame::OnMRUFile)
-#endif
 
 EVT_MENU(MAINMENU_WINDOW_BASE, MainFrame::OnWindowMenu0)
 EVT_MENU(MAINMENU_WINDOW_BASE+1, MainFrame::OnWindowMenu1)
@@ -734,7 +730,7 @@ MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent)
       strFilename += _T("\tCtrl-");
       strFilename += static_cast<char>('0' + iPos);
     }
-    static_cast<wxMenuItemBase*>(m_apWindowMenuItems[iPos])->SetName (strFilename);
+    static_cast<wxMenuItemBase*>(m_apWindowMenuItems[iPos])->SetItemLabel (strFilename);
     m_apWindowMenuData[iPos] = pDoc;
     m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+iPos, true);
     iPos++;
@@ -742,7 +738,7 @@ MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent)
   }
   for (int i = iPos; i < MAX_WINDOW_MENUITEMS; i++) {
     m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+i, false);
-    static_cast<wxMenuItemBase*>(m_apWindowMenuItems[i])->SetName (_T("[EMPTY]"));
+    static_cast<wxMenuItemBase*>(m_apWindowMenuItems[i])->SetItemLabel (_T("[EMPTY]"));
     m_apWindowMenuData[i] = NULL;
   }
 #endif
@@ -898,7 +894,7 @@ public:
 };
 
 BitmapDialog::BitmapDialog (wxBitmap* pBitmap, char const* pszTitle)
-  : wxDialog(theApp->getMainFrame(), -1, wxString(pszTitle,*wxConvCurrent), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+  : wxDialog(theApp->getMainFrame(), -1, wxString(pszTitle,*wxConvCurrent))
 {
   wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL);