Bitmap and Image updates

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

diff --git a/include/wx/gtk1/slider.h b/include/wx/gtk1/slider.h
index a983248fed15cf6ba034f2a399b941d223a7bf66..c94dae8403fbc4945cbe45506ba82f4eb6bc0ebd 100644 (file)
--- a/include/wx/gtk1/slider.h
+++ b/include/wx/gtk1/slider.h
@@ -2,13 +2,11 @@
 // Name:        slider.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        slider.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKSLIDERH__
 #define __GTKSLIDERH__
 
 #ifndef __GTKSLIDERH__
 #define __GTKSLIDERH__
 


@@ -17,6 +15,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_SLIDER
+

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


@@ -39,53 +40,58 @@ extern const char *wxSliderNameStr;
 
 class wxSlider: public wxControl
 {
 
 class wxSlider: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxSlider)
-
-  public:
-    wxSlider(void);
-    wxSlider( wxWindow *parent, const wxWindowID id,
-           const int value, const int minValue, const int maxValue,
+public:
+    wxSlider() {}
+    inline wxSlider( wxWindow *parent, wxWindowID id,
+           int value, int minValue, int maxValue,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = wxSL_HORIZONTAL,
-/*           const wxValidator& validator = wxDefaultValidator, */
-           const wxString& name = wxSliderNameStr);
-   ~wxSlider(void);
-   bool Create(wxWindow *parent, const wxWindowID id,
-           const int value, const int minValue, const int maxValue,
+           long style = wxSL_HORIZONTAL,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxSliderNameStr )
+    {
+      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,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = wxSL_HORIZONTAL,
-/*           const wxValidator& validator = wxDefaultValidator, */
-           const wxString& name = wxSliderNameStr);
-    virtual int GetValue(void) const;
-    virtual void SetValue( const int );
-    void GetSize( int *x, int *y ) const;
-    void SetSize( const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO );
-    void GetPosition( int *x, int *y ) const;
-    void SetRange( const int minValue, const int maxValue );
-    int GetMin(void) const;
-    int GetMax(void) const;
-    void SetTickFreq( const int n, const int pos );
-    int GetTickFreq(void) const;
-    void SetPageSize( const int pageSize );
-    int GetPageSize(void) const;
-    void ClearSel(void);
-    void ClearTicks(void);
-    void SetLineSize( const int lineSize );
-    int GetLineSize(void) const;
-    int GetSelEnd(void) const;
-    int GetSelStart(void) const;
-    void SetSelection( const int minPos, const int maxPos );
-    void SetThumbLength( const int len );
-    int GetThumbLength(void) const;
-    void SetTick( const int tickPos );
-
-  public:
-  
+           long style = wxSL_HORIZONTAL,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxSliderNameStr );
+    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 );
+
+    // implementation
+    // --------------
+
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+

     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     GtkAdjustment  *m_adjust;
     float           m_oldPos;

-    
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSlider)

 };
 
 };
 

+#endif
+

 #endif // __GTKSLIDERH__
 #endif // __GTKSLIDERH__