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;
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") );
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();
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 ) );
}
frmMainADT::~frmMainADT()
{
+ // Disconnect Events
+ this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( frmMainADT::QuitApp ) );
+ this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::QuitApp ) );
+
}
frmUpdateADT::frmUpdateADT( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )