X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d9f12f3b9f997b6308faf336d5381be591b71f4..62795f413a7222863b4aee76c08764071f94bd87:/src/gtk/dialog.cpp?ds=sidebyside diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index 1b206e4a2d..98f08d7d6f 100644 --- a/src/gtk/dialog.cpp +++ b/src/gtk/dialog.cpp @@ -1,56 +1,40 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.cpp +// Name: src/gtk/dialog.cpp // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // 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 -#include -#include +#ifndef WX_PRECOMP + #include "wx/cursor.h" +#endif // WX_PRECOMP -#include "wx/gtk/win_gtk.h" +#include "wx/evtloop.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +#include "wx/scopedptr.h" +#include "wx/modalhook.h" -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; -extern int g_openDialogs; +#include +#include "wx/gtk/private/gtk2-compat.h" +#include "wx/gtk/private/dialogcount.h" +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop) //----------------------------------------------------------------------------- // 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_returnCode = 0; - m_sizeSet = FALSE; - m_modalShowing = FALSE; - m_themeEnabled = TRUE; + m_modalLoop = NULL; + m_modalShowing = false; } wxDialog::wxDialog( wxWindow *parent, @@ -59,11 +43,8 @@ wxDialog::wxDialog( wxWindow *parent, long style, const wxString &name ) { Init(); - - // all dialogs should have tab traversal enabled - style |= wxTAB_TRAVERSAL; - Create( parent, id, title, pos, size, style, name ); + (void)Create( parent, id, title, pos, size, style, name ); } bool wxDialog::Create( wxWindow *parent, @@ -71,77 +52,12 @@ bool wxDialog::Create( wxWindow *parent, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - SetExtraStyle(GetExtraStyle() | wxTLW_EX_DIALOG); - - 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); - } - } -} + SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); -void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) ) -{ - // yes -} + // all dialogs should have tab traversal enabled + style |= wxTAB_TRAVERSAL; -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); + return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name); } bool wxDialog::Show( bool show ) @@ -151,72 +67,123 @@ 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; } -void wxDialog::SetModal( bool WXUNUSED(flag) ) +// Workaround for Ubuntu overlay scrollbar, which adds our GtkWindow to a +// private window group in a GtkScrollbar realize handler. This breaks the grab +// done by gtk_window_set_modal(), and allows menus and toolbars in the parent +// frame to remain active. So, we install an emission hook on the "realize" +// signal while showing a modal dialog. For any realize on a GtkScrollbar, +// we check the top level parent to see if it has an explicitly set window +// group that is not the same as its transient parent. If we find this, we +// put the top level back in the same window group as its transient parent, and +// re-add the grab. +// Ubuntu 12.04 and 12.10 are known to have this problem. + +// need 2.10 for gtk_window_get_group() +#if GTK_CHECK_VERSION(2,10,0) +extern "C" { +static gboolean +realize_hook(GSignalInvocationHint*, unsigned, const GValue* param_values, void*) { -/* - if (flag) - m_windowStyle |= wxDIALOG_MODAL; - else - if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL; -*/ - wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") ); + void* p = g_value_peek_pointer(param_values); + if (GTK_IS_SCROLLBAR(p)) + { + GtkWindow* toplevel = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(p))); + GtkWindow* transient_parent = gtk_window_get_transient_for(toplevel); + if (transient_parent && gtk_window_has_group(toplevel)) + { + GtkWindowGroup* group = gtk_window_get_group(toplevel); + GtkWindowGroup* group_parent = gtk_window_get_group(transient_parent); + if (group != group_parent) + { + gtk_window_group_add_window(group_parent, toplevel); + gtk_grab_add(GTK_WIDGET(toplevel)); + } + } + } + return true; +} } +#endif // GTK 2.10 int wxDialog::ShowModal() { - if (IsModal()) + WX_HOOK_MODAL_DIALOG(); + + 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(); + + wxWindow * const parent = GetParentForModalDialog(); + if ( parent ) { - wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") ); - return GetReturnCode(); + gtk_window_set_transient_for( GTK_WINDOW(m_widget), + GTK_WINDOW(parent->m_widget) ); } - // use the apps top level window as parent if none given unless explicitly - // forbidden - if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) ) + wxBusyCursorSuspender cs; // temporarily suppress the busy cursor + +#if GTK_CHECK_VERSION(2,10,0) + unsigned sigId = 0; + gulong hookId = 0; +#ifndef __WXGTK3__ + // Ubuntu overlay scrollbar uses at least GTK 2.24 + if (gtk_check_version(2,24,0) == NULL) +#endif { - wxWindow *parent = wxTheApp->GetTopWindow(); - if ( parent && parent != this ) - { - m_parent = parent; - gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) ); - } + sigId = g_signal_lookup("realize", GTK_TYPE_WIDGET); + hookId = g_signal_add_emission_hook(sigId, 0, realize_hook, NULL, NULL); } +#endif - wxBusyCursorSuspender cs; // temporarily suppress the busy cursor + Show( true ); - Show( TRUE ); + m_modalShowing = true; - m_modalShowing = TRUE; + wxOpenModalDialogLocker modalLock; - g_openDialogs++; + // NOTE: gtk_window_set_modal internally calls gtk_grab_add() ! + gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE); - gtk_grab_add( m_widget ); - gtk_main(); - gtk_grab_remove( m_widget ); + // Run modal dialog event loop. + { + wxGUIEventLoopTiedPtr modal(&m_modalLoop, new wxGUIEventLoop()); + m_modalLoop->Run(); + } + +#if GTK_CHECK_VERSION(2,10,0) + if (sigId) + g_signal_remove_emission_hook(sigId, hookId); +#endif - g_openDialogs--; + gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE); return GetReturnCode(); } @@ -227,13 +194,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 ); }