X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..a8d2fb31cbf09dcc4683c9566ff4bc89580f268c:/src/gtk1/dialog.cpp?ds=sidebyside

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 644f2a8994..31df13df6b 100644
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -7,10 +7,6 @@
 // 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"
 
@@ -18,6 +14,7 @@
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/cursor.h"
+#include "wx/evtloop.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
@@ -26,11 +23,9 @@
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
-// idle system
+// global data
 //-----------------------------------------------------------------------------
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
 extern int g_openDialogs;
 
 //-----------------------------------------------------------------------------
@@ -49,9 +44,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 void wxDialog::Init()
 {
     m_returnCode = 0;
-    m_sizeSet = FALSE;
-    m_modalShowing = FALSE;
-    m_themeEnabled = TRUE;
+    m_sizeSet = false;
+    m_modalShowing = false;
+    m_themeEnabled = true;
 }
 
 wxDialog::wxDialog( wxWindow *parent,
@@ -92,7 +87,7 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
     else
     {
         SetReturnCode(wxID_CANCEL);
-        Show(FALSE);
+        Show(false);
     }
 }
 
@@ -107,7 +102,7 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
         else
         {
             SetReturnCode(wxID_OK);
-            Show(FALSE);
+            Show(false);
         }
     }
 }
@@ -177,12 +172,6 @@ bool wxDialog::IsModal() const
 
 void wxDialog::SetModal( bool WXUNUSED(flag) )
 {
-/*
-  if (flag)
-    m_windowStyle |= wxDIALOG_MODAL;
-  else
-    if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
-*/
     wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
 }
 
@@ -210,17 +199,17 @@ int wxDialog::ShowModal()
     }
 
     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
-    
-    Show( TRUE );
 
-    SetFocus();
+    Show( true );
 
-    m_modalShowing = TRUE;
+    m_modalShowing = true;
 
     g_openDialogs++;
 
     gtk_grab_add( m_widget );
-    gtk_main();
+
+    wxEventLoop().Run();
+
     gtk_grab_remove( m_widget );
 
     g_openDialogs--;
@@ -238,9 +227,9 @@ void wxDialog::EndModal( int retCode )
         return;
     }
 
-    m_modalShowing = FALSE;
+    m_modalShowing = false;
 
     gtk_main_quit();
 
-    Show( FALSE );
+    Show( false );
 }