fixed Cygwin compilation (there's no _get_osfhandle)

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

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index f995c03e5a63a0c3dca52a4ef13ba3cdebb6d0eb..c9272e99dd0e7cb3634405b8c7d9baadb10da37b 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -5,7 +5,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxScrollBarNameStr;

 
 // ----------------------------------------------------------------------------
 // wxScrollBar: a scroll bar control
 
 // ----------------------------------------------------------------------------
 // wxScrollBar: a scroll bar control


@@ -14,6 +14,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
 class WXDLLEXPORT wxScrollBarBase : public wxControl
 {
 public:
 class WXDLLEXPORT wxScrollBarBase : public wxControl
 {
 public:

+    wxScrollBarBase() { }
+

     // scrollbar construction
     bool Create(wxWindow *parent,
                 wxWindowID id,
     // scrollbar construction
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -35,7 +37,10 @@ public:
     virtual void SetThumbPosition(int viewStart) = 0;
     virtual void SetScrollbar(int position, int thumbSize,
                               int range, int pageSize,
     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;
+
+private:
+    DECLARE_NO_COPY_CLASS(wxScrollBarBase)

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -46,14 +51,12 @@ public:
     #include "wx/motif/scrolbar.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/scrolbar.h"
     #include "wx/motif/scrolbar.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/scrolbar.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/scrolbar.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/scrolbar.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/scrolbar.h"

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

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

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/scrolbar.h"

 #endif
 
 #endif // wxUSE_SCROLLBAR
 #endif
 
 #endif // wxUSE_SCROLLBAR