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 cb2a29559beefeaad202e6751206599ea310a364..4fd9e3d0648cf5988eed8ac0f26398b2c852729a 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -1,17 +1,30 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
 
 #ifndef _WX_SCROLBAR_H_BASE_
 #define _WX_SCROLBAR_H_BASE_
 

+#include "wx/defs.h"
+

 #if wxUSE_SCROLLBAR
 
 #include "wx/control.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
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxScrollBar: a scroll bar control
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxScrollBarBase : public wxControl
+class WXDLLIMPEXP_CORE wxScrollBarBase : public wxControl

 {
 public:
     wxScrollBarBase() { }
 {
 public:
     wxScrollBarBase() { }


@@ -39,6 +52,9 @@ public:
                               int range, int pageSize,
                               bool refresh = true) = 0;
 
                               int range, int pageSize,
                               bool refresh = true) = 0;
 

+    // implementation-only
+    bool IsNeeded() const { return GetRange() > GetThumbSize(); }
+

 private:
     DECLARE_NO_COPY_CLASS(wxScrollBarBase)
 };
 private:
     DECLARE_NO_COPY_CLASS(wxScrollBarBase)
 };


@@ -49,10 +65,12 @@ private:
     #include "wx/msw/scrolbar.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/scrolbar.h"
     #include "wx/msw/scrolbar.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/scrolbar.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/scrolbar.h"
     #include "wx/gtk/scrolbar.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/scrolbar.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-    #include "wx/mac/scrolbar.h"
+    #include "wx/osx/scrolbar.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/scrolbar.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/scrolbar.h"
 #elif defined(__WXPM__)