Remove the Innotek for OS/2 addition...configure now deals with this correctly on...

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

diff --git a/include/wx/slider.h b/include/wx/slider.h
index cc0a5b61a55347ea031188428fe1a25013a38a98..894b8515fa649bc537d17f636f0951e496a386cc 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -42,6 +42,7 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxSliderNameStr);
     */
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxSliderNameStr);
     */

+    wxSliderBase() { }

 
     // get/set the current slider value (should be in range)
     virtual int GetValue() const = 0;
 
     // get/set the current slider value (should be in range)
     virtual int GetValue() const = 0;


@@ -51,6 +52,8 @@ public:
     virtual void SetRange(int minValue, int maxValue) = 0;
     virtual int GetMin() const = 0;
     virtual int GetMax() const = 0;
     virtual void SetRange(int minValue, int maxValue) = 0;
     virtual int GetMin() const = 0;
     virtual int GetMax() const = 0;

+    void SetMin( int minValue ) { SetRange( minValue , GetMax() ) ; }
+    void SetMax( int maxValue ) { SetRange( GetMin() , maxValue ) ; }

 
     // the line/page size is the increment by which the slider moves when
     // cursor arrow key/page up or down are pressed (clicking the mouse is like
 
     // the line/page size is the increment by which the slider moves when
     // cursor arrow key/page up or down are pressed (clicking the mouse is like


@@ -76,6 +79,9 @@ public:
     virtual int GetSelEnd() const { return GetMin(); }
     virtual int GetSelStart() const { return GetMax(); }
     virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
     virtual int GetSelEnd() const { return GetMin(); }
     virtual int GetSelStart() const { return GetMax(); }
     virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }

+
+private:
+    DECLARE_NO_COPY_CLASS(wxSliderBase)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -85,25 +91,18 @@ public:
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/slider.h"
 #elif defined(__WXMSW__)
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/slider.h"
 #elif defined(__WXMSW__)

-    #ifdef __WIN95__
-        #include "wx/msw/slider95.h"
-        #define wxSlider wxSlider95
-        #define sm_classwxSlider sm_classwxSlider95
-    #else // Win16
-        #include "wx/msw/slidrmsw.h"
-        #define wxSlider wxSliderMSW
-        #define sm_classwxSlider sm_classwxSliderMSW
-    #endif // Win32/Win16
+    #include "wx/msw/slider95.h"
+    #define wxSlider wxSlider95

 #elif defined(__WXMOTIF__)
     #include "wx/motif/slider.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/slider.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/slider.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/slider.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/slider.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/slider.h"

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/slider.h"

 #elif defined(__WXPM__)
     #include "wx/os2/slider.h"
 #elif defined(__WXPM__)
     #include "wx/os2/slider.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/slider.h"

 #endif
 
 #endif // wxUSE_SLIDER
 #endif
 
 #endif // wxUSE_SLIDER