From 61af77e7b6ad45710aba33914009a792d795d528 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 6 Apr 2016 13:15:03 +0200
Subject: [PATCH] Main window size and position is remembered now

---
 ZRCola/ZRCola.fbp    | 2 +-
 ZRCola/stdafx.h      | 2 ++
 ZRCola/zrcolaapp.cpp | 2 +-
 ZRCola/zrcolagui.cpp | 2 +-
 ZRCola/zrcolagui.h   | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ZRCola/ZRCola.fbp b/ZRCola/ZRCola.fbp
index 8de664e..f4151b8 100644
--- a/ZRCola/ZRCola.fbp
+++ b/ZRCola/ZRCola.fbp
@@ -50,7 +50,7 @@
             <property name="title">ZRCola</property>
             <property name="tooltip"></property>
             <property name="window_extra_style"></property>
-            <property name="window_name"></property>
+            <property name="window_name">ZRCola</property>
             <property name="window_style">wxTAB_TRAVERSAL</property>
             <property name="xrc_skip_sizer">1</property>
             <event name="OnActivate"></event>
diff --git a/ZRCola/stdafx.h b/ZRCola/stdafx.h
index b6731c1..2dbbf38 100644
--- a/ZRCola/stdafx.h
+++ b/ZRCola/stdafx.h
@@ -26,6 +26,8 @@
 #include "zrcolakeyhndlr.h"
 
 #include <wx/msgdlg.h>
+#include <wx/persist.h>
+#include <wx/persist/toplevel.h>
 #include <wxex/common.h>
 
 #include <fstream>
diff --git a/ZRCola/zrcolaapp.cpp b/ZRCola/zrcolaapp.cpp
index e6175ef..c445911 100644
--- a/ZRCola/zrcolaapp.cpp
+++ b/ZRCola/zrcolaapp.cpp
@@ -52,7 +52,7 @@ bool ZRColaApp::OnInit()
     }
 
     wxZRColaFrame* mainFrame = new wxZRColaFrame();
-
+    wxPersistentRegisterAndRestore<wxTopLevelWindow>(mainFrame);
     mainFrame->Show();
 
     return true;
diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp
index ecc7359..ddc094a 100644
--- a/ZRCola/zrcolagui.cpp
+++ b/ZRCola/zrcolagui.cpp
@@ -22,7 +22,7 @@ wxHelpProvider::Set( new wxHelpControllerHelpProvider );
 static wxFBContextSensitiveHelpSetter s_wxFBSetTheHelpProvider;
 ///////////////////////////////////////////////////////////////////////////
 
-wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
+wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxFrame( parent, id, title, pos, size, style, name )
 {
 	this->SetSizeHints( wxSize( 150,150 ), wxDefaultSize );
 	
diff --git a/ZRCola/zrcolagui.h b/ZRCola/zrcolagui.h
index 56948b4..cd189a9 100644
--- a/ZRCola/zrcolagui.h
+++ b/ZRCola/zrcolagui.h
@@ -61,7 +61,7 @@ class wxZRColaFrameBase : public wxFrame
 	
 	public:
 		
-		wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 600,400 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+		wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 600,400 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("ZRCola") );
 		
 		~wxZRColaFrameBase();