documented need to install ZIP handler

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index a2781cc874d844878d59de23af0b3b863d48c3bb..e29c0b52364b3e618f3a76b78928c62788db4699 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -272,7 +272,7 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
         : wxRadioBox(parent, id, title, pos, size, n, choices, majorDim,
-                     style, validator, name) { }
+                     style, validator, name) { SetForegroundColour(*wxRED); }
 
 protected:
     void OnFocusGot(wxFocusEvent& event)
@@ -682,6 +682,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     panel = new wxPanel(m_notebook);
     (void)new MyRadioBox( panel, ID_RADIOBOX, "&That", wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );
     m_radio = new wxRadioBox( panel, ID_RADIOBOX, "T&his", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS );
+    m_radio->SetForegroundColour(*wxRED);
 
 #if wxUSE_TOOLTIPS
     m_combo->SetToolTip("This is a natural\ncombobox - can you believe me?");
@@ -709,6 +710,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1),
                              wxSL_AUTOTICKS | wxSL_LABELS );
     m_slider->SetTickFreq(40, 0);
+#if wxUSE_TOOLTIPS
+    m_slider->SetToolTip(_T("This is a sliding slider"));
+#endif // wxUSE_TOOLTIPS
+
     (void)new wxStaticBox( panel, -1, "&Explanation",
                            wxPoint(230,10), wxSize(270,130),
                            wxALIGN_CENTER );
@@ -757,11 +762,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
 #if !defined(__WXMOTIF__) && !defined(__WIN16__)  // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16.
     wxIcon icon = wxArtProvider::GetIcon(wxART_INFORMATION);
-    wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon,
-                                                   wxPoint(10, 10));
+    (void) new wxStaticBitmap( panel, -1, icon, wxPoint(10, 10) );
 
-    bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10));
-    bmpStatic->SetIcon(wxArtProvider::GetIcon(wxART_QUESTION));
+    // VZ: don't leak memory
+    // bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10));
+    // bmpStatic->SetIcon(wxArtProvider::GetIcon(wxART_QUESTION));
 #endif // !Motif
 
     wxBitmap bitmap( 100, 100 );
@@ -1139,10 +1144,12 @@ void MyPanel::OnCombo( wxCommandEvent &event )
     m_text->AppendText( "\n" );
 }
 
-void MyPanel::OnComboTextChanged(wxCommandEvent& WXUNUSED(event))
+void MyPanel::OnComboTextChanged(wxCommandEvent& event)
 {
-    wxLogMessage(_T("Text in the combobox changed: now is '%s'."),
-                 m_combo->GetValue().c_str());
+    wxString str;
+    str.Printf( wxT("Text in the combobox changed: now is '%s'."),
+                event.GetString().c_str() );
+    wxLogMessage( str.c_str() );
 }
 
 void MyPanel::OnComboTextEnter(wxCommandEvent& WXUNUSED(event))
@@ -1222,6 +1229,8 @@ void MyPanel::OnRadioButtons( wxCommandEvent &event )
             }
         case ID_RADIOBOX_FONT:
             {
+                    m_radio->SetForegroundColour(*wxGREEN);
+
                 m_radio->SetFont( *wxITALIC_FONT );
                 break;
             }
@@ -1253,8 +1262,8 @@ void MyPanel::OnSpinCtrlText(wxCommandEvent& event)
     if ( m_spinctrl )
     {
         wxString s;
-        s.Printf(_T("Spin ctrl text changed: now %d (from event: %s)\n"),
-                 m_spinctrl->GetValue(), event.GetString());
+        s.Printf( _T("Spin ctrl text changed: now %d (from event: %s)\n"),
+                 m_spinctrl->GetValue(), event.GetString().c_str() );
         m_text->AppendText(s);
     }
 }
@@ -1264,8 +1273,8 @@ void MyPanel::OnSpinCtrl(wxSpinEvent& event)
     if ( m_spinctrl )
     {
         wxString s;
-        s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"),
-                 m_spinctrl->GetValue(), event.GetInt());
+        s.Printf( _T("Spin ctrl changed: now %d (from event: %ld)\n"),
+                 m_spinctrl->GetValue(), event.GetInt() );
         m_text->AppendText(s);
     }
 }
@@ -1274,8 +1283,9 @@ void MyPanel::OnSpinCtrlUp(wxSpinEvent& event)
 {
     if ( m_spinctrl )
     {
-        m_text->AppendText(wxString::Format(_T("Spin up: %d (from event: %d)\n"),
-                           m_spinctrl->GetValue(), event.GetInt()));
+        m_text->AppendText( wxString::Format(
+            _T("Spin up: %d (from event: %ld)\n"),
+            m_spinctrl->GetValue(), event.GetInt() ) );
     }
 }
 
@@ -1283,8 +1293,9 @@ void MyPanel::OnSpinCtrlDown(wxSpinEvent& event)
 {
     if ( m_spinctrl )
     {
-        m_text->AppendText(wxString::Format(_T("Spin down: %d (from event: %d)\n"),
-                           m_spinctrl->GetValue(), event.GetInt()));
+        m_text->AppendText( wxString::Format(
+            _T("Spin down: %d (from event: %ld)\n"),
+            m_spinctrl->GetValue(), event.GetInt() ) );
     }
 }
 
@@ -1558,7 +1569,7 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 #endif
                 s_windowFocus->GetClassInfo()->GetClassName()
 #ifdef __WXMSW__
-                , s_windowFocus->GetHWND()
+                , (unsigned int) s_windowFocus->GetHWND()
 #endif
                   );