X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..c8e1af672f46e93ae2fe6d7f9d5b35a3d8d49c16:/include/wx/ctrlsub.h?ds=inline diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index 4108164ea1..dbf7e9884b 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 ///////////////////////////////////////////////////////////////////////////// @@ -99,7 +99,7 @@ public: #if WXWIN_COMPATIBILITY_2_2 // compatibility - these functions are deprecated, use the new ones // instead - int Number() const { return GetCount(); } + wxDEPRECATED( int Number() const ); #endif // WXWIN_COMPATIBILITY_2_2 protected: @@ -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) };