added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/gtk1/slider.h b/include/wx/gtk1/slider.h
index c94dae8403fbc4945cbe45506ba82f4eb6bc0ebd..acc01928b18665366d6f24ba46174218baf14dbc 100644 (file)
--- a/include/wx/gtk1/slider.h
+++ b/include/wx/gtk1/slider.h
@@ -1,89 +1,70 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider.h
+// Name:        wx/gtk/slider.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKSLIDERH__
 #define __GTKSLIDERH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
-#include "wx/defs.h"
-
-#if wxUSE_SLIDER
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxSlider;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxSliderNameStr;
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxSlider
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
-class wxSlider: public wxControl
+class wxSlider : public wxSliderBase
 {
 public:
-    wxSlider() {}
-    inline 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 )
+    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)
     {
-      Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
+        Create( parent, id, value, minValue, maxValue,
+                pos, size, style, validator, name );
     }
-    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 );
+
+    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);
+
+    // implement the base class pure virtuals
     virtual int GetValue() const;
-    virtual void SetValue( int );
-    void SetRange( int minValue, int maxValue );
-    int GetMin() const;
-    int GetMax() const;
-    void SetTickFreq( int n, int pos );
-    int GetTickFreq() const;
-    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 );
+    virtual void SetValue(int value);
 
-    // implementation
-    // --------------
+    virtual void SetRange(int minValue, int maxValue);
+    virtual int GetMin() const;
+    virtual int GetMax() const;
+
+    virtual void SetLineSize(int lineSize);
+    virtual void SetPageSize(int pageSize);
+    virtual int GetLineSize() const;
+    virtual int GetPageSize() const;
+
+    virtual void SetThumbLength(int lenPixels);
+    virtual int GetThumbLength() const;
 
+    // implementation
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
+    void GtkDisableEvents();
+    void GtkEnableEvents();
 
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
@@ -92,6 +73,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxSlider)
 };
 
-#endif
-
 #endif // __GTKSLIDERH__