added carbonaccessors.o

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index b52338cef1e8e8829c87b05d864a7a5f4367e797..45a20f012b6735422ad431f715d6763154950ad4 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -632,7 +632,9 @@ int wxDialog::ShowModal()
        return GetReturnCode();
     }
 
        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 )
     {
         wxWindow *parent = wxTheApp->GetTopWindow();
         if ( parent && parent != this )


@@ -676,11 +678,6 @@ void wxDialog::EndModal( int retCode )
     Show( FALSE );
 }
 
     Show( FALSE );
 }
 

-void wxDialog::InitDialog()
-{
-    wxWindow::InitDialog();
-}
-

 void wxDialog::SetIcon( const wxIcon &icon )
 {
     m_icon = icon;
 void wxDialog::SetIcon( const wxIcon &icon )
 {
     m_icon = icon;