diff --git a/samples/widgets/activityindicator.cpp b/samples/widgets/activityindicator.cpp
index c8e669b382..78e43bf6c6 100644
--- a/samples/widgets/activityindicator.cpp
+++ b/samples/widgets/activityindicator.cpp
@@ -64,7 +64,7 @@ public:
         m_sizerIndicator = NULL;
     }
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_indicator; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_indicator; }
     virtual void RecreateWidget() wxOVERRIDE;
 
     // lazy creation of the content
diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp
index f05f550179..8c00519826 100644
--- a/samples/widgets/bmpcombobox.cpp
+++ b/samples/widgets/bmpcombobox.cpp
@@ -103,7 +103,7 @@ class BitmapComboBoxWidgetsPage : public ItemContainerWidgetsPage
 public:
     BitmapComboBoxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_combobox; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_combobox; }
     virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_combobox; }
     virtual void RecreateWidget() wxOVERRIDE { CreateCombo(); }
 
diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp
index a586ffaa94..74b2bd55bb 100644
--- a/samples/widgets/button.cpp
+++ b/samples/widgets/button.cpp
@@ -91,7 +91,7 @@ public:
     ButtonWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~ButtonWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_button; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_button; }
     virtual void RecreateWidget() wxOVERRIDE { CreateButton(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/checkbox.cpp b/samples/widgets/checkbox.cpp
index f7f42dcc61..ba884b1f32 100644
--- a/samples/widgets/checkbox.cpp
+++ b/samples/widgets/checkbox.cpp
@@ -75,7 +75,7 @@ public:
     CheckBoxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~CheckBoxWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_checkbox; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_checkbox; }
     virtual void RecreateWidget() wxOVERRIDE { CreateCheckbox(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/choice.cpp b/samples/widgets/choice.cpp
index f43ec70181..7cd7216cbd 100644
--- a/samples/widgets/choice.cpp
+++ b/samples/widgets/choice.cpp
@@ -77,7 +77,7 @@ class ChoiceWidgetsPage : public ItemContainerWidgetsPage
 public:
     ChoiceWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_choice; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_choice; }
     virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_choice; }
     virtual void RecreateWidget() wxOVERRIDE { CreateChoice(); }
 
diff --git a/samples/widgets/clrpicker.cpp b/samples/widgets/clrpicker.cpp
index e3dfab4b92..bcdfeec931 100644
--- a/samples/widgets/clrpicker.cpp
+++ b/samples/widgets/clrpicker.cpp
@@ -65,7 +65,7 @@ public:
     ColourPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~ColourPickerWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_clrPicker; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_clrPicker; }
     virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp
index 702bd257fa..d3e19731fc 100644
--- a/samples/widgets/combobox.cpp
+++ b/samples/widgets/combobox.cpp
@@ -94,7 +94,7 @@ class ComboboxWidgetsPage : public ItemContainerWidgetsPage
 public:
     ComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_combobox; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_combobox; }
     virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_combobox; }
     virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_combobox; }
     virtual void RecreateWidget() wxOVERRIDE { CreateCombo(); }
diff --git a/samples/widgets/datepick.cpp b/samples/widgets/datepick.cpp
index 5381eed2af..0f4ca9cf36 100644
--- a/samples/widgets/datepick.cpp
+++ b/samples/widgets/datepick.cpp
@@ -70,7 +70,7 @@ public:
     DatePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~DatePickerWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_datePicker; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_datePicker; }
     virtual void RecreateWidget() wxOVERRIDE { CreateDatePicker(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/dirctrl.cpp b/samples/widgets/dirctrl.cpp
index 2c2b10f961..c9a4640229 100644
--- a/samples/widgets/dirctrl.cpp
+++ b/samples/widgets/dirctrl.cpp
@@ -98,7 +98,7 @@ public:
     DirCtrlWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~DirCtrlWidgetsPage() {}
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_dirCtrl; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_dirCtrl; }
     virtual void RecreateWidget() wxOVERRIDE { CreateDirCtrl(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/dirpicker.cpp b/samples/widgets/dirpicker.cpp
index 7b40342743..6f4849b804 100644
--- a/samples/widgets/dirpicker.cpp
+++ b/samples/widgets/dirpicker.cpp
@@ -67,7 +67,7 @@ public:
     DirPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~DirPickerWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_dirPicker; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_dirPicker; }
     virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/editlbox.cpp b/samples/widgets/editlbox.cpp
index 44a87dde5b..d71aa88740 100644
--- a/samples/widgets/editlbox.cpp
+++ b/samples/widgets/editlbox.cpp
@@ -69,7 +69,7 @@ class EditableListboxWidgetsPage : public WidgetsPage
 public:
     EditableListboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_lbox->GetListCtrl(); }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_lbox->GetListCtrl(); }
     virtual void RecreateWidget() wxOVERRIDE { CreateLbox(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/filectrl.cpp b/samples/widgets/filectrl.cpp
index a0f37722ca..27d5a5bc17 100644
--- a/samples/widgets/filectrl.cpp
+++ b/samples/widgets/filectrl.cpp
@@ -70,7 +70,7 @@ public:
     FileCtrlWidgetsPage( WidgetsBookCtrl *book, wxImageList *imaglist );
     virtual ~FileCtrlWidgetsPage() {}
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_fileCtrl; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_fileCtrl; }
     virtual void RecreateWidget() wxOVERRIDE { CreateFileCtrl(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/filepicker.cpp b/samples/widgets/filepicker.cpp
index 28ed5c50a8..23c4d4b047 100644
--- a/samples/widgets/filepicker.cpp
+++ b/samples/widgets/filepicker.cpp
@@ -74,7 +74,7 @@ public:
     FilePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~FilePickerWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_filePicker; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_filePicker; }
     virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/fontpicker.cpp b/samples/widgets/fontpicker.cpp
index 2579e88763..8121ae6eb7 100644
--- a/samples/widgets/fontpicker.cpp
+++ b/samples/widgets/fontpicker.cpp
@@ -65,7 +65,7 @@ public:
     FontPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~FontPickerWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_fontPicker; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_fontPicker; }
     virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/gauge.cpp b/samples/widgets/gauge.cpp
index b5f3756735..97f3995d6d 100644
--- a/samples/widgets/gauge.cpp
+++ b/samples/widgets/gauge.cpp
@@ -75,7 +75,7 @@ public:
     GaugeWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~GaugeWidgetsPage();
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_gauge; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_gauge; }
     virtual void RecreateWidget() wxOVERRIDE { CreateGauge(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/hyperlnk.cpp b/samples/widgets/hyperlnk.cpp
index dbd3c10d09..96553651c1 100644
--- a/samples/widgets/hyperlnk.cpp
+++ b/samples/widgets/hyperlnk.cpp
@@ -79,7 +79,7 @@ public:
     HyperlinkWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~HyperlinkWidgetsPage() {}
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_hyperlink; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_hyperlink; }
     virtual void RecreateWidget() wxOVERRIDE { CreateHyperlink(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp
index 9acf9ae092..350fd970d8 100644
--- a/samples/widgets/listbox.cpp
+++ b/samples/widgets/listbox.cpp
@@ -81,7 +81,7 @@ class ListboxWidgetsPage : public ItemContainerWidgetsPage
 public:
     ListboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_lbox; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_lbox; }
     virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_lbox; }
     virtual void RecreateWidget() wxOVERRIDE { CreateLbox(); }
 
diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp
index 9699e06c30..bb66d9ef5c 100644
--- a/samples/widgets/notebook.cpp
+++ b/samples/widgets/notebook.cpp
@@ -88,7 +88,7 @@ public:
     BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, const char *const icon[]);
     virtual ~BookWidgetsPage();
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_book; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_book; }
     virtual void RecreateWidget() wxOVERRIDE { RecreateBook(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/odcombobox.cpp b/samples/widgets/odcombobox.cpp
index e77a67aa35..e3e9486def 100644
--- a/samples/widgets/odcombobox.cpp
+++ b/samples/widgets/odcombobox.cpp
@@ -90,7 +90,7 @@ class ODComboboxWidgetsPage : public ItemContainerWidgetsPage
 public:
     ODComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_combobox; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_combobox; }
     virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE
         { return m_combobox ? m_combobox->GetTextCtrl() : NULL; }
     virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_combobox; }
diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp
index df494e64dc..1becd098e8 100644
--- a/samples/widgets/radiobox.cpp
+++ b/samples/widgets/radiobox.cpp
@@ -85,7 +85,7 @@ public:
     RadioWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~RadioWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_radio; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_radio; }
     virtual void RecreateWidget() wxOVERRIDE { CreateRadio(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp
index 21f452228d..23750f7a46 100644
--- a/samples/widgets/searchctrl.cpp
+++ b/samples/widgets/searchctrl.cpp
@@ -70,7 +70,7 @@ public:
     SearchCtrlWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~SearchCtrlWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_srchCtrl; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_srchCtrl; }
     virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_srchCtrl; }
     virtual void RecreateWidget() wxOVERRIDE;
 
diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp
index 3af4d6fc9a..e231e91123 100644
--- a/samples/widgets/slider.cpp
+++ b/samples/widgets/slider.cpp
@@ -96,7 +96,7 @@ public:
     SliderWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~SliderWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_slider; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_slider; }
     virtual void RecreateWidget() wxOVERRIDE { CreateSlider(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp
index a685b1c246..e947ebef35 100644
--- a/samples/widgets/spinbtn.cpp
+++ b/samples/widgets/spinbtn.cpp
@@ -86,7 +86,7 @@ public:
     SpinBtnWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~SpinBtnWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_spinbtn; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_spinbtn; }
     virtual Widgets GetWidgets() const wxOVERRIDE
     {
         Widgets widgets(WidgetsPage::GetWidgets());
diff --git a/samples/widgets/statbmp.cpp b/samples/widgets/statbmp.cpp
index f3474b1472..d0d834dc24 100644
--- a/samples/widgets/statbmp.cpp
+++ b/samples/widgets/statbmp.cpp
@@ -52,7 +52,7 @@ public:
         : WidgetsPage(book, imaglist, statbmp_xpm) {}
 
     virtual void CreateContent() wxOVERRIDE;
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_statbmp; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_statbmp; }
     virtual void RecreateWidget() wxOVERRIDE;
 
 private:
diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index e66dfc0b5b..36827f50ae 100644
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -93,7 +93,7 @@ public:
     StaticWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~StaticWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_statText; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_statText; }
     virtual Widgets GetWidgets() const wxOVERRIDE
     {
         Widgets widgets;
diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index 741a2f5c1f..311ca4d785 100644
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -138,7 +138,7 @@ public:
     TextWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~TextWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_text; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_text; }
     virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_text; }
     virtual void RecreateWidget() wxOVERRIDE { CreateText(); }
 
diff --git a/samples/widgets/timepick.cpp b/samples/widgets/timepick.cpp
index 2d6c85b21a..a25ea0cba7 100644
--- a/samples/widgets/timepick.cpp
+++ b/samples/widgets/timepick.cpp
@@ -66,7 +66,7 @@ public:
     TimePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~TimePickerWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_timePicker; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_timePicker; }
     virtual void RecreateWidget() wxOVERRIDE { CreateTimePicker(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/toggle.cpp b/samples/widgets/toggle.cpp
index e358098c3f..6ac8c99850 100644
--- a/samples/widgets/toggle.cpp
+++ b/samples/widgets/toggle.cpp
@@ -89,7 +89,7 @@ public:
     ToggleWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~ToggleWidgetsPage(){};
 
-    virtual wxControl *GetWidget() const wxOVERRIDE { return m_toggle; }
+    virtual wxWindow *GetWidget() const wxOVERRIDE { return m_toggle; }
     virtual void RecreateWidget() wxOVERRIDE { CreateToggle(); }
 
     // lazy creation of the content
diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index eb3bc2106a..96dcf4c40b 100644
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -83,7 +83,7 @@ enum
     ALL_CTRLS        = 1 << ALL_PAGE
 };
 
-typedef wxVector<wxControl *> Widgets;
+typedef wxVector<wxWindow *> Widgets;
 
 // ----------------------------------------------------------------------------
 // WidgetsPage: a book page demonstrating some widget
@@ -131,7 +131,7 @@ public:
                 const char *const icon[]);
 
     // return the control shown by this page
-    virtual wxControl *GetWidget() const = 0;
+    virtual wxWindow *GetWidget() const = 0;
 
     // return the control shown by this page, if it supports text entry interface
     virtual wxTextEntryBase *GetTextEntry() const { return NULL; }