void CTSimApp::OnInitCmdLine(wxCmdLineParser& parser)
{
static const wxCmdLineEntryDesc cmdLineDesc[] = {
- { wxCMD_LINE_SWITCH, _T("l"), _T("verbose"), _T("verbose logging") },
- { wxCMD_LINE_SWITCH, _T("v"), _T("version"), _T("print version") },
- { wxCMD_LINE_SWITCH, _T("p"), _T("print"), _T("print images from command line"),
+ { wxCMD_LINE_SWITCH, wxT_2("l"), wxT_2("verbose"), wxT_2("verbose logging") },
+ { wxCMD_LINE_SWITCH, wxT_2("v"), wxT_2("version"), wxT_2("print version") },
+ { wxCMD_LINE_SWITCH, wxT_2("p"), wxT_2("print"), wxT_2("print images from command line"),
wxCMD_LINE_VAL_NONE,
wxCMD_LINE_PARAM_OPTIONAL },
- { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("print this help message"),
+ { wxCMD_LINE_SWITCH, wxT_2("h"), wxT_2("help"), wxT_2("print this help message"),
wxCMD_LINE_VAL_NONE,
wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_OPTION_HELP },
- { wxCMD_LINE_PARAM, NULL, NULL, _T("input file"),
+ { wxCMD_LINE_PARAM, NULL, NULL, wxT_2("input file"),
wxCMD_LINE_VAL_STRING,
wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
- { wxCMD_LINE_NONE }
+ wxCMD_LINE_DESC_END
};
parser.SetDesc(cmdLineDesc);
m_pLogDoc = newTextDoc();
if (m_pLogDoc) {
m_pLog = m_pLogDoc->getTextCtrl();
- m_pLogDoc->SetDocumentName("Log.txt");
- m_pLogDoc->SetFilename("Log.txt");
- m_pLogDoc->getView()->getFrame()->SetTitle("Log");
+ m_pLogDoc->SetDocumentName(_T("Log.txt"));
+ m_pLogDoc->SetFilename(_T("Log.txt"));
+ m_pLogDoc->getView()->getFrame()->SetTitle(_T("Log"));
int xSize, ySize;
m_pFrame->GetClientSize(&xSize, &ySize);
int yLogSize = ySize / 4;
m_docManager->OnFileClose (nullEvent);
}
}
+
if (m_bPrintCmdLineImages) {
wxCommandEvent closeEvent;
closeEvent.SetInt (MAINMENU_FILE_EXIT);
- m_pFrame->AddPendingEvent(closeEvent);
+ m_pFrame->GetEventHandler()->ProcessEvent(closeEvent);
}
if (getStartupTips())
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_RANGE(wxID_FILE1, wxID_FILE9, MainFrame::OnMRUFile)
+
EVT_MENU(MAINMENU_WINDOW_BASE, MainFrame::OnWindowMenu0)
EVT_MENU(MAINMENU_WINDOW_BASE+1, MainFrame::OnWindowMenu1)
EVT_MENU(MAINMENU_WINDOW_BASE+2, MainFrame::OnWindowMenu2)
#if CTSIM_MDI
MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type)
-: wxDocMDIParentFrame(manager, NULL, id, title, pos, size, type, "MainFrame")
+: wxDocMDIParentFrame(manager, NULL, id, title, pos, size, type, _T("MainFrame"))
#else
MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type)
: wxDocParentFrame(manager, frame, id, title, pos, size, type, _T("MainFrame"))
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++;
}
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
};
BitmapDialog::BitmapDialog (wxBitmap* pBitmap, char const* pszTitle)
- : wxDialog(theApp->getMainFrame(), -1, wxString(pszTitle,*wxConvCurrent), wxDefaultPosition, wxDefaultSize, wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE)
+ : wxDialog(theApp->getMainFrame(), -1, wxString(pszTitle,*wxConvCurrent))
{
wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL);
}
wxString strFilename = wxFileSelector (wxString(wxConvUTF8.cMB2WX("Import Filename")), wxString(wxConvUTF8.cMB2WX("")),
- wxString(wxConvUTF8.cMB2WX("")), strExt, strWildcard, wxOPEN);
+ wxString(wxConvUTF8.cMB2WX("")), strExt, strWildcard, wxFD_OPEN);
if (! strFilename.IsEmpty()) {
if (m_iDefaultImportFormat == ImageFile::IMPORT_FORMAT_PPM || m_iDefaultImportFormat == ImageFile::IMPORT_FORMAT_PNG) {
// Create new documents
-ProjectionFileDocument*
-CTSimApp::newProjectionDoc()
-{
- wxString fname;
- m_docManager->MakeDefaultName(fname);
- fname += _T(".pj");
- ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (fname));
+wxDocument*
+CTSimApp::newDocumentHelper (wxDocTemplate* tmpl) {
+ wxDocument* newDoc = tmpl->CreateDocument (_T(""));
if (newDoc) {
- newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
- newDoc->SetDocumentTemplate (m_pDocTemplProjection);
+ newDoc->SetDocumentTemplate (tmpl);
newDoc->OnNewDocument();
- newDoc->SetFilename(fname);
+ wxString fname = newDoc->GetFilename();
+ fname += _T(".");
+ fname += tmpl->GetDefaultExtension();
+ newDoc->SetDocumentName(fname);
+ newDoc->SetTitle(fname);
+ newDoc->SetFilename(fname, true);
}
return newDoc;
}
+ProjectionFileDocument*
+CTSimApp::newProjectionDoc()
+{
+ ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>
+ (newDocumentHelper(m_pDocTemplProjection));
+ if (newDoc)
+ newDoc->getView()->getFrame()->SetTitle(newDoc->GetDocumentName());
+ return newDoc;
+}
+
ImageFileDocument*
CTSimApp::newImageDoc()
{
- wxString fname;
- m_docManager->MakeDefaultName(fname);
- fname += _T(".if");
- ImageFileDocument* newDoc = dynamic_cast<ImageFileDocument*>(m_pDocTemplImage->CreateDocument (fname));
- if (newDoc) {
- newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
- newDoc->SetDocumentTemplate (m_pDocTemplImage);
- newDoc->OnNewDocument();
- newDoc->SetFilename(fname);
- }
+ ImageFileDocument* newDoc = dynamic_cast<ImageFileDocument*>
+ (newDocumentHelper(m_pDocTemplImage));
+ if (newDoc)
+ newDoc->getView()->getFrame()->SetTitle(newDoc->GetDocumentName());
return newDoc;
}
PlotFileDocument*
CTSimApp::newPlotDoc()
{
- wxString fname;
- m_docManager->MakeDefaultName(fname);
- fname += _T(".plt");
- PlotFileDocument* newDoc = dynamic_cast<PlotFileDocument*>(m_pDocTemplPlot->CreateDocument (fname));
- if (newDoc) {
- newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
- newDoc->SetDocumentTemplate (m_pDocTemplPlot);
- newDoc->OnNewDocument();
- newDoc->SetFilename(fname);
- }
+ PlotFileDocument* newDoc = dynamic_cast<PlotFileDocument*>
+ (newDocumentHelper(m_pDocTemplPlot));
+ if (newDoc)
+ newDoc->getView()->getFrame()->SetTitle(newDoc->GetDocumentName());
return newDoc;
}
TextFileDocument*
CTSimApp::newTextDoc()
{
- wxString fname;
- m_docManager->MakeDefaultName(fname);
- fname += _T(".txt");
-
- TextFileDocument* newDoc = dynamic_cast<TextFileDocument*>(m_pDocTemplText->CreateDocument (fname));
- if (newDoc) {
- newDoc->SetDocumentName (m_pDocTemplText->GetDocumentName());
- newDoc->SetDocumentTemplate (m_pDocTemplText);
- newDoc->OnNewDocument();
- newDoc->SetFilename (fname);
- }
+ TextFileDocument* newDoc = dynamic_cast<TextFileDocument*>
+ (newDocumentHelper(m_pDocTemplText));
+ if (newDoc)
+ newDoc->getView()->getFrame()->SetTitle(newDoc->GetDocumentName());
return newDoc;
}
PhantomFileDocument*
CTSimApp::newPhantomDoc()
{
- wxString fname;
- m_docManager->MakeDefaultName(fname);
- fname += _T(".phm");
- PhantomFileDocument* newDoc = dynamic_cast<PhantomFileDocument*>(m_pDocTemplPhantom->CreateDocument (fname));
- if (newDoc) {
- newDoc->SetDocumentName (m_pDocTemplPhantom->GetDocumentName());
- newDoc->SetDocumentTemplate (m_pDocTemplPhantom);
- newDoc->OnNewDocument();
- newDoc->SetFilename(fname);
- }
+ PhantomFileDocument* newDoc = dynamic_cast<PhantomFileDocument*>
+ (newDocumentHelper(m_pDocTemplPhantom));
+ if (newDoc)
+ newDoc->getView()->getFrame()->SetTitle(newDoc->GetDocumentName());
return newDoc;
}
Graph3dFileDocument*
CTSimApp::newGraph3dDoc()
{
- wxString fname;
- m_docManager->MakeDefaultName(fname);
- fname += _T(".3dif");
- Graph3dFileDocument* newDoc = dynamic_cast<Graph3dFileDocument*>(m_pDocTemplGraph3d->CreateDocument (fname));
- if (newDoc) {
- newDoc->SetDocumentName (m_pDocTemplGraph3d->GetDocumentName());
- newDoc->SetDocumentTemplate (m_pDocTemplGraph3d);
- newDoc->OnNewDocument();
- newDoc->SetFilename(fname);
- }
+ Graph3dFileDocument* newDoc = dynamic_cast<Graph3dFileDocument*>
+ (newDocumentHelper(m_pDocTemplGraph3d));
+ if (newDoc)
+ newDoc->getView()->getFrame()->SetTitle(newDoc->GetDocumentName());
return newDoc;
}