compilation fix after wxScrollHelper changes (ctor argument is now not optional and...

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 d837a94b04ae1886c209d91c98b8459d65fc1abb..6ab126f1decc74cb72d42681aa62bcc173693e10 100644 (file)
--- 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 a938fbd880d12f444a1822b5338d8fdf85dc2d05..58917edc04daa2d1efc9176add6b734c17f4ccbc 100644 (file)
--- 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);