Added wxStrnicmp and to wchar.h, not yet for Unicode mode.

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

diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index 5bb14787bf4c84aa72a9f91e743966df2b75b69d..75344cb221490c347d656577cb62c44b9b47bdf1 100644 (file)
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -16,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"
 


@@ -58,11 +61,11 @@ 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 );
 


@@ -86,5 +89,7 @@ class wxScrollBar: public wxControl
     float           m_oldPos;
 };
 
     float           m_oldPos;
 };
 

+#endif
+

 #endif
     // __GTKSCROLLBARH__
 #endif
     // __GTKSCROLLBARH__