Augmented version to b5

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

diff --git a/include/wx/gtk1/slider.h b/include/wx/gtk1/slider.h
index dda48b2093b09218bdf68c39d55cefdd73cea350..1e2714065ad7a3ae08441e638c165ea22a439a1e 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__
 


@@ -43,26 +41,26 @@ class wxSlider: public wxControl
 
   public:
     wxSlider(void);
 
   public:
     wxSlider(void);

-    wxSlider( wxWindow *parent, wxWindowID id,
+    inline wxSlider( wxWindow *parent, wxWindowID id,

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

            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,
            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);
+           const wxValidator& validator = wxDefaultValidator, 
+           const wxString& name = wxSliderNameStr );

     virtual int GetValue(void) const;
     virtual void SetValue( int );
     virtual int GetValue(void) const;
     virtual void SetValue( int );

-    void GetSize( int *x, int *y ) const;
-    void SetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
-    void GetPosition( int *x, int *y ) const;

     void SetRange( int minValue, int maxValue );
     int GetMin(void) const;
     int GetMax(void) const;
     void SetRange( int minValue, int maxValue );
     int GetMin(void) const;
     int GetMax(void) const;


@@ -81,8 +79,11 @@ class wxSlider: public wxControl
     int GetThumbLength(void) const;
     void SetTick( int tickPos );
 
     int GetThumbLength(void) const;
     void SetTick( int tickPos );
 

-  public:
-  
+  // implementation    
+    
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+    

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