X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e058b98d8a323e97fcac7a32fcb0a23ad438b595..81f6ea4a29eb815dbed0adea369efdc8fece0269:/src/gtk/dialog.cpp?ds=sidebyside diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index e948cddd10..c2dee417c5 100644 --- a/src/gtk/dialog.cpp +++ b/src/gtk/dialog.cpp @@ -7,14 +7,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#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" +#include "wx/evtloop.h" #include #include @@ -23,15 +23,11 @@ #include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- -// idle system +// global data //----------------------------------------------------------------------------- -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; extern int g_openDialogs; - - //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- @@ -48,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, @@ -91,7 +87,7 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) ) else { SetReturnCode(wxID_CANCEL); - Show(FALSE); + Show(false); } } @@ -106,7 +102,7 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) ) else { SetReturnCode(wxID_OK); - Show(FALSE); + Show(false); } } } @@ -176,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") ); } @@ -198,7 +188,10 @@ int wxDialog::ShowModal() if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) ) { wxWindow *parent = wxTheApp->GetTopWindow(); - if ( parent && parent != this && parent->IsBeingDeleted() ) + if ( parent && + parent != this && + parent->IsBeingDeleted() && + !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) ) { m_parent = parent; gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) ); @@ -207,14 +200,18 @@ int wxDialog::ShowModal() wxBusyCursorSuspender cs; // temporarily suppress the busy cursor - Show( TRUE ); + Show( true ); + + SetFocus(); - m_modalShowing = TRUE; + m_modalShowing = true; g_openDialogs++; gtk_grab_add( m_widget ); - gtk_main(); + + wxEventLoop().Run(); + gtk_grab_remove( m_widget ); g_openDialogs--; @@ -232,9 +229,9 @@ void wxDialog::EndModal( int retCode ) return; } - m_modalShowing = FALSE; + m_modalShowing = false; gtk_main_quit(); - Show( FALSE ); + Show( false ); }