From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 6 Apr 2008 17:02:25 +0000 (+0000)
Subject: don't bounce back events to the text control recursively as this results in infinite... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4e553af1602940b9018af50d2d49cb4779c91307

don't bounce back events to the text control recursively as this results in infinite recursion under wxGTK and probably other ports

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp
index d2a02dccdb..5a4d9e63bc 100644
--- a/samples/docview/view.cpp
+++ b/samples/docview/view.cpp
@@ -156,6 +156,12 @@ void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
 
 IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
 
+BEGIN_EVENT_TABLE(TextEditView, wxView)
+    EVT_MENU(wxID_COPY, TextEditView::OnCopy)
+    EVT_MENU(wxID_PASTE, TextEditView::OnPaste)
+    EVT_MENU(wxID_SELECTALL, TextEditView::OnSelectAll)
+END_EVENT_TABLE()
+
 bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {
     m_frame = wxGetApp().CreateChildFrame(doc, this, false);
@@ -201,21 +207,6 @@ bool TextEditView::OnClose(bool deleteWindow)
     return true;
 }
 
-bool TextEditView::ProcessEvent(wxEvent& event)
-{
-    bool processed = false;
-    if (!processed) switch (event.GetId())
-    {
-        case wxID_COPY:
-        case wxID_PASTE:
-        case wxID_SELECTALL:
-            processed = m_textsw->ProcessEvent(event);
-            break;
-    }
-    if (!processed) processed = wxView::ProcessEvent(event);
-    return processed;
-}
-
 /*
 * Window implementations
 */
diff --git a/samples/docview/view.h b/samples/docview/view.h
index b956daadeb..3c3fd2c240 100644
--- a/samples/docview/view.h
+++ b/samples/docview/view.h
@@ -73,9 +73,13 @@ public:
     virtual void OnDraw(wxDC *dc);
     virtual void OnUpdate(wxView *sender, wxObject *hint = NULL);
     virtual bool OnClose(bool deleteWindow = true);
-    virtual bool ProcessEvent(wxEvent&);
 
 private:
+    void OnCopy(wxCommandEvent& WXUNUSED(event)) { m_textsw->Copy(); }
+    void OnPaste(wxCommandEvent& WXUNUSED(event)) { m_textsw->Paste(); }
+    void OnSelectAll(wxCommandEvent& WXUNUSED(event)) { m_textsw->SelectAll(); }
+
+    DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(TextEditView)
 };
 
diff --git a/samples/docvwmdi/view.cpp b/samples/docvwmdi/view.cpp
index bb2c0df297..51cfde610c 100644
--- a/samples/docvwmdi/view.cpp
+++ b/samples/docvwmdi/view.cpp
@@ -135,6 +135,12 @@ void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
 
 IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
 
+BEGIN_EVENT_TABLE(TextEditView, wxView)
+    EVT_MENU(wxID_COPY, TextEditView::OnCopy)
+    EVT_MENU(wxID_PASTE, TextEditView::OnPaste)
+    EVT_MENU(wxID_SELECTALL, TextEditView::OnSelectAll)
+END_EVENT_TABLE()
+
 bool TextEditView::OnCreate(wxDocument* doc, long WXUNUSED(flags) )
 {
     m_frame = wxGetApp().CreateChildFrame(doc, this, false);
diff --git a/samples/docvwmdi/view.h b/samples/docvwmdi/view.h
index d146d8cff4..8ac7c98ca9 100644
--- a/samples/docvwmdi/view.h
+++ b/samples/docvwmdi/view.h
@@ -60,7 +60,6 @@ protected:
 
 class TextEditView: public wxView
 {
-    DECLARE_DYNAMIC_CLASS(TextEditView)
 public:
     wxMDIChildFrame* m_frame;
     MyTextWindow* m_textsw;
@@ -73,6 +72,14 @@ public:
     virtual void OnUpdate(wxView *sender, wxObject *hint = NULL);
     virtual bool OnClose(bool deleteWindow = true);
     virtual bool ProcessEvent(wxEvent&);
+
+private:
+    void OnCopy(wxCommandEvent& WXUNUSED(event)) { m_textsw->Copy(); }
+    void OnPaste(wxCommandEvent& WXUNUSED(event)) { m_textsw->Paste(); }
+    void OnSelectAll(wxCommandEvent& WXUNUSED(event)) { m_textsw->SelectAll(); }
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(TextEditView)
 };
 
 #endif