no changes, just remove #if'd out code

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

diff --git a/include/wx/motif/slider.h b/include/wx/motif/slider.h
index 935ddbd88f07349454e6df738a97cc9879948b1f..50cab8140af93ff2fad565faebbc442fb0c7d4f9 100644 (file)
--- a/include/wx/motif/slider.h
+++ b/include/wx/motif/slider.h
@@ -1,33 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider.h
+// Name:        wx/motif/slider.h
 // Purpose:     wxSlider class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_
 #define _WX_SLIDER_H_
 
-#ifdef __GNUG__
-#pragma interface "slider.h"
-#endif
-
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
-
 // Slider
-class WXDLLEXPORT wxSlider: public wxControl
+class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
 {
     DECLARE_DYNAMIC_CLASS(wxSlider)
-        
+
 public:
     wxSlider();
-    
+
     wxSlider(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos = wxDefaultPosition,
@@ -38,9 +32,9 @@ public:
     {
         Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
     }
-    
-    ~wxSlider();
-    
+
+    virtual ~wxSlider();
+
     bool Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos = wxDefaultPosition,
@@ -48,51 +42,35 @@ public:
         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);
-    
+
 private:
     DECLARE_EVENT_TABLE()
 };