projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r428: no message
[ctsim.git]
/
src
/
ctsim.h
diff --git
a/src/ctsim.h
b/src/ctsim.h
index 103f08aa195d1113ef91eeaf813fcf52f18414b0..a242109fa1a0ac05bdbae41d5af66dddc241d16b 100644
(file)
--- a/
src/ctsim.h
+++ b/
src/ctsim.h
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: ctsim.h,v 1.
29 2001/01/20 08:10:33
kevin Exp $
+** $Id: ctsim.h,v 1.
30 2001/01/20 17:43:41
kevin Exp $
**
** 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
**
** 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
@@
-35,9
+35,15
@@
#include <dmalloc.h>
#endif
#include <dmalloc.h>
#endif
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+#include "wx/config.h"
+
#ifdef MSVC
#define CTSIM_MDI 1
#endif
#ifdef MSVC
#define CTSIM_MDI 1
#endif
+#define CTSIM_CUSTOM_MRU 1
#if defined(CTSIM_MDI) && !wxUSE_MDI_ARCHITECTURE
#error You must set wxUSE_MDI_ARCHITECTURE to 1 in setup.h!
#if defined(CTSIM_MDI) && !wxUSE_MDI_ARCHITECTURE
#error You must set wxUSE_MDI_ARCHITECTURE to 1 in setup.h!
@@
-53,10
+59,6
@@
class ImageFileDocument;
#include <vector>
#include <vector>
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
#include "wx/docview.h"
#include "wx/textctrl.h"
#include "wx/menu.h"
#include "wx/docview.h"
#include "wx/textctrl.h"
#include "wx/menu.h"
@@
-71,14
+73,13
@@
class ImageFileDocument;
// Define a new frame for main window
#if CTSIM_MDI
// Define a new frame for main window
#if CTSIM_MDI
-class MainFrame: public wxMDIParentFrame
+class MainFrame: public wx
Doc
MDIParentFrame
#else
class MainFrame: public wxDocParentFrame
#endif
{
DECLARE_CLASS(MainFrame)
private:
#else
class MainFrame: public wxDocParentFrame
#endif
{
DECLARE_CLASS(MainFrame)
private:
- wxTextCtrl* m_pLog;
wxMenu* m_pWindowMenu;
enum { MAX_WINDOW_MENUITEMS = 20 };
wxMenu* m_pWindowMenu;
enum { MAX_WINDOW_MENUITEMS = 20 };
@@
-102,9
+103,11
@@
private:
public:
MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type);
public:
MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type);
+ ~MainFrame();
+#ifdef CTSIM_CUSTOM_MRU
void OnMRUFile (wxCommandEvent& event);
void OnMRUFile (wxCommandEvent& event);
-
+#endif
void OnSize (wxSizeEvent& event);
#if CTSIM_WINHELP
void OnSize (wxSizeEvent& event);
#if CTSIM_WINHELP
@@
-130,9
+133,6
@@
public:
void OnUpdateUI (wxUpdateUIEvent& event);
void OnUpdateUI (wxUpdateUIEvent& event);
- wxTextCtrl* getLog()
- { return m_pLog; }
-
void OnWindowMenu0 (wxCommandEvent& event);
void OnWindowMenu1 (wxCommandEvent& event);
void OnWindowMenu2 (wxCommandEvent& event);
void OnWindowMenu0 (wxCommandEvent& event);
void OnWindowMenu1 (wxCommandEvent& event);
void OnWindowMenu2 (wxCommandEvent& event);
@@
-163,6
+163,18
@@
public:
class wxDocManager;
class CTSimApp: public wxApp
{
class wxDocManager;
class CTSimApp: public wxApp
{
+private:
+ wxDocManager* m_docManager;
+ MainFrame* m_pFrame;
+ wxConfig* m_pConfig;
+
+ void usage (const char* program);
+
+ static struct option ctsimOptions[];
+
+ enum { O_HELP, O_VERSION };
+ wxTextCtrl* m_pLog;
+
public:
CTSimApp();
bool OnInit();
public:
CTSimApp();
bool OnInit();
@@
-171,7
+183,7
@@
public:
{ return m_pFrame; }
wxTextCtrl* getLog()
{ return m_pFrame; }
wxTextCtrl* getLog()
- { return m_p
Frame->getLog()
; }
+ { return m_p
Log
; }
wxDocManager* getDocManager()
{ return m_docManager; }
wxDocManager* getDocManager()
{ return m_docManager; }
@@
-187,16
+199,8
@@
public:
{ return true; }
void setIconForFrame (wxFrame* pFrame);
{ return true; }
void setIconForFrame (wxFrame* pFrame);
-
-private:
- wxDocManager* m_docManager;
- MainFrame* m_pFrame;
-
- void usage (const char* program);
-
- static struct option ctsimOptions[];
-
- enum { O_HELP, O_VERSION };
+ wxConfig* getConfig()
+ { return m_pConfig; }
};
DECLARE_APP(CTSimApp)
};
DECLARE_APP(CTSimApp)