X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fctsim.h;h=2352c7e7bd0cb31134074632d2b88c610d5cd43e;hp=8e3b357dedaedce4792397bf995a8be05d263233;hb=4b49778f44b9149451ba36e5f1bd7830c74c8fee;hpb=1a050c98763fbbc0662731b0b76953acede6f5d7 diff --git a/src/ctsim.h b/src/ctsim.h index 8e3b357..2352c7e 100644 --- a/src/ctsim.h +++ b/src/ctsim.h @@ -7,9 +7,7 @@ ** Date Started: July 2000 ** ** This is part of the CTSim program -** Copyright (c) 1983-2001 Kevin Rosenberg -** -** $Id$ +** Copyright (c) 1983-2009 Kevin Rosenberg ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -126,6 +124,13 @@ public: MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type); virtual ~MainFrame(); +#if wxCHECK_VERSION(2,9,0) + // Needed for wx3.0 + void OnMRUFile(wxCommandEvent& event) { + if (m_docManager) m_docManager->OnMRUFile(event); + } +#endif + void OnSize (wxSizeEvent& event); #if CTSIM_WINHELP @@ -217,9 +222,15 @@ private: void openConfig(); void closeConfig(); BackgroundManager* m_pBackgroundMgr; + bool m_bPrintCmdLineImages; + bool m_bCmdLineVerboseFlag; + + wxDocument* newDocumentHelper (wxDocTemplate* tmpl); public: CTSimApp(); + void OnInitCmdLine(wxCmdLineParser& parser); + bool OnCmdLineParsed(wxCmdLineParser& parser); bool OnInit(); int OnExit(); MainFrame* getMainFrame() const @@ -231,8 +242,6 @@ public: wxDocManager* getDocManager() { return m_docManager; } - wxString getUntitledFilename(); - int getNumberCPU() const { return wxThread::GetCPUCount(); } EZPlotDialog* makeEZPlotDialog() @@ -241,7 +250,7 @@ public: void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector& vecIF); bool getAdvancedOptions() const { return m_bAdvancedOptions; } void setAdvancedOptions (bool bAdv) { m_bAdvancedOptions = bAdv; } - bool getVerboseLogging() const { return m_bVerboseLogging; } + bool getVerboseLogging() const { return m_bVerboseLogging || m_bCmdLineVerboseFlag; } void setVerboseLogging (bool bVerbose) { m_bVerboseLogging = bVerbose; } bool getStartupTips() const { return m_bShowStartupTips; } void setStartupTips(bool bTips) { m_bShowStartupTips = bTips; }