X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/619ddbbe360355c760feb140a65839aa28fc8b19..5fab0c8d86f7bd7015db8d0ece8ce02ba1b602d8:/src/msw/control.cpp diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 745e9bd2a6..b3e4f5b2ec 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -59,15 +59,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) // wxControl implementation // ============================================================================ -// ---------------------------------------------------------------------------- -// wxControl ctor/dtor -// ---------------------------------------------------------------------------- - -wxControl::~wxControl() -{ - m_isBeingDeleted = true; -} - // ---------------------------------------------------------------------------- // control window creation // ---------------------------------------------------------------------------- @@ -254,6 +245,9 @@ WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const wxSize wxControl::DoGetBestSize() const { + if (m_windowSizer) + return wxControlBase::DoGetBestSize(); + return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT); }