X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d355d3fe69153840d740469eddacc3336da2b5ae..a111f2b216a90bacb254644d3cae526eddc9f9f1:/src/gtk1/dialog.cpp diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index 6411ba1930..d1d13da9b3 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -2,10 +2,9 @@ // Name: 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__ @@ -15,218 +14,227 @@ #include "wx/dialog.h" #include "wx/frame.h" #include "wx/app.h" -#include "wx/gtk/win_gtk.h" +#include "wx/cursor.h" -//----------------------------------------------------------------------------- +#include +#include +#include -extern wxList wxPendingDelete; +#include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- -// delete +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; +extern int g_openDialogs; -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,wxWindow) - EVT_BUTTON (wxID_OK, wxDialog::OnOk) - EVT_BUTTON (wxID_CANCEL, wxDialog::OnCancel) - EVT_BUTTON (wxID_APPLY, wxDialog::OnApply) - EVT_CLOSE (wxDialog::OnCloseWindow) +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,wxWindow) +IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow) -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_sizeSet = FALSE; + 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 ) + 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) -{ - wxTopLevelWindows.DeleteObject( this ); - if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop(); -}; + SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); -void wxDialog::SetTitle(const wxString& title ) -{ - m_title = title; - gtk_window_set_title( GTK_WINDOW(m_widget), m_title ); -}; + // all dialogs should have tab traversal enabled + style |= wxTAB_TRAVERSAL; -wxString wxDialog::GetTitle(void) const -{ - return (wxString&)m_title; -}; + return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name); +} void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) ) { - if (Validate()) TransferDataFromWindow(); -}; + if (Validate()) + TransferDataFromWindow(); +} void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) ) { - if (IsModal()) - { - EndModal(wxID_CANCEL); - } - else - { - SetReturnCode(wxID_CANCEL); - this->Show(FALSE); - }; -}; - -void wxDialog::OnOk( wxCommandEvent &WXUNUSED(event) ) -{ - if ( Validate() && TransferDataFromWindow()) - { - if (IsModal()) + if (IsModal()) { - EndModal(wxID_OK); + EndModal(wxID_CANCEL); } else { - SetReturnCode(wxID_OK); - this->Show(FALSE); - }; - }; -}; + 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 -}; + // yes +} -bool wxDialog::OnClose(void) +void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { - 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; + // 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::Destroy(void) +bool wxDialog::Show( bool show ) { - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); + if (!show && IsModal()) + { + 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 ); + } - return TRUE; + bool ret = wxWindow::Show( show ); + + if (show) InitDialog(); + + return ret; } -void wxDialog::OnCloseWindow(wxCloseEvent& event) +bool wxDialog::IsModal() const { - if (GetEventHandler()->OnClose() || event.GetForce()) - { - this->Destroy(); - }; -}; + return m_modalShowing; +} -bool wxDialog::Show( bool show ) +void wxDialog::SetModal( bool WXUNUSED(flag) ) { - if (!show && IsModal() && m_modalShowing) - { - EndModal( wxID_CANCEL ); - }; - - wxWindow::Show( show ); - - if (show) InitDialog(); - - return TRUE; -}; - -int wxDialog::ShowModal(void) +/* + 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 (m_modalShowing) return GetReturnCode(); - - Show( TRUE ); - - m_modalShowing = TRUE; - - gtk_grab_add( m_widget ); - gtk_main(); - gtk_grab_remove( m_widget ); - - return GetReturnCode(); -}; + if (IsModal()) + { + wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") ); + return GetReturnCode(); + } + + // 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 ) + { + m_parent = parent; + gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) ); + } + } + + wxBusyCursorSuspender cs; // temporarily suppress the busy cursor + + Show( TRUE ); + + m_modalShowing = TRUE; + + g_openDialogs++; + + gtk_grab_add( m_widget ); + gtk_main(); + gtk_grab_remove( m_widget ); + + g_openDialogs--; + + return GetReturnCode(); +} void wxDialog::EndModal( int retCode ) { - SetReturnCode( retCode ); - - if (!m_modalShowing) return; - m_modalShowing = FALSE; - - gtk_main_quit(); -}; - -void wxDialog::InitDialog(void) -{ - wxWindow::InitDialog(); -}; + SetReturnCode( retCode ); + + if (!IsModal()) + { + wxFAIL_MSG( wxT("wxDialog:EndModal called twice") ); + return; + } + + m_modalShowing = FALSE; + gtk_main_quit(); + + Show( FALSE ); +}