pen.h depends from brush.h in compat mode

[wxWidgets.git] / src / mac / carbon / dialog.cpp

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 966b6001baab09493d96f813cb563ae159c3e573..bb90e3812be7a6cb83f3cdfd81eca38da74de30b 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -77,6 +77,8 @@ void wxDialog::SetModal( bool flag )
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = true;
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = true;

+
+    // if the dialog is modal, this will end its event loop

     Show(false);
 }
 
     Show(false);
 }
 


@@ -103,6 +105,9 @@ bool wxDialog::Show(bool show)
         // nothing to do
         return false;
 
         // nothing to do
         return false;
 

+    if (show && CanDoLayoutAdaptation())
+        DoLayoutAdaptation();
+

     if ( show )
         // usually will result in TransferDataToWindow() being called
         InitDialog();
     if ( show )
         // usually will result in TransferDataToWindow() being called
         InitDialog();