converted to 16 colors

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

diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index 2a79f45acf4cd78fec26782a0c4e3d45f1ac147e..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"
 


@@ -42,7 +44,7 @@ class wxScrollBar: public wxControl
 
   public:
   
 
   public:
   

-    wxScrollBar(void) { m_adjust = NULL; m_oldPos = 0.0; };
+    wxScrollBar(void) { 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,


@@ -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;


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

-  public:
+  // implementation    
+    
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();

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

+#endif
+

 #endif
     // __GTKSCROLLBARH__
 #endif
     // __GTKSCROLLBARH__