From e5f19af9a5829a307951785e850e53fc4fcfac90 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Thu, 10 Aug 2017 18:07:02 -0300 Subject: Model 1 machine fixed, init file under implementation --- Project/MainFrame.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Project/MainFrame.cpp') 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); -- cgit