summaryrefslogtreecommitdiffstats
path: root/Project/MainFrame.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Project/MainFrame.cpp')
-rw-r--r--Project/MainFrame.cpp9
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);