X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b6af8d80dcdd9d7ef9cca3aaaaf8fe4db343d7ae..e3041f4af06d127021c568c39783279b8d0bea75:/src/gtk/dialog.cpp diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index 4c394a33e5..bb0f74e2ef 100644 --- a/src/gtk/dialog.cpp +++ b/src/gtk/dialog.cpp @@ -1,238 +1,151 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 - -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; -}; +#include + +// this is defined in src/gtk/toplevel.cpp +extern int wxOpenModalDialogsCount; //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxDialog,wxWindow) - 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) -IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxWindow) - -wxDialog::wxDialog(void) +void wxDialog::Init() { - m_title = ""; - m_modalShowing = FALSE; - wxTopLevelWindows.Insert( this ); -}; - -wxDialog::wxDialog( wxWindow *parent, - wxWindowID id, const wxString &title, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) + 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 ) { - 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 ) -{ - 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 ); - - PostCreation(); - - return TRUE; -}; - -wxDialog::~wxDialog(void) + wxWindowID id, const wxString &title, + const wxPoint &pos, const wxSize &size, + long style, const wxString &name ) { - wxTopLevelWindows.DeleteObject( this ); - if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop(); -}; + SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); -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 ); -}; + // all dialogs should have tab traversal enabled + style |= wxTAB_TRAVERSAL; + + 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 ); + } + + if (show && CanDoLayoutAdaptation()) + DoLayoutAdaptation(); + + bool ret = wxWindow::Show( show ); + + if (show) InitDialog(); -void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) ) + return ret; +} + +bool wxDialog::IsModal() const { - if (Validate()) TransferDataFromWindow(); -}; + return m_modalShowing; +} -void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) ) +void wxDialog::SetModal( bool WXUNUSED(flag) ) { - if (IsModal()) - { - EndModal(wxID_CANCEL); - } - else - { - SetReturnCode(wxID_CANCEL); - this->Show(FALSE); - }; -}; - -void wxDialog::OnOk( wxCommandEvent &WXUNUSED(event) ) + wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") ); +} + +int wxDialog::ShowModal() { - if ( Validate() && TransferDataFromWindow()) - { - if (IsModal()) + if (IsModal()) { - EndModal(wxID_OK); + wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") ); + return GetReturnCode(); } - else + + // 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) ) { - SetReturnCode(wxID_OK); - this->Show(FALSE); - }; - }; -}; + wxWindow * const parent = GetParentForModalDialog(); + if ( parent && parent != this ) + { + gtk_window_set_transient_for( GTK_WINDOW(m_widget), + GTK_WINDOW(parent->m_widget) ); + } + } -void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) ) -{ - // yes -}; + wxBusyCursorSuspender cs; // temporarily suppress the busy cursor -bool wxDialog::OnClose(void) -{ - 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; -} + Show( true ); -bool wxDialog::Destroy(void) -{ - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); + m_modalShowing = true; - return TRUE; -} + wxOpenModalDialogsCount++; -void wxDialog::OnCloseWindow(wxCloseEvent& event) -{ - if (GetEventHandler()->OnClose() || event.GetForce()) - { - this->Destroy(); - }; -}; + // NOTE: gtk_window_set_modal internally calls gtk_grab_add() ! + gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE); -bool wxDialog::Show( bool show ) -{ - if (!show && IsModal() && m_modalShowing) - { - EndModal( wxID_CANCEL ); - }; - - wxWindow::Show( show ); - - if (show) InitDialog(); - - return TRUE; -}; - -int wxDialog::ShowModal(void) -{ - if (m_modalShowing) return GetReturnCode(); - - Show( TRUE ); - - m_modalShowing = TRUE; - - gtk_grab_add( m_widget ); - gtk_main(); - gtk_grab_remove( m_widget ); - - return GetReturnCode(); -}; + wxGUIEventLoop().Run(); + + gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE); + + wxOpenModalDialogsCount--; + + return GetReturnCode(); +} void wxDialog::EndModal( int retCode ) { - SetReturnCode( retCode ); - - if (!m_modalShowing) - { - wxFAIL_MSG( "wxDialog: called EndModal twice" ); - return; - }; - - m_modalShowing = FALSE; - - gtk_main_quit(); -}; - -void wxDialog::InitDialog(void) -{ - wxWindow::InitDialog(); -}; + SetReturnCode( retCode ); + if (!IsModal()) + { + wxFAIL_MSG( "either wxDialog:EndModal called twice or ShowModal wasn't called" ); + return; + } + + m_modalShowing = false; + + gtk_main_quit(); + + Show( false ); +}