controls.cpp didn't compile - missing MyTextCtrl declaration added (and what

OnRightButton is supposed to do?)

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index bd57a74f0af58b3a5bf6b5836928118ce5584617..cbc9cecf82de5aa086e01c8b1dee8102e459611e 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -127,8 +127,19 @@ bool MyApp::OnInit(void)
 // MyTextCtrl
 //----------------------------------------------------------------------
 
 // MyTextCtrl
 //----------------------------------------------------------------------
 

+class MyTextCtrl : public wxTextCtrl
+{
+public:
+  MyTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
+              const wxPoint &pos, const wxSize &size, int style );
+
+  void OnRightButton(wxCommandEvent&) { }
+
+DECLARE_EVENT_TABLE()
+};
+

 BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
 BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)

-  EVT_RIGHT_DOWN   (MyTextCtrl::OnRightButton)
+  EVT_RIGHT_DOWN(MyTextCtrl::OnRightButton)

 END_EVENT_TABLE()
   
 MyTextCtrl::MyTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
 END_EVENT_TABLE()
   
 MyTextCtrl::MyTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,


@@ -386,7 +397,7 @@ END_EVENT_TABLE()
 MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
   wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
 {
 MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
   wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
 {

-  (void*) new MyPanel( this, 10, 10, 300, 100 );
+  (void)new MyPanel( this, 10, 10, 300, 100 );

 }
 
 void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )
 }
 
 void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )