fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index 672334a1ded247ad9c0342e5a09601c3b971e0a1..7a982bf669f74ac1b6c6f1d81494b9a2b5e4c8d2 100644 (file)
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -11,7 +11,7 @@
 #ifndef __GTKSCROLLBARH__
 #define __GTKSCROLLBARH__
 
 #ifndef __GTKSCROLLBARH__
 #define __GTKSCROLLBARH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "scrolbar.h"
 #endif
 
 #pragma interface "scrolbar.h"
 #endif
 


@@ -21,13 +21,13 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxScrollBar;
+class WXDLLIMPEXP_CORE wxScrollBar;

 
 //-----------------------------------------------------------------------------
 // wxScrollBar
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxScrollBar
 //-----------------------------------------------------------------------------
 

-class wxScrollBar: public wxScrollBarBase
+class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase

 {
 public:
     wxScrollBar()
 {
 public:
     wxScrollBar()


@@ -68,11 +68,13 @@ 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;