X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..79099b80ad442cb93b2f7df716bf3d1dd80b446f:/include/wx/ctrlsub.h

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index 13cb2abf08..0036c21f46 100644
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -31,7 +31,7 @@
 class WXDLLEXPORT wxItemContainer
 {
 public:
-    wxItemContainer();
+    wxItemContainer() { m_clientDataItemsType = wxClientData_None; }
     virtual ~wxItemContainer();
 
     // adding items
@@ -140,7 +140,7 @@ protected:
 class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer
 {
 public:
-    wxControlWithItems();
+    wxControlWithItems() { }
     virtual ~wxControlWithItems();
 
     // we have to redefine these functions here to avoid ambiguities in classes
@@ -154,6 +154,16 @@ public:
     // colour
     virtual bool ShouldInheritColours() const { return false; }
 
+protected:
+    // we can't compute our best size before the items are added to the control
+    // which is done after calling SetInitialBestSize() (it is called from the
+    // base class ctor and the items are added in the derived class ctor), so
+    // don't do anything at all here as our size will be changed later anyhow
+    //
+    // of course, all derived classes *must* call SetBestSize() from their
+    // ctors for this to work!
+    virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
+
 private:
     DECLARE_NO_COPY_CLASS(wxControlWithItems)
 };