X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a60c99e6a919bad02f33ee1429a831f00b0df819..4e15d1caa03346c126015019c1fdf093033ef40b:/src/gtk/dialog.cpp?ds=sidebyside diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index 73ae00a02b..4cf2730f9c 100644 --- a/src/gtk/dialog.cpp +++ b/src/gtk/dialog.cpp @@ -1,292 +1,164 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.cpp +// Name: src/gtk/dialog.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// 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/gtk/win_gtk.h" -//----------------------------------------------------------------------------- +#ifndef WX_PRECOMP + #include "wx/cursor.h" +#endif // WX_PRECOMP -extern wxList wxPendingDelete; +#include "wx/evtloop.h" -//----------------------------------------------------------------------------- -// "delete_event" -//----------------------------------------------------------------------------- +#include "wx/scopedptr.h" +#include "wx/testing.h" + +#include + +// this is defined in src/gtk/toplevel.cpp +extern int wxOpenModalDialogsCount; + +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop) -bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win ) -{ -/* - printf( "OnDelete from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); -*/ - - win->Close(); - - return TRUE; -} //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxDialog,wxPanel) - 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,wxPanel) - -wxDialog::wxDialog(void) +void wxDialog::Init() { - m_title = ""; - m_modalShowing = FALSE; - wxTopLevelWindows.Insert( this ); + m_modalLoop = NULL; + m_returnCode = 0; + m_modalShowing = false; + m_themeEnabled = true; } -wxDialog::wxDialog( wxWindow *parent, - wxWindowID id, const wxString &title, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) +wxDialog::wxDialog( wxWindow *parent, + wxWindowID id, const wxString &title, + const wxPoint &pos, const wxSize &size, + long style, const wxString &name ) { - m_modalShowing = FALSE; - wxTopLevelWindows.Insert( this ); - Create( parent, id, title, pos, size, style, name ); + Init(); + + (void)Create( parent, id, title, pos, size, style, name ); } bool wxDialog::Create( wxWindow *parent, - wxWindowID id, const wxString &title, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) + wxWindowID id, const wxString &title, + const wxPoint &pos, const wxSize &size, + long style, const wxString &name ) { - m_needParent = FALSE; - - PreCreation( parent, id, pos, size, style, name ); - - m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); - - gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL); - - gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", - GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this ); - - m_wxwindow = gtk_myfixed_new(); - gtk_widget_show( m_wxwindow ); - GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); - - gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow ); - - SetTitle( title ); - - if ((m_x != -1) || (m_y != -1)) - gtk_widget_set_uposition( m_widget, m_x, m_y ); - - gtk_widget_set_usize( m_widget, m_width, m_height ); - - PostCreation(); - - return TRUE; -} + SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); -wxDialog::~wxDialog(void) -{ - wxTopLevelWindows.DeleteObject( this ); - if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop(); -} + // all dialogs should have tab traversal enabled + style |= wxTAB_TRAVERSAL; -void wxDialog::SetTitle(const wxString& title ) -{ - m_title = title; - if (m_title.IsNull()) m_title = ""; - gtk_window_set_title( GTK_WINDOW(m_widget), m_title ); + return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name); } -wxString wxDialog::GetTitle(void) const +bool wxDialog::Show( bool show ) { - return (wxString&)m_title; -} + if (!show && IsModal()) + { + EndModal( wxID_CANCEL ); + } -void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) ) -{ - if (Validate()) TransferDataFromWindow(); -} + if (show && CanDoLayoutAdaptation()) + DoLayoutAdaptation(); -void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) ) -{ - if (IsModal()) - { - EndModal(wxID_CANCEL); - } - else - { - SetReturnCode(wxID_CANCEL); - this->Show(FALSE); - } + bool ret = wxDialogBase::Show(show); + + if (show) + InitDialog(); + + return ret; } -void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) ) +wxDialog::~wxDialog() { - if ( Validate() && TransferDataFromWindow()) - { - if (IsModal()) - { - EndModal(wxID_OK); - } - else - { - SetReturnCode(wxID_OK); - this->Show(FALSE); - } - } + // if the dialog is modal, this will end its event loop + if ( IsModal() ) + EndModal(wxID_CANCEL); } -void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) ) +bool wxDialog::IsModal() const { - // yes + return m_modalShowing; } -bool wxDialog::OnClose(void) +void wxDialog::SetModal( bool WXUNUSED(flag) ) { - static wxList closing; - - if (closing.Member(this)) return FALSE; // no loops - - closing.Append(this); - - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); - closing.DeleteObject(this); - - return FALSE; + wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") ); } -bool wxDialog::Destroy(void) +int wxDialog::ShowModal() { - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); + WX_TESTING_SHOW_MODAL_HOOK(); - return TRUE; -} + wxASSERT_MSG( !IsModal(), "ShowModal() can't be called twice" ); -void wxDialog::OnCloseWindow(wxCloseEvent& event) -{ - if (GetEventHandler()->OnClose() || event.GetForce()) - { - this->Destroy(); - } -} + // 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(); -void wxDialog::ImplementSetPosition(void) -{ - if ((m_x != -1) || (m_y != -1)) - gtk_widget_set_uposition( m_widget, m_x, m_y ); -} + wxWindow * const parent = GetParentForModalDialog(); + if ( parent ) + { + gtk_window_set_transient_for( GTK_WINDOW(m_widget), + GTK_WINDOW(parent->m_widget) ); + } -void wxDialog::Centre( int direction ) -{ - if (direction & wxHORIZONTAL == wxHORIZONTAL) m_x = (gdk_screen_width () - m_width) / 2; - if (direction & wxVERTICAL == wxVERTICAL) m_y = (gdk_screen_height () - m_height) / 2; - ImplementSetPosition(); -} + wxBusyCursorSuspender cs; // temporarily suppress the busy cursor -bool wxDialog::Show( bool show ) -{ - if (!show && IsModal()) - { - EndModal( wxID_CANCEL ); - } - - wxWindow::Show( show ); - - if (show) InitDialog(); - - return TRUE; -} + Show( true ); -bool wxDialog::IsModal(void) const -{ - return m_modalShowing; -} + m_modalShowing = true; -void wxDialog::SetModal( bool WXUNUSED(flag) ) -{ -/* - if (flag) - m_windowStyle |= wxDIALOG_MODAL; - else - if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL; -*/ - wxFAIL_MSG( "wxDialog:SetModal obsolete now" ); -} + wxOpenModalDialogsCount++; + + // 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_window_set_modal(GTK_WINDOW(m_widget), FALSE); + + wxOpenModalDialogsCount--; -int wxDialog::ShowModal(void) -{ - if (IsModal()) - { - wxFAIL_MSG( "wxDialog:ShowModal called twice" ); return GetReturnCode(); - } - - Show( TRUE ); - - m_modalShowing = TRUE; - - gtk_grab_add( m_widget ); - gtk_main(); - gtk_grab_remove( m_widget ); - - return GetReturnCode(); } void wxDialog::EndModal( int retCode ) { - SetReturnCode( retCode ); - - if (!IsModal()) - { - wxFAIL_MSG( "wxDialog:EndModal called twice" ); - return; - } - - m_modalShowing = FALSE; - - gtk_main_quit(); - - Show( FALSE ); -} + SetReturnCode( retCode ); -void wxDialog::InitDialog(void) -{ - wxWindow::InitDialog(); -} + if (!IsModal()) + { + wxFAIL_MSG( "either wxDialog:EndModal called twice or ShowModal wasn't called" ); + return; + } -void wxDialog::SetIcon( const wxIcon &icon ) -{ - m_icon = icon; - if (!icon.Ok()) return; - - wxMask *mask = icon.GetMask(); - GdkBitmap *bm = (GdkBitmap *) NULL; - if (mask) bm = mask->GetBitmap(); - - gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm ); -} + m_modalShowing = false; + // 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 ); +}