Corrected VC++ compilo (not yet tested)

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

diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index 7a982bf669f74ac1b6c6f1d81494b9a2b5e4c8d2..37d64dbae6ef1d5852e1821637b95f99fac71d97 100644 (file)
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKSCROLLBARH__
 #define __GTKSCROLLBARH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "scrolbar.h"
-#endif
-
 #include "wx/defs.h"
 
 //-----------------------------------------------------------------------------
@@ -30,8 +25,7 @@ class WXDLLIMPEXP_CORE wxScrollBar;
 class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase
 {
 public:
-    wxScrollBar()
-       { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; }
+    wxScrollBar();
     inline wxScrollBar( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
@@ -54,19 +48,11 @@ public:
     int GetRange() const;
     virtual void SetThumbPosition( int viewStart );
     virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
-      bool refresh = TRUE );
+      bool refresh = true );
 
-    // Backward compatibility
-    // ----------------------
-
-    int GetValue(void) const;
-    void SetValue( int viewStart );
-    void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const;
-    int GetViewLength() const;
-    int GetObjectLength() const;
+    void SetThumbSize(int thumbSize);
     void SetPageSize( int pageLength );
-    void SetObjectLength( int objectLength );
-    void SetViewLength( int viewLength );
+    void SetRange(int range);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
@@ -76,12 +62,6 @@ public:
 
     bool IsOwnGtkWindow( GdkWindow *window );
 
-    GtkAdjustment  *m_adjust;
-    float           m_oldPos;
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-
 private:
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
 };