[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 17df0e50d03676b7e3adad0230673fe1c7f0a3ad..e4caf1baae9686ee239bd7d07f3e80c00e978e5e 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.cpp
+// Name:        src/gtk/dialog.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,17 +7,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 // 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 "wx/evtloop.h"
 
 #include <gdk/gdk.h>


@@ -206,17 +206,16 @@ int wxDialog::ShowModal()
 
     Show( true );
 
 
     Show( true );
 

-    SetFocus();
-

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

-    gtk_grab_add( m_widget );
+    // NOTE: gtk_window_set_modal internally calls gtk_grab_add() !
+    gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE);

 
     wxEventLoop().Run();
 
 
     wxEventLoop().Run();
 

-    gtk_grab_remove( m_widget );
+    gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE);

 
     g_openDialogs--;
 
 
     g_openDialogs--;