frmMain: Manage windows from Window menu.

[xestiacalendar/.git] / source / AppXestiaCalendar.cpp

diff --git a/source/AppXestiaCalendar.cpp b/source/AppXestiaCalendar.cpp
index a43977a..66726f5 100644 (file)
--- a/source/AppXestiaCalendar.cpp
+++ b/source/AppXestiaCalendar.cpp
@@ -66,6 +66,9 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
        
        menuBar->Append( mnuCreate, wxT("Create") ); 
        
+       mnuWindow = new wxMenu();
+       menuBar->Append( mnuWindow, wxT("Window") ); 
+       
        mnuHelp = new wxMenu();
        wxMenuItem* mnuHelpShow;
        mnuHelpShow = new wxMenuItem( mnuHelp, wxID_HELP, wxString( wxT("Show Help...") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
@@ -1512,22 +1515,28 @@ frmEventEditorADT::frmEventEditorADT( wxWindow* parent, wxWindowID id, const wxS
        this->Centre( wxBOTH );
        
        // Connect Events
+       this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( frmEventEditorADT::CloseWindow ) );
        this->Connect( mnuEventSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmEventEditorADT::SaveContact ) );
        this->Connect( mnuEventSaveNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmEventEditorADT::SaveNewContact ) );
        this->Connect( mnuEventClose->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmEventEditorADT::CloseWindow ) );
        this->Connect( mnuEditCut->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmEventEditorADT::CutText ) );
        this->Connect( mnuEditCopy->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmEventEditorADT::CopyText ) );
        this->Connect( mnuEditPaste->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmEventEditorADT::PasteText ) );
+       cmbCalendar->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( frmEventEditorADT::ProcessCalendarControl ), NULL, this );
+       txtEventName->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( frmEventEditorADT::ProcessEventName ), NULL, this );
 }
 
 frmEventEditorADT::~frmEventEditorADT()
 {
        // Disconnect Events
+       this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( frmEventEditorADT::CloseWindow ) );
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmEventEditorADT::SaveContact ) );
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmEventEditorADT::SaveNewContact ) );
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmEventEditorADT::CloseWindow ) );
        this->Disconnect( wxID_CUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmEventEditorADT::CutText ) );
        this->Disconnect( wxID_COPY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmEventEditorADT::CopyText ) );
        this->Disconnect( wxID_PASTE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmEventEditorADT::PasteText ) );
+       cmbCalendar->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( frmEventEditorADT::ProcessCalendarControl ), NULL, this );
+       txtEventName->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( frmEventEditorADT::ProcessEventName ), NULL, this );
        
 }