Added defines to allow altered tab placement under gcc-2.95

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

diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index f4a50694d0454c2b1602d0a58d2e0ed776f2c5a8..75344cb221490c347d656577cb62c44b9b47bdf1 100644 (file)
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -2,9 +2,8 @@
 // Name:        scrolbar.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        scrolbar.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_SCROLLBAR
+

 #include "wx/object.h"
 #include "wx/control.h"
 
 #include "wx/object.h"
 #include "wx/control.h"
 


@@ -59,15 +61,16 @@ class wxScrollBar: public wxControl
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr );
     ~wxScrollBar(void);
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr );
     ~wxScrollBar(void);

-    int GetPosition(void) const;
+    int GetThumbPosition(void) const;

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

-    virtual void SetPosition( int viewStart );
+    virtual void SetThumbPosition( int viewStart );

     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,10 +83,13 @@ class wxScrollBar: public wxControl
   // implementation    
     
     bool IsOwnGtkWindow( GdkWindow *window );
   // implementation    
     
     bool IsOwnGtkWindow( GdkWindow *window );

+    void ApplyWidgetStyle();

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

+#endif
+

 #endif
     // __GTKSCROLLBARH__
 #endif
     // __GTKSCROLLBARH__