Rework wxMotif font/color inheritance so it works

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

diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h
index f471873aa3c75f73098c4b76e8a47e1b5d1ab30e..2950e85ce564faf68fd58f98e8b20d0798d1f07a 100644 (file)
--- a/include/wx/gtk1/scrolbar.h
+++ b/include/wx/gtk1/scrolbar.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        scrolbar.h
+// Name:        wx/gtk1/scrolbar.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,27 +7,22 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKSCROLLBARH__
 #define __GTKSCROLLBARH__
 
 #ifndef __GTKSCROLLBARH__
 #define __GTKSCROLLBARH__
 

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

 #include "wx/defs.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 #include "wx/defs.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxScrollBar;
+class WXDLLIMPEXP_CORE wxScrollBar;

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

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

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


@@ -47,7 +42,7 @@ public:
            long style = wxSB_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr );
            long style = wxSB_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr );

-    ~wxScrollBar();
+    virtual ~wxScrollBar();

     int GetThumbPosition() const;
     int GetThumbSize() const;
     int GetPageSize() const;
     int GetThumbPosition() const;
     int GetThumbSize() const;
     int GetPageSize() const;


@@ -68,15 +63,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)
 };