Version 0.4 of wxPython for MSW.

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

diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index 758e3cb18ad32e20307341983aba1cdd111694b3..f4a50694d0454c2b1602d0a58d2e0ed776f2c5a8 100644 (file)
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -42,37 +42,44 @@ class wxScrollBar: public wxControl
 
   public:
   
-    wxScrollBar(void) { m_adjust = NULL; m_oldPos = 0.0; };
-    wxScrollBar(wxWindow *parent, const wxWindowID id,
+    wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; };
+    inline wxScrollBar( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-           const long style = wxSB_HORIZONTAL,
-           const wxString& name = wxScrollBarNameStr );
-    ~wxScrollBar(void);
-    bool Create(wxWindow *parent, const wxWindowID id,
+           long style = wxSB_HORIZONTAL,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxScrollBarNameStr )
+    {
+      Create( parent, id, pos, size, style, validator, name );
+    }
+    bool Create( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-           const long style = wxSB_HORIZONTAL,
-           const wxString& name = wxScrollBarNameStr);
+           long style = wxSB_HORIZONTAL,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxScrollBarNameStr );
+    ~wxScrollBar(void);
     int GetPosition(void) const;
     int GetThumbSize() const;
     int GetPageSize() const;
     int GetRange() const;
-    virtual void SetPosition( const int viewStart );
-    virtual void SetScrollbar( const int position, const int thumbSize, const int range, const int pageSize,
-      const bool refresh = TRUE );
+    virtual void SetPosition( int viewStart );
+    virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
+      bool refresh = TRUE );
 
     // Backward compatibility
     int GetValue(void) const;
-    void SetValue( const int viewStart );
+    void SetValue( int viewStart );
     void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const;
     int GetViewLength() const;
     int GetObjectLength() const;
-    void SetPageSize( const int pageLength );
-    void SetObjectLength( const int objectLength );
-    void SetViewLength( const int viewLength );
-      
-  public:
+    void SetPageSize( int pageLength );
+    void SetObjectLength( int objectLength );
+    void SetViewLength( int viewLength );
+
+  // implementation    
+    
+    bool IsOwnGtkWindow( GdkWindow *window );
   
     GtkAdjustment  *m_adjust;
     float           m_oldPos;