X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb1585ae85bc09432ae4c1afd805fb4aebf6e0c8..d284c07534af75014345a80363a7036897b5e388:/src/gtk1/dialog.cpp diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index f4a4883c61..644f2a8994 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -4,129 +4,83 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#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/gtk/win_gtk.h" +#include "wx/cursor.h" -//----------------------------------------------------------------------------- +#include +#include +#include -extern wxList wxPendingDelete; +#include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- -// "delete_event" +// idle system //----------------------------------------------------------------------------- -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; -} +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; +extern int g_openDialogs; //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxDialog,wxPanel) +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,wxPanel) +IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow) -wxDialog::wxDialog(void) +void wxDialog::Init() { - m_title = ""; + m_returnCode = 0; + m_sizeSet = FALSE; m_modalShowing = FALSE; - wxTopLevelWindows.Insert( this ); + m_themeEnabled = TRUE; } -wxDialog::wxDialog( wxWindow *parent, +wxDialog::wxDialog( wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &pos, const wxSize &size, + 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, + 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 ); - - if (m_parent) m_parent->AddChild( this ); - - - 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; - 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; -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) ) @@ -138,154 +92,85 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) ) else { SetReturnCode(wxID_CANCEL); - this->Show(FALSE); + Show(FALSE); } } void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) ) { - if ( Validate() && TransferDataFromWindow()) + if (Validate() && TransferDataFromWindow()) { - if (IsModal()) + if (IsModal()) { EndModal(wxID_OK); } else { SetReturnCode(wxID_OK); - this->Show(FALSE); + Show(FALSE); } } } void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) ) { - // yes + // yes } -bool wxDialog::OnClose(void) +void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { - static wxList closing; + // 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 (closing.Member(this)) return FALSE; // no loops - - closing.Append(this); + 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); - closing.DeleteObject(this); - - return FALSE; -} - -bool wxDialog::Destroy(void) -{ - if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); - - return TRUE; + s_closing.DeleteObject(this); } -void wxDialog::OnCloseWindow(wxCloseEvent& event) +bool wxDialog::Show( bool show ) { - if (GetEventHandler()->OnClose() || event.GetForce()) + if (!show && IsModal()) { - this->Destroy(); + EndModal( wxID_CANCEL ); } -} -void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid window" ); - - // Don't do anything for children of wxMDIChildFrame - if (!m_wxwindow) return; - - if (m_resizing) return; // I don't like recursions - m_resizing = TRUE; - - int old_x = m_x; - int old_y = m_y; - int old_width = m_width; - int old_height = m_height; - - if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING) + if (show && !m_sizeSet) { - if (x != -1) m_x = x; - if (y != -1) m_y = y; - if (width != -1) m_width = width; - if (height != -1) m_height = height; - } - else - { - m_x = x; - m_y = y; - m_width = width; - m_height = height; - } + /* 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. */ - if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH) - { - if (width == -1) m_width = 80; + GtkOnSize( m_x, m_y, m_width, m_height ); } - if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT) - { - if (height == -1) m_height = 26; - } - - if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth; - if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight; - if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight; + bool ret = wxWindow::Show( show ); - if ((m_x != -1) || (m_y != -1)) - { - if ((m_x != old_x) || (m_y != old_y)) - gtk_widget_set_uposition( m_widget, m_x, m_y ); - } - - if ((m_width != old_width) || (m_height != old_height)) - { - gtk_widget_set_usize( m_widget, m_width, m_height ); - } - - m_sizeSet = TRUE; - - wxSizeEvent event( wxSize(m_width,m_height), GetId() ); - event.SetEventObject( this ); - ProcessEvent( event ); - - m_resizing = FALSE; -} - -void wxDialog::Centre( int direction ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - int x,y; - - if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2; - if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2; - - Move( x, y ); -} - -bool wxDialog::Show( bool show ) -{ - if (!show && IsModal()) - { - EndModal( wxID_CANCEL ); - } - - wxWindow::Show( show ); - if (show) InitDialog(); - - return TRUE; + + return ret; } -bool wxDialog::IsModal(void) const +bool wxDialog::IsModal() const { return m_modalShowing; } @@ -298,58 +183,64 @@ void wxDialog::SetModal( bool WXUNUSED(flag) ) else if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL; */ - wxFAIL_MSG( "wxDialog:SetModal obsolete now" ); + wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") ); } -int wxDialog::ShowModal(void) +int wxDialog::ShowModal() { if (IsModal()) { - wxFAIL_MSG( "wxDialog:ShowModal called twice" ); + 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 && + parent->IsBeingDeleted() && + !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) ) + { + 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 ); - + + SetFocus(); + 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 (!IsModal()) { - wxFAIL_MSG( "wxDialog:EndModal called twice" ); + wxFAIL_MSG( wxT("wxDialog:EndModal called twice") ); return; } - + m_modalShowing = FALSE; - - gtk_main_quit(); - - Show( FALSE ); -} -void wxDialog::InitDialog(void) -{ - wxWindow::InitDialog(); -} + gtk_main_quit(); -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 ); + Show( FALSE ); }