From: Włodzimierz Skiba Date: Tue, 18 Oct 2005 11:13:34 +0000 (+0000) Subject: compilation fix after wxScrollHelper changes (ctor argument is now not optional and... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/afe1376994794ee99b2906c30318c8ea53f7b8ec compilation fix after wxScrollHelper changes (ctor argument is now not optional and SetWin doesn't exist any more) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h index d837a94b04..6ab126f1de 100644 --- a/include/wx/univ/listbox.h +++ b/include/wx/univ/listbox.h @@ -52,7 +52,7 @@ class WXDLLEXPORT wxListBox : public wxListBoxBase, public wxScrollHelper { public: // ctors and such - wxListBox() { Init(); } + wxListBox() : wxScrollHelper(this) { Init(); } wxListBox(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -61,6 +61,7 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr ) + : wxScrollHelper(this) { Init(); diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp index a938fbd880..58917edc04 100644 --- a/src/univ/listbox.cpp +++ b/src/univ/listbox.cpp @@ -84,6 +84,7 @@ wxListBox::wxListBox(wxWindow *parent, long style, const wxValidator& validator, const wxString &name) + :wxScrollHelper(this) { Init(); @@ -135,8 +136,6 @@ bool wxListBox::Create(wxWindow *parent, validator, name) ) return false; - SetWindow(this); - m_strings = new wxArrayString; Set(n, choices);