update button style to include BS_MULTILINE when a multiline label is set

[wxWidgets.git] / src / common / dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 8430081563dd78102287bc3ce7bb9f90f03f240f..92417acc0e216b8395b6ad3b78c9732c098ae6b7 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -52,12 +52,8 @@ BEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow)
     EVT_CLOSE(wxDialogBase::OnCloseWindow)
 
     EVT_CHAR_HOOK(wxDialogBase::OnCharHook)
-
-    WX_EVENT_TABLE_CONTROL_CONTAINER(wxDialogBase)
 END_EVENT_TABLE()
 
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase, wxTopLevelWindow)
-
 void wxDialogBase::Init()
 {
     m_returnCode = 0;
@@ -68,8 +64,6 @@ void wxDialogBase::Init()
     // dialog controls from reaching the parent frame which is usually
     // undesirable and can lead to unexpected and hard to find bugs
     SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS);
-
-    WX_INIT_CONTROL_CONTAINER();
 }
 
 // helper of GetParentForModalDialog()
@@ -80,7 +74,7 @@ static bool CanBeUsedAsParent(wxWindow *parent)
     return !parent->HasExtraStyle(wxWS_EX_TRANSIENT) &&
                 parent->IsShownOnScreen() &&
                     !wxPendingDelete.Member(parent) &&
-                        parent->IsBeingDeleted();
+                        !parent->IsBeingDeleted();
 }
 
 wxWindow *wxDialogBase::GetParentForModalDialog(wxWindow *parent) const