fix getting tooltip colors for GTK 2.11

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

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index c2dee417c52bb9b2f15d44e6c8808c716a6c8ad3..5a1129b0e2215de42fbcaf0d8632c8e00b7ac6a7 100644 (file)
--- 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$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -11,16 +11,20 @@
 #include "wx/wxprec.h"
 
 #include "wx/dialog.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/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
 
 //-----------------------------------------------------------------------------
 // global data


@@ -190,7 +194,7 @@ int wxDialog::ShowModal()
         wxWindow *parent = wxTheApp->GetTopWindow();
         if ( parent &&
                 parent != this &&
         wxWindow *parent = wxTheApp->GetTopWindow();
         if ( parent &&
                 parent != this &&

-                    parent->IsBeingDeleted() &&
+                    !parent->IsBeingDeleted() &&

                         !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
         {
             m_parent = parent;
                         !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
         {
             m_parent = parent;


@@ -202,8 +206,6 @@ int wxDialog::ShowModal()
 
     Show( true );
 
 
     Show( true );
 

-    SetFocus();
-

     m_modalShowing = true;
 
     g_openDialogs++;
     m_modalShowing = true;
 
     g_openDialogs++;