Fix wrong return value in the changes of r73365.

[wxWidgets.git] / include / wx / msw / listbox.h

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 54a53b1c58872800c72daa96a4cc8a9a0cee3ffe..b687aac8d7e6e5ebef1aa8f1c4fdb35f83d1df24 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -38,7 +38,7 @@ class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxListBox();
+    wxListBox() { Init(); }

     wxListBox(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
     wxListBox(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,


@@ -47,6 +47,8 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr)
     {
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr)
     {

+        Init();
+

         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     wxListBox(wxWindow *parent, wxWindowID id,
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     wxListBox(wxWindow *parent, wxWindowID id,


@@ -57,6 +59,8 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr)
     {
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr)
     {

+        Init();
+

         Create(parent, id, pos, size, choices, style, validator, name);
     }
 
         Create(parent, id, pos, size, choices, style, validator, name);
     }
 


@@ -177,6 +181,9 @@ protected:
 #endif
 
 private:
 #endif
 
 private:

+    // common part of all ctors
+    void Init();
+

     // call this when items are added to or deleted from the listbox or an
     // items text changes
     void MSWOnItemsChanged();
     // call this when items are added to or deleted from the listbox or an
     // items text changes
     void MSWOnItemsChanged();


@@ -185,6 +192,7 @@ private:
     // i.e. if we need to call SetHorizontalExtent() from OnInternalIdle()
     bool m_updateHorizontalExtent;
 
     // i.e. if we need to call SetHorizontalExtent() from OnInternalIdle()
     bool m_updateHorizontalExtent;
 

+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox)
 };