|
From: Emilien K. <cur...@us...> - 2005-04-12 12:12:45
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15378/src Modified Files: Document.cpp View.cpp Log Message: Change the view to document event handling. Index: Document.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Document.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Document.cpp 4 Apr 2005 12:20:13 -0000 1.8 --- Document.cpp 12 Apr 2005 12:12:01 -0000 1.9 *************** *** 120,124 **** pView->m_pDocument = this; m_ViewArray.Register(pView); - pView->PushEventHandler(this); } --- 120,123 ---- *************** *** 128,132 **** m_ViewArray.Unregister(pView); pView->m_pDocument = NULL; - pView->RemoveEventHandler(this); } --- 127,130 ---- *************** *** 246,249 **** --- 244,249 ---- IMPLEMENT_DYNAMIC_CLASS(wxDevCenter::ActionDocument, wxDevCenter::Document) + BEGIN_EVENT_TABLE(ActionDocument, Document) + END_EVENT_TABLE() ActionDocument::ActionDocument(int maxCommands): Index: View.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/View.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** View.cpp 15 Jan 2005 09:47:22 -0000 1.4 --- View.cpp 12 Apr 2005 12:12:02 -0000 1.5 *************** *** 33,56 **** BEGIN_EVENT_TABLE(wxDevCenter::View, wxPanel) - EVT_MENU_RANGE(IDM_VIEW_MIN, IDM_VIEW_MAX , View::OnMenu) - EVT_MENU(IDM_EDIT_UNDO , View::OnMenu) - EVT_MENU(IDM_EDIT_REDO , View::OnMenu) - EVT_MENU(IDM_EDIT_CUT , View::OnMenu) - EVT_MENU(IDM_EDIT_COPY , View::OnMenu) - EVT_MENU(IDM_EDIT_PASTE , View::OnMenu) - EVT_MENU(IDM_EDIT_CLEAR , View::OnMenu) - EVT_MENU(IDM_EDIT_FIND , View::OnMenu) - EVT_MENU(IDM_EDIT_DUPLICATE , View::OnMenu) - EVT_MENU(IDM_EDIT_SELECTALL , View::OnMenu) - EVT_UPDATE_UI_RANGE(IDM_VIEW_MIN, IDM_VIEW_MAX, View::OnUpdateMenuUI) - EVT_UPDATE_UI(IDM_EDIT_UNDO , View::OnUpdateMenuUI) - EVT_UPDATE_UI(IDM_EDIT_REDO , View::OnUpdateMenuUI) - EVT_UPDATE_UI(IDM_EDIT_CUT , View::OnUpdateMenuUI) - EVT_UPDATE_UI(IDM_EDIT_COPY , View::OnUpdateMenuUI) - EVT_UPDATE_UI(IDM_EDIT_PASTE , View::OnUpdateMenuUI) - EVT_UPDATE_UI(IDM_EDIT_CLEAR , View::OnUpdateMenuUI) - EVT_UPDATE_UI(IDM_EDIT_FIND , View::OnUpdateMenuUI) - EVT_UPDATE_UI(IDM_EDIT_DUPLICATE , View::OnUpdateMenuUI) - EVT_UPDATE_UI(IDM_EDIT_SELECTALL , View::OnUpdateMenuUI) END_EVENT_TABLE() --- 33,36 ---- *************** *** 146,160 **** } ! ////////////////////////////////////////////////////////////////////// ! // Interception des évènements des menus ! void View::OnMenu(wxCommandEvent& WXUNUSED(event)) ! { ! // Surtout ne rien faire. ! // Et surtout pas Skip !!! ! } ! ! void View::OnUpdateMenuUI(wxUpdateUIEvent& WXUNUSED(event)) { ! // Surtout ne rien faire. ! // Surtout pas Skip !!! } --- 126,137 ---- } ! // Redirige les évènements vers le document attaché. ! bool View::ProcessEvent(wxEvent& event) { ! if(GetDocument()!=NULL) ! { ! if(GetDocument()->ProcessEvent(event)) ! return true; ! } ! return wxPanel::ProcessEvent(event); } |