WXUSINGDLL is defined when building samples on non-MSW platforms for simplicity,...

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

diff --git a/include/wx/motif/slider.h b/include/wx/motif/slider.h
index fd9e5b3c288898f4d564e848a22e5469e72094e4..f46acf7dbad318c2d0b35ffb592808c17a02eacf 100644 (file)
--- a/include/wx/motif/slider.h
+++ b/include/wx/motif/slider.h
@@ -12,90 +12,72 @@
 #ifndef _WX_SLIDER_H_
 #define _WX_SLIDER_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "slider.h"
 #endif
 
 #include "wx/control.h"
 
-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)
+        
 public:
     wxSlider();
-
+    
     wxSlider(wxWindow *parent, wxWindowID id,
-            int value, int minValue, int maxValue,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxSL_HORIZONTAL,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxSliderNameStr)
+        int value, int minValue, int maxValue,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = wxSL_HORIZONTAL,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxSliderNameStr)
     {
         Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
     }
-
+    
     ~wxSlider();
-
+    
     bool Create(wxWindow *parent, wxWindowID id,
-            int value, int minValue, int maxValue,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxSL_HORIZONTAL,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxSliderNameStr);
-
+        int value, int minValue, int maxValue,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = wxSL_HORIZONTAL,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxSliderNameStr);
+    
     virtual int GetValue() const ;
     virtual void SetValue(int);
-
-    void GetSize(int *x, int *y) const ;
-
+    
     void SetRange(int minValue, int maxValue);
-
+    
     inline int GetMin() const { return m_rangeMin; }
     inline int GetMax() const { return m_rangeMax; }
-
+    
     // For trackbars only
-    void SetTickFreq(int n, int pos);
-    inline int GetTickFreq() const { return m_tickFreq; }
     void SetPageSize(int pageSize);
     int GetPageSize() const ;
-    void ClearSel() ;
-    void ClearTicks() ;
     void SetLineSize(int lineSize);
     int GetLineSize() const ;
-    int GetSelEnd() const ;
-    int GetSelStart() const ;
-    void SetSelection(int minPos, int maxPos);
     void SetThumbLength(int len) ;
     int GetThumbLength() const ;
-    void SetTick(int tickPos) ;
-
+    
     void Command(wxCommandEvent& event);
-
-    // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-
+    
 protected:
     int           m_rangeMin;
     int           m_rangeMax;
     int           m_pageSize;
     int           m_lineSize;
-    int           m_tickFreq;
-
+    
     virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
+        int width, int height,
+        int sizeFlags = wxSIZE_AUTO);
+    
 private:
     DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // _WX_SLIDER_H_
+// _WX_SLIDER_H_