use different strings for wchar_t and UTF-8-based Unicode builds

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

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index f995c03e5a63a0c3dca52a4ef13ba3cdebb6d0eb..4fd9e3d0648cf5988eed8ac0f26398b2c852729a 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -1,19 +1,34 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        scrolbar.h
+// Purpose:     wxScrollBar base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_SCROLBAR_H_BASE_
 #define _WX_SCROLBAR_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_SCROLLBAR
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxScrollBarNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxScrollBar: a scroll bar control
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxScrollBarBase : public wxControl
+class WXDLLIMPEXP_CORE wxScrollBarBase : public wxControl
 {
 public:
+    wxScrollBarBase() { }
+
     // scrollbar construction
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -35,7 +50,13 @@ public:
     virtual void SetThumbPosition(int viewStart) = 0;
     virtual void SetScrollbar(int position, int thumbSize,
                               int range, int pageSize,
-                              bool refresh = TRUE) = 0;
+                              bool refresh = true) = 0;
+
+    // implementation-only
+    bool IsNeeded() const { return GetRange() > GetThumbSize(); }
+
+private:
+    DECLARE_NO_COPY_CLASS(wxScrollBarBase)
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -44,16 +65,16 @@ public:
     #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(__WXQT__)
-    #include "wx/qt/scrolbar.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/scrolbar.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/scrolbar.h"
+    #include "wx/osx/scrolbar.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/scrolbar.h"
 #elif defined(__WXPM__)
     #include "wx/os2/scrolbar.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/scrolbar.h"
 #endif
 
 #endif // wxUSE_SCROLLBAR