X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6695f8f8260b32219b42294531bfb7e2396cceef..b935c45dee0e6036de3e83c44015d14d3958ac7f:/samples/controls/controls.cpp

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 6ff54f2ae3..ab41f78dc8 100644
--- 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();
 }