X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/301cd871a221ca5c0f1c20df50c654a3e7a388fe..5fb9fcfc01e19f91f42993d2c3fa2724531df856:/samples/controls/controls.cpp?ds=sidebyside

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 1aef2bffab..2fe910ca8b 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -63,7 +63,7 @@ public:
                const wxPoint &pos, const wxSize &size, int style = 0)
         : wxTextCtrl(parent, id, value, pos, size, style) { }
 
-    void OnChar(wxKeyEvent& event);
+    void OnKeyDown(wxKeyEvent& event);
 
 private:
     DECLARE_EVENT_TABLE()
@@ -125,6 +125,7 @@ class MyFrame: public wxFrame
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnIdle( wxIdleEvent& event );
+    void OnSize( wxSizeEvent& event );
 
   DECLARE_EVENT_TABLE()
 };
@@ -176,10 +177,10 @@ bool MyApp::OnInit(void)
 //----------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
-    EVT_CHAR(MyTextCtrl::OnChar)
+    EVT_KEY_DOWN(MyTextCtrl::OnKeyDown)
 END_EVENT_TABLE()
 
-void MyTextCtrl::OnChar(wxKeyEvent& event)
+void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
 {
     switch ( event.KeyCode() )
     {
@@ -314,8 +315,9 @@ BEGIN_EVENT_TABLE(MyPanel, wxPanel)
   EVT_BUTTON    (ID_MOVE_END_ENTRY,       MyPanel::OnMoveToEndOfEntry)
 END_EVENT_TABLE()
 
-MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
-  wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) )
+MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
+       : m_notebook(NULL), m_text(NULL),
+         wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) )
 {
 //  SetBackgroundColour("cadet blue");
 
@@ -387,19 +389,13 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
 
 #endif
 
-  wxButton *button = (wxButton*)NULL;
-
-//  m_notebook->SetBackgroundColour("cadet blue");
-
+  wxButton *button = (wxButton*) NULL;  /* who did this ? */
   wxPanel *panel = (wxPanel*) NULL;
 
   panel = new wxPanel(m_notebook);
-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");
   m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 5, choices );
   m_listbox->SetToolTip( "This is a list box" );
 
-//  m_listbox->SetBackgroundColour("wheat");
   (void)new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
@@ -408,17 +404,13 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   button = new wxButton( panel, ID_LISTBOX_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) );
   button->SetToolTip( "Press here to set italic font" );
 
-//  button->SetForegroundColour( "red" );
   m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
   m_checkbox->SetValue(FALSE);
   m_checkbox->SetToolTip( "Click here to disable the listbox" );
   m_notebook->AddPage(panel, "wxList", TRUE, Image_List);
 
   panel = new wxPanel(m_notebook);
-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");
   m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices );
-//  m_choice->SetBackgroundColour("wheat");
   (void)new wxButton( panel, ID_CHOICE_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_CHOICE_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_CHOICE_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
@@ -429,10 +421,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
 
   panel = new wxPanel(m_notebook);
-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");
   m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(10,10), wxSize(120,-1), 5, choices );
-//  m_combo->SetBackgroundColour("wheat");
   (void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
@@ -443,21 +432,17 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
 
   panel = new wxPanel(m_notebook);
-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");
-  m_textentry = new MyTextCtrl( panel, -1, "Write text here.",
-                                wxPoint(10,10), wxSize(320,28),
+  m_textentry = new MyTextCtrl( panel, -1, "Write text here.", wxPoint(10,10), wxSize(320,28),
                                 wxTE_PROCESS_ENTER);
-  (*m_textentry) << " More text.";
-//  m_textentry->SetBackgroundColour("wheat");
-  m_multitext = new MyTextCtrl( panel, ID_TEXT, "And here.",
-                                wxPoint(10,50), wxSize(320,80),
+  (*m_textentry) << " More text.";          // this text is appended
+  m_textentry->SetInsertionPoint(0);
+  m_textentry->WriteText("Less text.");     // this text is prepended
+
+  m_multitext = new MyTextCtrl( panel, ID_TEXT, "And here.", wxPoint(10,50), wxSize(320,70),
                                 wxTE_MULTILINE );
-  (*m_multitext) << " More text."
-                 << "\nPress Fn keys to test different wxTextCtrl functions";
-//  m_multitext->SetBackgroundColour("wheat");
-  (void)new MyTextCtrl( panel, -1, "This one is with wxTE_PROCESS_TAB style.",
-                        wxPoint(10,140), wxSize(320,80), wxTE_MULTILINE | wxTE_PROCESS_TAB);
+  (*m_multitext) << " More text.\nPress function keys to test different \nwxTextCtrl functions.";
+  new MyTextCtrl( panel, -1, "This one is with wxTE_PROCESS_TAB style.",
+                             wxPoint(10,120), wxSize(320,70), wxTE_MULTILINE | wxTE_PROCESS_TAB);
 
   (void)new wxStaticBox( panel, -1, "&Move cursor to the end of:",
                          wxPoint(345, 0), wxSize(160, 100) );
@@ -465,9 +450,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
                      wxPoint(370, 20), wxSize(110, 30));
   (void)new wxButton(panel, ID_MOVE_END_ZONE, "Text &zone",
                      wxPoint(370, 60), wxSize(110, 30));
-  (void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(345,120), wxSize(160,100) );
-  (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(370,140), wxSize(110,30) );
-  (void)new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(370,180), wxSize(110,30) );
+  (void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(338,120), wxSize(160,100) );
+  (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(362,140), wxSize(110,30) );
+  (void)new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(362,180), wxSize(110,30) );
   m_notebook->AddPage(panel, "wxTextCtrl" , FALSE, Image_Text);
 
   wxString choices2[] =
@@ -477,15 +462,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   };
 
   panel = new wxPanel(m_notebook);
-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");
   (void)new wxRadioBox( panel, ID_RADIOBOX, "That", wxPoint(10,160), wxSize(-1,-1), 2, choices2, 1, wxRA_SPECIFY_ROWS );
-  m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), 5, choices, 2, wxRA_SPECIFY_COLS );
-//  m_radio->SetBackgroundColour("wheat");
+  m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), 5, choices, 1, wxRA_SPECIFY_COLS );
   (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "Select 'This'", wxPoint(180,80), wxSize(140,30) );
   m_fontButton = new wxButton( panel, ID_SET_FONT, "Set more Italic font", wxPoint(340,30), wxSize(140,30) );
-//  m_fontButton->SetForegroundColour("blue");
   (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set Italic font", wxPoint(340,80), wxSize(140,30) );
   (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "Disable", wxPoint(340,130), wxSize(140,30) );
   wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30) );
@@ -494,13 +475,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
 
   panel = new wxPanel(m_notebook);
-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");
   (void)new wxStaticBox( panel, -1, "wxGauge and wxSlider", wxPoint(10,10), wxSize(180,130) );
   m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30) );
-//  m_gauge->SetBackgroundColour("wheat");
   m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1) );
-//  m_slider->SetBackgroundColour("wheat");
   (void)new wxStaticBox( panel, -1, "Explanation", wxPoint(200,10), wxSize(290,130) );
 #ifdef __WXMOTIF__
   // No wrapping text in wxStaticText yet :-(
@@ -518,15 +495,12 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
     "This is also supposed to demonstrate how\n"
     "to use static controls.\n",
     wxPoint(208,25),
-    wxSize(210, 110)
+    wxSize(250, 110)
     );
 #endif
   m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );
-//  m_spintext->SetBackgroundColour("wheat");
   m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) );
-//  m_spinbutton->SetBackgroundColour("wheat");
   m_spinbutton->SetRange(0,100);
-
   m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
 }
 
@@ -639,16 +613,16 @@ void MyPanel::OnPageChanged( wxNotebookEvent &event )
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {
-  m_text->WriteText( "ListBox selection string is: " );
-  m_text->WriteText( event.GetString() );
-  m_text->WriteText( "\n" );
+  m_text->AppendText( "ListBox selection string is: " );
+  m_text->AppendText( event.GetString() );
+  m_text->AppendText( "\n" );
 }
 
 void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event )
 {
-  m_text->WriteText( "ListBox double click string is: " );
-  m_text->WriteText( event.GetString() );
-  m_text->WriteText( "\n" );
+  m_text->AppendText( "ListBox double click string is: " );
+  m_text->AppendText( event.GetString() );
+  m_text->AppendText( "\n" );
 }
 
 void MyPanel::OnListBoxButtons( wxCommandEvent &event )
@@ -657,14 +631,12 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
   {
     case ID_LISTBOX_ENABLE:
     {
-      m_text->WriteText("Checkbox clicked.\n");
-#ifdef __WXGTK__
+      m_text->AppendText("Checkbox clicked.\n");
       wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
       if (event.GetInt())
         cb->SetToolTip( "Click to enable listbox" );
       else
         cb->SetToolTip( "Click to disable listbox" );
-#endif
       m_listbox->Enable( event.GetInt() == 0 );
       break;
     }
@@ -705,9 +677,9 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 
 void MyPanel::OnChoice( wxCommandEvent &event )
 {
-  m_text->WriteText( "Choice selection string is: " );
-  m_text->WriteText( event.GetString() );
-  m_text->WriteText( "\n" );
+  m_text->AppendText( "Choice selection string is: " );
+  m_text->AppendText( event.GetString() );
+  m_text->AppendText( "\n" );
 }
 
 void MyPanel::OnChoiceButtons( wxCommandEvent &event )
@@ -755,9 +727,9 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
 
 void MyPanel::OnCombo( wxCommandEvent &event )
 {
-  m_text->WriteText( "ComboBox selection string is: " );
-  m_text->WriteText( event.GetString() );
-  m_text->WriteText( "\n" );
+  m_text->AppendText( "ComboBox selection string is: " );
+  m_text->AppendText( event.GetString() );
+  m_text->AppendText( "\n" );
 }
 
 void MyPanel::OnComboButtons( wxCommandEvent &event )
@@ -805,9 +777,9 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
 
 void MyPanel::OnRadio( wxCommandEvent &event )
 {
-  m_text->WriteText( "RadioBox selection string is: " );
-  m_text->WriteText( event.GetString() );
-  m_text->WriteText( "\n" );
+  m_text->AppendText( "RadioBox selection string is: " );
+  m_text->AppendText( event.GetString() );
+  m_text->AppendText( "\n" );
 }
 
 void MyPanel::OnRadioButtons( wxCommandEvent &event )
@@ -867,13 +839,14 @@ MyPanel::~MyPanel()
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(MINIMAL_QUIT,   MyFrame::OnQuit)
     EVT_MENU(MINIMAL_ABOUT,  MyFrame::OnAbout)
+    EVT_SIZE(MyFrame::OnSize)
     EVT_IDLE(MyFrame::OnIdle)
 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))
 {
-    CreateStatusBar();
+    CreateStatusBar(2);
 
     (void)new MyPanel( this, 10, 10, 300, 100 );
 }
@@ -889,6 +862,15 @@ void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
   dialog.ShowModal();
 }
 
+void MyFrame::OnSize( wxSizeEvent& event )
+{
+    wxString msg;
+    msg.Printf("%dx%d", event.GetSize().x, event.GetSize().y);
+    SetStatusText(msg, 1);
+
+    event.Skip();
+}
+
 void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {
     // track the window which has the focus in the status bar