X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..4192cc364fd89c14e9e17bbe892ed85807af3eba:/src/gtk/dialog.cpp diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index 644f2a8994..d9d6dd1e9c 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,51 +7,39 @@ // 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" -#include +#ifndef WX_PRECOMP + #include "wx/cursor.h" +#endif // WX_PRECOMP + +#include "wx/evtloop.h" + +#include "wx/ptr_scpd.h" + #include -#include -#include "wx/gtk/win_gtk.h" +// this is defined in src/gtk/toplevel.cpp +extern int wxOpenModalDialogsCount; -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop); -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; -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; + m_modalShowing = false; + m_themeEnabled = true; } wxDialog::wxDialog( wxWindow *parent, @@ -77,75 +65,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()) @@ -153,23 +72,26 @@ 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() +{ + m_isBeingDeleted = true; + + // if the dialog is modal, this will end its event loop + if ( IsModal() ) + EndModal(wxID_CANCEL); +} + bool wxDialog::IsModal() const { return m_modalShowing; @@ -177,53 +99,52 @@ 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") ); } 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 *parent = wxTheApp->GetTopWindow(); - if ( parent && - parent != this && - parent->IsBeingDeleted() && - !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) ) + wxWindow * const parent = GetParentForModalDialog(); + if ( parent && parent != this ) { - 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 - - Show( TRUE ); - SetFocus(); + Show( true ); + + m_modalShowing = true; - m_modalShowing = TRUE; + wxOpenModalDialogsCount++; - g_openDialogs++; + // NOTE: gtk_window_set_modal internally calls gtk_grab_add() ! + gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE); + + // Run modal dialog event loop. + { + wxGUIEventLoopTiedPtr modal(&m_modalLoop, new wxGUIEventLoop()); + m_modalLoop->Run(); + } - gtk_grab_add( m_widget ); - gtk_main(); - gtk_grab_remove( m_widget ); + gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE); - g_openDialogs--; + wxOpenModalDialogsCount--; return GetReturnCode(); } @@ -234,13 +155,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; + 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 ); + Show( false ); }