add accessors for sockaddr to wxSockAddress (closes #10511)

[wxWidgets.git] / src / msw / control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 745e9bd2a66cbd4aec8744dd4dfe17fd84690170..b3e4f5b2ec66808313ca218bd35a6bb9fabad025 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -59,15 +59,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 // wxControl implementation
 // ============================================================================
 
 // wxControl implementation
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// wxControl ctor/dtor
-// ----------------------------------------------------------------------------
-
-wxControl::~wxControl()
-{
-    m_isBeingDeleted = true;
-}
-

 // ----------------------------------------------------------------------------
 // control window creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // control window creation
 // ----------------------------------------------------------------------------


@@ -254,6 +245,9 @@ WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxControl::DoGetBestSize() const
 {
 
 wxSize wxControl::DoGetBestSize() const
 {

+    if (m_windowSizer)
+       return wxControlBase::DoGetBestSize();
+       

     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }