Oops, don't cut and paste between ports, and do test compile both states

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

diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h
index e77f17ec4457ebfc9ebabfa71758b21fd4d75083..af3eba0674233b0338e066d7597eb41b7d23ba4a 100644 (file)
--- a/include/wx/os2/scrolbar.h
+++ b/include/wx/os2/scrolbar.h
@@ -12,12 +12,10 @@
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
+#include "wx/scrolbar.h"
 
 // Scrollbar item
-class WXDLLEXPORT wxScrollBar: public wxControl
+class WXDLLEXPORT wxScrollBar: public wxScrollBarBase
 {
   DECLARE_DYNAMIC_CLASS(wxScrollBar)
 
@@ -29,9 +27,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
-#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
-#endif
            const wxString& name = wxScrollBarNameStr)
   {
       Create(parent, id, pos, size, style, validator, name);
@@ -40,9 +36,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
-#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
-#endif
            const wxString& name = wxScrollBarNameStr);
 
   int GetThumbPosition() const ;