Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 54a53b1c58872800c72daa96a4cc8a9a0cee3ffe..8d8bd01a87f0bc3649d3b3ecb89d3bc2dc87554b 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -38,7 +37,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 +46,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 +58,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 +180,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 +191,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)
 };