Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/motif/slider.h b/include/wx/motif/slider.h
index fd9e5b3c288898f4d564e848a22e5469e72094e4..50cab8140af93ff2fad565faebbc442fb0c7d4f9 100644 (file)
--- a/include/wx/motif/slider.h
+++ b/include/wx/motif/slider.h
@@ -1,101 +1,79 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_
 #define _WX_SLIDER_H_
 

-#ifdef __GNUG__
-#pragma interface "slider.h"
-#endif
-

 #include "wx/control.h"
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
-

 // Slider
 // Slider

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

 {
 {

-DECLARE_DYNAMIC_CLASS(wxSlider)
+    DECLARE_DYNAMIC_CLASS(wxSlider)

 
 public:
     wxSlider();
 
     wxSlider(wxWindow *parent, wxWindowID id,
 
 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);
     }
 
     {
         Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
     }
 

-    ~wxSlider();
+    virtual ~wxSlider();

 
     bool Create(wxWindow *parent, wxWindowID id,
 
     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);
 
 
     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 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 SetPageSize(int pageSize);
     int GetPageSize() const ;

-    void ClearSel() ;
-    void ClearTicks() ;

     void SetLineSize(int lineSize);
     int GetLineSize() const ;
     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 SetThumbLength(int len) ;
     int GetThumbLength() const ;

-    void SetTick(int tickPos) ;

 
     void Command(wxCommandEvent& event);
 
 
     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;
 protected:
     int           m_rangeMin;
     int           m_rangeMax;
     int           m_pageSize;
     int           m_lineSize;

-    int           m_tickFreq;

 
     virtual void DoSetSize(int x, int y,
 
     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
 
 private:
     DECLARE_EVENT_TABLE()
 };
 
 #endif

-    // _WX_SLIDER_H_
+// _WX_SLIDER_H_