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.cpp | |
| 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.cpp')
| -rw-r--r-- | Project/MainFrame.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index 90447ab..89d550a 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -13,14 +13,18 @@ #include "FileHanding.h" #include "GeneralPropertiesForm.h" #include "SimulationsSettingsForm.h" +#include "PropertiesData.h" MainFrame::MainFrame() : MainFrameBase(NULL) {} -MainFrame::MainFrame(wxWindow* parent, wxLocale* locale) : MainFrameBase(parent) + +MainFrame::MainFrame(wxWindow* parent, wxLocale* locale, PropertiesData* initProperties) : MainFrameBase(parent) { m_locale = locale; + m_generalProperties = initProperties; Init(); } + MainFrame::~MainFrame() { // if(m_artMetro) delete m_artMetro; @@ -29,7 +33,10 @@ MainFrame::~MainFrame() NULL, this); delete m_addElementsMenu; } + if(m_locale) delete m_locale; + if(m_generalProperties) delete m_generalProperties; } + void MainFrame::Init() { this->SetSize(800, 600); |