diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-08-10 18:07:02 -0300 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-08-10 18:07:02 -0300 |
| commit | e5f19af9a5829a307951785e850e53fc4fcfac90 (patch) | |
| tree | 5292932b350eac34b400c81cd4a68d2356fd835c /Project/MainFrame.h | |
| parent | 8a1ffbc01135a1466ad7400518e4c56a4bdc3af5 (diff) | |
| download | PSP.git-e5f19af9a5829a307951785e850e53fc4fcfac90.tar.gz PSP.git-e5f19af9a5829a307951785e850e53fc4fcfac90.tar.xz PSP.git-e5f19af9a5829a307951785e850e53fc4fcfac90.zip | |
Model 1 machine fixed, init file under implementation
Diffstat (limited to 'Project/MainFrame.h')
| -rw-r--r-- | Project/MainFrame.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Project/MainFrame.h b/Project/MainFrame.h index af1ee3e..d7ff171 100644 --- a/Project/MainFrame.h +++ b/Project/MainFrame.h @@ -13,6 +13,7 @@ class Workspace; class FileHanding; class GeneralPropertiesForm; class SimulationsSettingsForm; +class PropertiesData; enum { ID_ADDMENU_BUS = 20000, @@ -30,7 +31,7 @@ class MainFrame : public MainFrameBase { public: MainFrame(); - MainFrame(wxWindow* parent, wxLocale* locale); + MainFrame(wxWindow* parent, wxLocale* locale, PropertiesData* initProperties); ~MainFrame(); protected: @@ -69,13 +70,14 @@ class MainFrame : public MainFrameBase virtual void OnUndoClick(wxRibbonButtonBarEvent& event); virtual void OnNewClick(wxRibbonButtonBarEvent& event); - private: + protected: std::vector<Workspace*> m_workspaceList; int m_projectNumber = 1; wxRibbonMetroArtProvider* m_artMetro = NULL; wxMenu* m_addElementsMenu = NULL; wxLocale* m_locale = NULL; + PropertiesData* m_generalProperties = NULL; void Init(); void EnableCurrentProjectRibbon(bool enable = true); |