using common code

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

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index 0c2011c197d4aafb4350971fca196ae485418449..fc46906736c6c874d2bf86d283b219d0933f6d1e 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        scrolbar.h
 // Purpose:     wxScrollBar base header
-// Author:      wxWidgets Team
+// Author:      Julian Smart
 // Modified by:
 // Created:
-// Copyright:   (c) wxWidgets Team
+// Copyright:   (c) Julian Smart
 // RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxScrollBarNameStr;
+extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxScrollBar: a scroll bar control
@@ -52,6 +52,9 @@ public:
                               int range, int pageSize,
                               bool refresh = true) = 0;
 
+    // implementation-only
+    bool IsNeeded() const { return GetRange() > GetThumbSize(); }
+
 private:
     DECLARE_NO_COPY_CLASS(wxScrollBarBase)
 };
@@ -62,8 +65,10 @@ private:
     #include "wx/msw/scrolbar.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/scrolbar.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/scrolbar.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/scrolbar.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/scrolbar.h"
 #elif defined(__WXCOCOA__)