OS/2 fix

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

diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h
index 455eb42799d0c81f1b254380b5a50185de35eb05..5a8dd5cbc23ce6b1b8f042f6cc4b8a3e0ea0247f 100644 (file)
--- a/include/wx/gtk1/scrolbar.h
+++ b/include/wx/gtk1/scrolbar.h
@@ -11,8 +11,8 @@
 #ifndef __GTKSCROLLBARH__
 #define __GTKSCROLLBARH__
 
 #ifndef __GTKSCROLLBARH__
 #define __GTKSCROLLBARH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "scrolbar.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -68,15 +68,20 @@ public:
     void SetObjectLength( int objectLength );
     void SetViewLength( int viewLength );
 
     void SetObjectLength( int objectLength );
     void SetViewLength( int viewLength );
 

+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    

     // implementation
     // --------------
 
     bool IsOwnGtkWindow( GdkWindow *window );
     // implementation
     // --------------
 
     bool IsOwnGtkWindow( GdkWindow *window );

-    void ApplyWidgetStyle();

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

+protected:
+    virtual wxSize DoGetBestSize() const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
 };