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 d8b8d9f5d5c416f06c000ffe519ea2ae7c155b60..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
 // 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 wxSliderBase
+class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase

 {
     DECLARE_DYNAMIC_CLASS(wxSlider)
 {
     DECLARE_DYNAMIC_CLASS(wxSlider)

-        
+

 public:
     wxSlider();
 public:
     wxSlider();

-    
+

     wxSlider(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos = wxDefaultPosition,
     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);
     }
     {
         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,
     bool Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos = wxDefaultPosition,


@@ -48,15 +42,15 @@ public:
         long style = wxSL_HORIZONTAL,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxSliderNameStr);
         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 SetRange(int minValue, int maxValue);
     void SetRange(int minValue, int maxValue);

-    
+

     inline int GetMin() const { return m_rangeMin; }
     inline int GetMax() const { return m_rangeMax; }
     inline int GetMin() const { return m_rangeMin; }
     inline int GetMax() const { return m_rangeMax; }

-    
+

     // For trackbars only
     void SetPageSize(int pageSize);
     int GetPageSize() const ;
     // For trackbars only
     void SetPageSize(int pageSize);
     int GetPageSize() const ;


@@ -64,19 +58,19 @@ public:
     int GetLineSize() const ;
     void SetThumbLength(int len) ;
     int GetThumbLength() const ;
     int GetLineSize() const ;
     void SetThumbLength(int len) ;
     int GetThumbLength() const ;

-    
+

     void Command(wxCommandEvent& event);
     void Command(wxCommandEvent& event);

-    
+

 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;

-    
+

     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);

-    
+

 private:
     DECLARE_EVENT_TABLE()
 };
 private:
     DECLARE_EVENT_TABLE()
 };