fix the definition of many static functions marked as 'const' or functions which...

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 6ff54f2ae36d6da84ce7105a3432b356dc0b4348..ab41f78dc8583106335743b39360bdb5f584c186 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -34,10 +34,6 @@
     #define USE_XPM
 #endif
 
-#if defined(__WXGTK__)
-    #include "wx/gtk/private.h"
-#endif
-
 #ifdef USE_XPM
     #include "mondrian.xpm"
     #include "icons/choice.xpm"
@@ -1319,7 +1315,7 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 
 static wxString GetDataString(wxClientData *data)
 {
-    return data ? wx_static_cast(wxStringClientData *, data)->GetData()
+    return data ? static_cast<wxStringClientData *>(data)->GetData()
                 : wxString("none");
 }
 
@@ -1916,8 +1912,8 @@ void MyFrame::OnMove( wxMoveEvent& event )
 
 void MyFrame::OnIconized( wxIconizeEvent& event )
 {
-    wxLogMessage(_T("Frame %s"), event.Iconized() ? _T("iconized")
-                                                  : _T("restored"));
+    wxLogMessage(_T("Frame %s"), event.IsIconized() ? _T("iconized")
+                                                    : _T("restored"));
     event.Skip();
 }