X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FAppXestiaCalendar.cpp;h=360ec6ed0d6a78af717ffc73bad988249a8ac309;hb=e79afea4cd8930a1ebbdda0e3543dd0a89e45b34;hp=b2f65cc9ae3d18e2133ca7e4ec54ce3e55638e4b;hpb=9b3a270296a98bb87697d185f25d6fab8122717a;p=xestiacalendar%2F.git

diff --git a/source/AppXestiaCalendar.cpp b/source/AppXestiaCalendar.cpp
index b2f65cc..360ec6e 100644
--- 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;
@@ -36,7 +30,7 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 	mnuManage->AppendSeparator();
 	
 	wxMenuItem* mnuManageExit;
-	mnuManageExit = new wxMenuItem( mnuManage, wxID_EXIT, wxString( wxT("Exit") ) + wxT('\t') + wxT("Ctrl+Q"), wxEmptyString, wxITEM_NORMAL );
+	mnuManageExit = new wxMenuItem( mnuManage, wxID_EXIT, wxString( wxT("Quit") ) + wxT('\t') + wxT("Ctrl+Q"), wxEmptyString, wxITEM_NORMAL );
 	mnuManage->Append( mnuManageExit );
 	
 	menuBar->Append( mnuManage, wxT("Manage") ); 
@@ -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,19 +56,36 @@ 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 );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( frmMainADT::QuitApp ) );
+	this->Connect( mnuManageExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::QuitApp ) );
+	this->Connect( mnuHelpUpdate->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowUpdateWindow ) );
+	this->Connect( mnuHelpAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowAboutWindow ) );
 }
 
 frmMainADT::~frmMainADT()
 {
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( frmMainADT::QuitApp ) );
+	this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::QuitApp ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowUpdateWindow ) );
+	this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowAboutWindow ) );
+	
 }
 
 frmUpdateADT::frmUpdateADT( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )