Fix up NSSlider code to not use class posing and instantiate the proper type (now...

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

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index 72e37cfcca55e6ea79837e729002ffca56e373c3..6cdf392a2697300440e5b1137bc2ac28b435831f 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -1,11 +1,24 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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 WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[];

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


@@ -14,6 +27,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 +50,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__)


@@ -44,10 +62,14 @@ public:
     #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__)
     #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"
 #endif
 #elif defined(__WXPM__)
     #include "wx/os2/scrolbar.h"
 #endif