X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/924b84ab9461c95cf5c5386d1091ae0f7a8e7ce7..677dc0ed1a3ff68af15f6246d6d0708d5264b07a:/src/gtk1/dialog.cpp

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 17df0e50d0..5a1129b0e2 100644
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.cpp
+// Name:        src/gtk1/dialog.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,24 +7,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dialog.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/dialog.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/cursor.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/frame.h"
+    #include "wx/cursor.h"
+#endif // WX_PRECOMP
+
 #include "wx/evtloop.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk1/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 // global data
@@ -194,7 +194,7 @@ int wxDialog::ShowModal()
         wxWindow *parent = wxTheApp->GetTopWindow();
         if ( parent &&
                 parent != this &&
-                    parent->IsBeingDeleted() &&
+                    !parent->IsBeingDeleted() &&
                         !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
         {
             m_parent = parent;
@@ -206,8 +206,6 @@ int wxDialog::ShowModal()
 
     Show( true );
 
-    SetFocus();
-
     m_modalShowing = true;
 
     g_openDialogs++;