Attempting to check in this wretched cursor again. Also added SetAcceleratorTable

[wxWidgets.git] / samples / controls / controls.cpp

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index bd57a74f0af58b3a5bf6b5836928118ce5584617..a6fa25ad15ef454f5b4799a24cc5df7cc4c5edae 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -123,20 +123,6 @@ bool MyApp::OnInit(void)
   return TRUE;
 }
 
   return TRUE;
 }
 

-//----------------------------------------------------------------------
-// MyTextCtrl
-//----------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
-  EVT_RIGHT_DOWN   (MyTextCtrl::OnRightButton)
-END_EVENT_TABLE()
-  
-MyTextCtrl::MyTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
-      const wxPoint &pos, const wxSize &size, int style ) :
-  wxTextCtrl( parent, id, value, pos, size, style )
-{
-}
-

 //----------------------------------------------------------------------
 // MyPanel
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // MyPanel
 //----------------------------------------------------------------------


@@ -386,7 +372,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) )