X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a21ac1590f2950cdbbe1b423d072f4226c37741..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/gtk/dialog.cpp diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index 9f8a2f6450..e4caf1baae 100644 --- 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$ @@ -7,17 +7,18 @@ // 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 #include @@ -26,11 +27,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 +48,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 +91,7 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) ) else { SetReturnCode(wxID_CANCEL); - Show(FALSE); + Show(false); } } @@ -107,7 +106,7 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) ) else { SetReturnCode(wxID_OK); - Show(FALSE); + Show(false); } } } @@ -204,18 +203,19 @@ 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(); - gtk_grab_remove( m_widget ); + // NOTE: gtk_window_set_modal internally calls gtk_grab_add() ! + gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE); + + wxEventLoop().Run(); + + gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE); g_openDialogs--; @@ -232,9 +232,9 @@ void wxDialog::EndModal( int retCode ) return; } - m_modalShowing = FALSE; + m_modalShowing = false; gtk_main_quit(); - Show( FALSE ); + Show( false ); }