projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes from Debian Med packaging of 5.2.0-4
[ctsim.git]
/
src
/
ctsim.cpp
diff --git
a/src/ctsim.cpp
b/src/ctsim.cpp
index 7097857d6662a09674662c57b5a2ee1722cccfdb..e2e3f2766a4cea7fee821e4ab1a98fb3210977d7 100644
(file)
--- a/
src/ctsim.cpp
+++ b/
src/ctsim.cpp
@@
-247,14
+247,13
@@
CTSimApp::OnInit()
m_docManager->OnFileClose (nullEvent);
}
}
m_docManager->OnFileClose (nullEvent);
}
}
-#ifdef KMR_FIXME
- // Move to wx3.0 event processing
+
if (m_bPrintCmdLineImages) {
wxCommandEvent closeEvent;
closeEvent.SetInt (MAINMENU_FILE_EXIT);
if (m_bPrintCmdLineImages) {
wxCommandEvent closeEvent;
closeEvent.SetInt (MAINMENU_FILE_EXIT);
- m_pFrame->
AddPending
Event(closeEvent);
+ m_pFrame->
GetEventHandler()->Process
Event(closeEvent);
}
}
-#endif
+
if (getStartupTips())
ShowTips();
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)
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)
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)
EVT_MENU(MAINMENU_WINDOW_BASE, MainFrame::OnWindowMenu0)
EVT_MENU(MAINMENU_WINDOW_BASE+1, MainFrame::OnWindowMenu1)
@@
-898,7
+894,7
@@
public:
};
BitmapDialog::BitmapDialog (wxBitmap* pBitmap, char const* pszTitle)
};
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);
{
wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL);