post wxUniv merge fixes

[wxWidgets.git] / src / gtk1 / dialog.cpp

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 25f29828142536028b9adc657e154e132ff0fd37..a4532f5d190afc47433eef16476d21759edb0779 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -231,6 +231,7 @@ void wxDialog::Init()
     m_returnCode = 0;
     m_sizeSet = FALSE;
     m_modalShowing = FALSE;
+    m_themeEnabled = TRUE;
 }
 
 wxDialog::wxDialog( wxWindow *parent,
@@ -631,7 +632,9 @@ int wxDialog::ShowModal()
        return GetReturnCode();
     }
 
-    if ( !GetParent() )
+    // use the apps top level window as parent if none given unless explicitly
+    // forbidden
+    if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
     {
         wxWindow *parent = wxTheApp->GetTopWindow();
         if ( parent && parent != this )