X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/409c9842c71df526bcfbf1cf5ce80067b09d4d97..8f974c520a8733158591891458fda10fae4c3950:/src/os2/scrolbar.cpp?ds=sidebyside diff --git a/src/os2/scrolbar.cpp b/src/os2/scrolbar.cpp index 8c70f74b60..e77bcbdb26 100644 --- a/src/os2/scrolbar.cpp +++ b/src/os2/scrolbar.cpp @@ -20,7 +20,6 @@ #include "wx/scrolbar.h" #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) BEGIN_EVENT_TABLE(wxScrollBar, wxControl) @@ -29,21 +28,24 @@ BEGIN_EVENT_TABLE(wxScrollBar, wxControl) #endif END_EVENT_TABLE() -#endif // Scrollbar bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, +#if wxUSE_VALIDATORS const wxValidator& validator, +#endif const wxString& name) { if (!parent) return FALSE; parent->AddChild(this); SetName(name); +#if wxUSE_VALIDATORS SetValidator(validator); - +#endif + SetBackgroundColour(parent->GetBackgroundColour()) ; SetForegroundColour(parent->GetForegroundColour()) ; m_windowStyle = style; @@ -83,6 +85,8 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, m_hWnd = 0; // TODO: (WXHWND)scroll_bar; + HWND scroll_bar = 0; // temporary + // Subclass again for purposes of dialog editing mode SubclassWin((WXHWND) scroll_bar);