Updated Xestia Calendar forms

diff --git a/source/AppXestiaCalendar.cpp b/source/AppXestiaCalendar.cpp
index b2f65cc..6ba325c 100644 (file)
--- a/source/AppXestiaCalendar.cpp
+++ b/source/AppXestiaCalendar.cpp
@@ -11,16 +11,10 @@
 
 frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-       this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+       this->SetSizeHints( wxSize( 800,600 ), wxDefaultSize );
        this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
        
-       wxBoxSizer* bSizer44;
-       bSizer44 = new wxBoxSizer( wxVERTICAL );
-       
-       
-       this->SetSizer( bSizer44 );
-       this->Layout();
-       m_statusBar2 = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );
+       stbBottom = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );
        menuBar = new wxMenuBar( 0 );
        mnuManage = new wxMenu();
        wxMenuItem* mnuManageNew;
@@ -50,7 +44,7 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
        
        mnuHelp = new wxMenu();
        wxMenuItem* mnuHelpShow;
-       mnuHelpShow = new wxMenuItem( mnuHelp, wxID_ANY, wxString( wxT("Show Help...") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
+       mnuHelpShow = new wxMenuItem( mnuHelp, wxID_HELP, wxString( wxT("Show Help...") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
        mnuHelp->Append( mnuHelpShow );
        
        mnuHelp->AppendSeparator();
@@ -62,13 +56,18 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
        mnuHelp->AppendSeparator();
        
        wxMenuItem* mnuHelpAbout;
-       mnuHelpAbout = new wxMenuItem( mnuHelp, wxID_ANY, wxString( wxT("About Xestia Calendar...") ) + wxT('\t') + wxT("Shift+Ctrl+A"), wxEmptyString, wxITEM_NORMAL );
+       mnuHelpAbout = new wxMenuItem( mnuHelp, wxID_ABOUT, wxString( wxT("About Xestia Calendar...") ) + wxT('\t') + wxT("Shift+Ctrl+A"), wxEmptyString, wxITEM_NORMAL );
        mnuHelp->Append( mnuHelpAbout );
        
        menuBar->Append( mnuHelp, wxT("Help") ); 
        
        this->SetMenuBar( menuBar );
        
+       szrMain = new wxBoxSizer( wxVERTICAL );
+       
+       
+       this->SetSizer( szrMain );
+       this->Layout();
        
        this->Centre( wxBOTH );
 }

diff --git a/source/AppXestiaCalendar.h b/source/AppXestiaCalendar.h
index 5dd1171..faaf083 100644 (file)
--- a/source/AppXestiaCalendar.h
+++ b/source/AppXestiaCalendar.h
@@ -10,9 +10,8 @@
 
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
-#include <wx/sizer.h>
-#include <wx/gdicmn.h>
 #include <wx/statusbr.h>
+#include <wx/gdicmn.h>
 #include <wx/font.h>
 #include <wx/colour.h>
 #include <wx/settings.h>
@@ -21,6 +20,7 @@
 #include <wx/image.h>
 #include <wx/icon.h>
 #include <wx/menu.h>
+#include <wx/sizer.h>
 #include <wx/frame.h>
 #include <wx/stattext.h>
 #include <wx/panel.h>
@@ -49,15 +49,16 @@ class frmMainADT : public wxFrame
        private:
        
        protected:
-               wxStatusBar* m_statusBar2;
+               wxStatusBar* stbBottom;
                wxMenuBar* menuBar;
                wxMenu* mnuManage;
                wxMenu* mnuCreate;
                wxMenu* mnuHelp;
+               wxBoxSizer* szrMain;
        
        public:
                
-               frmMainADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Xestia Calendar"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+               frmMainADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Xestia Calendar"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 800,600 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
                
                ~frmMainADT();