made wxLog::Set/GetVerbose() static back again

[wxWidgets.git] / include / wx / os2 / slider.h

diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h
index 09ed09095772278e80f12388854789c66987ec5b..ba675da4d1633e2a43666aec84450dcef513fa1c 100644 (file)
--- a/include/wx/os2/slider.h
+++ b/include/wx/os2/slider.h
@@ -17,7 +17,7 @@
 WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
 
 // Slider
 WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
 
 // Slider

-class WXDLLEXPORT wxSlider: public wxControl
+class WXDLLEXPORT wxSlider: public wxSliderBase

 {
   DECLARE_DYNAMIC_CLASS(wxSlider)
 
 {
   DECLARE_DYNAMIC_CLASS(wxSlider)
 


@@ -30,11 +30,7 @@ public:
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,
 #if wxUSE_VALIDATORS
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

-#  endif

 #endif
            const wxString& name = wxSliderNameStr)
   {
 #endif
            const wxString& name = wxSliderNameStr)
   {


@@ -49,11 +45,7 @@ public:
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,
 #if wxUSE_VALIDATORS
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

-#  endif

 #endif
            const wxString& name = wxSliderNameStr);
 
 #endif
            const wxString& name = wxSliderNameStr);