compilation fix (forgot to check in this one)

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

diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h
index a983248fed15cf6ba034f2a399b941d223a7bf66..1e2714065ad7a3ae08441e638c165ea22a439a1e 100644 (file)
--- a/include/wx/gtk/slider.h
+++ b/include/wx/gtk/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,46 +41,49 @@ class wxSlider: public wxControl
 
   public:
     wxSlider(void);
 
   public:
     wxSlider(void);

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

     virtual int GetValue(void) const;
     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 );
+    virtual void SetValue( int );
+    void SetRange( int minValue, int maxValue );

     int GetMin(void) const;
     int GetMax(void) const;
     int GetMin(void) const;
     int GetMax(void) const;

-    void SetTickFreq( const int n, const int pos );
+    void SetTickFreq( int n, int pos );

     int GetTickFreq(void) const;
     int GetTickFreq(void) const;

-    void SetPageSize( const int pageSize );
+    void SetPageSize( int pageSize );

     int GetPageSize(void) const;
     void ClearSel(void);
     void ClearTicks(void);
     int GetPageSize(void) const;
     void ClearSel(void);
     void ClearTicks(void);

-    void SetLineSize( const int lineSize );
+    void SetLineSize( int lineSize );

     int GetLineSize(void) const;
     int GetSelEnd(void) const;
     int GetSelStart(void) const;
     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 );
+    void SetSelection( int minPos, int maxPos );
+    void SetThumbLength( int len );

     int GetThumbLength(void) const;
     int GetThumbLength(void) const;

-    void SetTick( const int tickPos );
+    void SetTick( int tickPos );

 
 

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

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