X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36630afc9238848b44befcb37d51ac93ded5737..628e8d444cd4c2a1d90b99c13931286b27fa7304:/src/gtk/dialog.cpp diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index e4caf1baae..7fcfd47c56 100644 --- a/src/gtk/dialog.cpp +++ b/src/gtk/dialog.cpp @@ -13,42 +13,29 @@ #include "wx/dialog.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 "wx/scopedptr.h" + #include -#include -#include "wx/gtk/win_gtk.h" +// this is defined in src/gtk/toplevel.cpp +extern int wxOpenModalDialogsCount; -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop) -extern int g_openDialogs; //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxDialog,wxDialogBase) - EVT_BUTTON (wxID_OK, wxDialog::OnOK) - EVT_BUTTON (wxID_CANCEL, wxDialog::OnCancel) - EVT_BUTTON (wxID_APPLY, wxDialog::OnApply) - EVT_CLOSE (wxDialog::OnCloseWindow) -END_EVENT_TABLE() - -IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow) - void wxDialog::Init() { + m_modalLoop = NULL; m_returnCode = 0; - m_sizeSet = false; m_modalShowing = false; m_themeEnabled = true; } @@ -76,75 +63,6 @@ bool wxDialog::Create( wxWindow *parent, return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name); } -void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) ) -{ - if (Validate()) - TransferDataFromWindow(); -} - -void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) ) -{ - if (IsModal()) - { - EndModal(wxID_CANCEL); - } - else - { - SetReturnCode(wxID_CANCEL); - Show(false); - } -} - -void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) ) -{ - if (Validate() && TransferDataFromWindow()) - { - if (IsModal()) - { - EndModal(wxID_OK); - } - else - { - SetReturnCode(wxID_OK); - Show(false); - } - } -} - -void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) ) -{ - // yes -} - -void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - // We'll send a Cancel message by default, - // which may close the dialog. - // Check for looping if the Cancel event handler calls Close(). - - // Note that if a cancel button and handler aren't present in the dialog, - // nothing will happen when you close the dialog via the window manager, or - // via Close(). - // We wouldn't want to destroy the dialog by default, since the dialog may have been - // created on the stack. - // However, this does mean that calling dialog->Close() won't delete the dialog - // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be - // sure to destroy the dialog. - // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog. - - static wxList s_closing; - - if (s_closing.Member(this)) - return; // no loops - - s_closing.Append(this); - - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); - s_closing.DeleteObject(this); -} - bool wxDialog::Show( bool show ) { if (!show && IsModal()) @@ -152,23 +70,24 @@ bool wxDialog::Show( bool show ) EndModal( wxID_CANCEL ); } - if (show && !m_sizeSet) - { - /* by calling GtkOnSize here, we don't have to call - either after showing the frame, which would entail - much ugly flicker nor from within the size_allocate - handler, because GTK 1.1.X forbids that. */ - - GtkOnSize( m_x, m_y, m_width, m_height ); - } + if (show && CanDoLayoutAdaptation()) + DoLayoutAdaptation(); - bool ret = wxWindow::Show( show ); + bool ret = wxDialogBase::Show(show); - if (show) InitDialog(); + if (show) + InitDialog(); return ret; } +wxDialog::~wxDialog() +{ + // if the dialog is modal, this will end its event loop + if ( IsModal() ) + EndModal(wxID_CANCEL); +} + bool wxDialog::IsModal() const { return m_modalShowing; @@ -181,25 +100,20 @@ void wxDialog::SetModal( bool WXUNUSED(flag) ) int wxDialog::ShowModal() { - if (IsModal()) - { - wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") ); - return GetReturnCode(); - } + wxASSERT_MSG( !IsModal(), "ShowModal() can't be called twice" ); + + // release the mouse if it's currently captured as the window having it + // will be disabled when this dialog is shown -- but will still keep the + // capture making it impossible to do anything in the modal dialog itself + wxWindow * const win = wxWindow::GetCapture(); + if ( win ) + win->GTKReleaseMouseAndNotify(); - // use the apps top level window as parent if none given unless explicitly - // forbidden - if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) ) + wxWindow * const parent = GetParentForModalDialog(); + if ( parent ) { - wxWindow *parent = wxTheApp->GetTopWindow(); - 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) ); - } + gtk_window_set_transient_for( GTK_WINDOW(m_widget), + GTK_WINDOW(parent->m_widget) ); } wxBusyCursorSuspender cs; // temporarily suppress the busy cursor @@ -208,16 +122,20 @@ int wxDialog::ShowModal() m_modalShowing = true; - g_openDialogs++; + wxOpenModalDialogsCount++; // NOTE: gtk_window_set_modal internally calls gtk_grab_add() ! gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE); - wxEventLoop().Run(); + // Run modal dialog event loop. + { + wxGUIEventLoopTiedPtr modal(&m_modalLoop, new wxGUIEventLoop()); + m_modalLoop->Run(); + } gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE); - g_openDialogs--; + wxOpenModalDialogsCount--; return GetReturnCode(); } @@ -228,13 +146,16 @@ void wxDialog::EndModal( int retCode ) if (!IsModal()) { - wxFAIL_MSG( wxT("wxDialog:EndModal called twice") ); + wxFAIL_MSG( "either wxDialog:EndModal called twice or ShowModal wasn't called" ); return; } m_modalShowing = false; - gtk_main_quit(); + // Ensure Exit() is only called once. The dialog's event loop may be terminated + // externally due to an uncaught exception. + if (m_modalLoop && m_modalLoop->IsRunning()) + m_modalLoop->Exit(); Show( false ); }