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 75344cb221490c347d656577cb62c44b9b47bdf1..5a8dd5cbc23ce6b1b8f042f6cc4b8a3e0ea0247f 100644 (file)
--- a/include/wx/gtk1/scrolbar.h
+++ b/include/wx/gtk1/scrolbar.h
@@ -4,47 +4,34 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

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

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

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

-#if wxUSE_SCROLLBAR
-
-#include "wx/object.h"
-#include "wx/control.h"
-

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxScrollBar;
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxScrollBar;
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxScrollBarNameStr;
-

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

-class wxScrollBar: public wxControl
+class wxScrollBar: public wxScrollBarBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxScrollBar)
-
-  public:
-  
-    wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; };
+public:
+    wxScrollBar()
+       { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; }

     inline wxScrollBar( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
     inline wxScrollBar( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,


@@ -52,7 +39,7 @@ class wxScrollBar: public wxControl
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr )
     {
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr )
     {

-      Create( parent, id, pos, size, style, validator, name );
+        Create( parent, id, pos, size, style, validator, name );

     }
     bool Create( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
     }
     bool Create( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,


@@ -60,8 +47,8 @@ class wxScrollBar: public wxControl
            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(void);
-    int GetThumbPosition(void) const;
+    ~wxScrollBar();
+    int GetThumbPosition() const;

     int GetThumbSize() const;
     int GetPageSize() const;
     int GetRange() const;
     int GetThumbSize() const;
     int GetPageSize() const;
     int GetRange() const;


@@ -69,8 +56,9 @@ class wxScrollBar: public wxControl
     virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
       bool refresh = TRUE );
 
     virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
       bool refresh = TRUE );
 

-  // Backward compatibility
-    
+    // Backward compatibility
+    // ----------------------
+

     int GetValue(void) const;
     void SetValue( int viewStart );
     void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const;
     int GetValue(void) const;
     void SetValue( int viewStart );
     void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const;


@@ -80,16 +68,23 @@ class wxScrollBar: public wxControl
     void SetObjectLength( int objectLength );
     void SetViewLength( int viewLength );
 
     void SetObjectLength( int objectLength );
     void SetViewLength( int viewLength );
 

-  // implementation    
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

     
     

+    // implementation
+    // --------------
+

     bool IsOwnGtkWindow( GdkWindow *window );
     bool IsOwnGtkWindow( GdkWindow *window );

-    void ApplyWidgetStyle();
-  
+

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

-};

 
 

-#endif
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxScrollBar)
+};

 
 #endif
     // __GTKSCROLLBARH__
 
 #endif
     // __GTKSCROLLBARH__