X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c4d796c56bd48ce370240107f3e4c07e142985..24f4ad95920746ebc6cfc6f2ab86f65fb53345ca:/include/wx/os2/scrolbar.h diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h index 7be44ed401..9d0c867ae5 100644 --- 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) @@ -30,11 +28,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxSB_HORIZONTAL, #if wxUSE_VALIDATORS -# if defined(__VISAGECPP__) - const wxValidator* validator = wxDefaultValidator, -# else const wxValidator& validator = wxDefaultValidator, -# endif #endif const wxString& name = wxScrollBarNameStr) { @@ -45,11 +39,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxSB_HORIZONTAL, #if wxUSE_VALIDATORS -# if defined(__VISAGECPP__) - const wxValidator* validator = wxDefaultValidator, -# else const wxValidator& validator = wxDefaultValidator, -# endif #endif const wxString& name = wxScrollBarNameStr);