Merge changes from Debian Med packaging of 5.2.0-4

[ctsim.git] / src / ctsim.h

diff --git a/src/ctsim.h b/src/ctsim.h
index f3f808313a2f08c8ffcc7ea8602df453edbaf72f..2352c7e7bd0cb31134074632d2b88c610d5cd43e 100644 (file)
--- a/src/ctsim.h
+++ b/src/ctsim.h
@@ -124,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
@@ -215,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
@@ -229,8 +242,6 @@ public:
   wxDocManager* getDocManager()
   { return m_docManager; }
 
-  wxString getUntitledFilename();
-
   int getNumberCPU() const { return wxThread::GetCPUCount(); }
 
   EZPlotDialog* makeEZPlotDialog()
@@ -239,7 +250,7 @@ public:
   void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& 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; }