added test for text ctrls with the same id

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

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index 6fc3a71448255cbd9f123b7bc1aa8fd4523df60f..f534553804011ffea7760de78ca2adbdb8de81ac 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -66,6 +66,7 @@ public:
     void OnKeyDown(wxKeyEvent& event);
     void OnKeyUp(wxKeyEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnKeyDown(wxKeyEvent& event);
     void OnKeyUp(wxKeyEvent& event);
     void OnChar(wxKeyEvent& event);

+    void OnText(wxCommandEvent& event);

 
     bool  m_hasCapture;
 
 
     bool  m_hasCapture;
 


@@ -239,6 +240,7 @@ BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
     EVT_KEY_DOWN(MyTextCtrl::OnKeyDown)
     EVT_KEY_UP(MyTextCtrl::OnKeyUp)
     EVT_CHAR(MyTextCtrl::OnChar)
     EVT_KEY_DOWN(MyTextCtrl::OnKeyDown)
     EVT_KEY_UP(MyTextCtrl::OnKeyUp)
     EVT_CHAR(MyTextCtrl::OnChar)

+    EVT_TEXT(-1, MyTextCtrl::OnText)

 END_EVENT_TABLE()
 
 void MyTextCtrl::LogEvent(const wxChar *name, wxKeyEvent& event) const
 END_EVENT_TABLE()
 
 void MyTextCtrl::LogEvent(const wxChar *name, wxKeyEvent& event) const


@@ -370,16 +372,19 @@ void MyTextCtrl::LogEvent(const wxChar *name, wxKeyEvent& event) const
 
 }
 
 
 }
 

-void MyTextCtrl::OnChar(wxKeyEvent& event)
+void MyTextCtrl::OnText(wxCommandEvent& event)

 {
 {

-    LogEvent( _T("Char"), event);
-
-    wxWindow *win = (wxWindow *)event.GetEventObject();
+    MyTextCtrl *win = (MyTextCtrl *)event.GetEventObject();

     const wxChar *data = (const wxChar *)(win->GetClientData());
     if ( data )
     {
     const wxChar *data = (const wxChar *)(win->GetClientData());
     if ( data )
     {

-        wxLogMessage(_T(" (from control '%s')"), data);
+        wxLogMessage(_T("text changed in control '%s'"), data);

     }
     }

+}
+
+void MyTextCtrl::OnChar(wxKeyEvent& event)
+{
+    LogEvent( _T("Char"), event);

 
 /*  How are we supposed to test wxTE_PROCESS_TAB with this code?
 
 
 /*  How are we supposed to test wxTE_PROCESS_TAB with this code?