X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..50259962667c5c7485fee30e602f2fe551efaf6f:/src/gtk1/dialog.cpp?ds=inline diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index 8847044495..67f0984c08 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -1,36 +1,35 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.cpp +// Name: src/gtk1/dialog.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWidgets 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" -#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 #include -#include "wx/gtk/win_gtk.h" +#include "wx/gtk1/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); } } } @@ -177,12 +176,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 +203,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 +231,9 @@ void wxDialog::EndModal( int retCode ) return; } - m_modalShowing = FALSE; + m_modalShowing = false; gtk_main_quit(); - Show( FALSE ); + Show( false ); }