X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a126fcc3438c6b2693090e8c97761fa12d8ca7a..e5f741e5d467b1ce7105be96e9f3dcb553e8b89d:/src/gtk/dialog.cpp diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index 7edb2940c8..b52338cef1 100644 --- a/src/gtk/dialog.cpp +++ b/src/gtk/dialog.cpp @@ -14,29 +14,53 @@ #include "wx/dialog.h" #include "wx/frame.h" #include "wx/app.h" +#include "wx/cursor.h" + +#include +#include +#include -#include "gdk/gdk.h" -#include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; +extern int g_openDialogs; + +//----------------------------------------------------------------------------- +// data //----------------------------------------------------------------------------- extern wxList wxPendingDelete; +//----------------------------------------------------------------------------- +// "focus" from m_window +//----------------------------------------------------------------------------- + +static gint gtk_dialog_focus_callback( GtkWidget *widget, GtkDirectionType WXUNUSED(d), wxWindow *WXUNUSED(win) ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + // This disables GTK's tab traversal + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus" ); + return TRUE; +} + //----------------------------------------------------------------------------- // "delete_event" //----------------------------------------------------------------------------- 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" ); -*/ + if (g_isIdle) + wxapp_install_idle_handler(); - win->Close(); + if (win->IsEnabled()) + win->Close(); return TRUE; } @@ -47,33 +71,45 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxDialog *win ) { - if (!win->HasVMT()) return; + if (g_isIdle) + wxapp_install_idle_handler(); -/* - printf( "OnDialogResize from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); -*/ + if (!win->m_hasVMT) return; - if ((win->m_width != alloc->width) || (win->m_height != alloc->height)) - { - win->m_sizeSet = FALSE; - win->m_width = alloc->width; - win->m_height = alloc->height; - } + if ((win->m_width != alloc->width) || (win->m_height != alloc->height)) + { + win->m_width = alloc->width; + win->m_height = alloc->height; + win->GtkUpdateSize(); + } } //----------------------------------------------------------------------------- // "configure_event" //----------------------------------------------------------------------------- -static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win ) +static gint +#if (GTK_MINOR_VERSION > 0) +gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDialog *win ) +#else +gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win ) +#endif { - if (!win->HasVMT()) return FALSE; + if (g_isIdle) + wxapp_install_idle_handler(); + + if (!win->m_hasVMT) return FALSE; +#if (GTK_MINOR_VERSION > 0) + int x = 0; + int y = 0; + gdk_window_get_root_origin( win->m_widget->window, &x, &y ); + win->m_x = x; + win->m_y = y; +#else win->m_x = event->x; win->m_y = event->y; +#endif wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() ); mevent.SetEventObject( win ); @@ -82,6 +118,100 @@ static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEvent return FALSE; } +//----------------------------------------------------------------------------- +// "realize" from m_widget +//----------------------------------------------------------------------------- + +/* we cannot MWM hints and icons before the widget has been realized, + so we do this directly after realization */ + +static gint +gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxDialog *win ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + /* all this is for Motif Window Manager "hints" and is supposed to be + recognized by other WM as well. not tested. */ + long decor = (long) GDK_DECOR_BORDER; + long func = (long) GDK_FUNC_MOVE ; + + /* Some WM don't display any border around the frame contents if + used with these hints, so we add a resize border around it, + without automatically allowinng it to be resized though. + + This avoids the problem, but looks odd. What shall we do? + */ + decor |= GDK_DECOR_RESIZEH; + + if ((win->GetWindowStyle() & wxCAPTION) != 0) + decor |= GDK_DECOR_TITLE; + if ((win->GetWindowStyle() & wxSYSTEM_MENU) != 0) + { + decor |= GDK_DECOR_MENU; + func |= GDK_FUNC_CLOSE; + } + if ((win->GetWindowStyle() & wxMINIMIZE_BOX) != 0) + { + func |= GDK_FUNC_MINIMIZE; + decor |= GDK_DECOR_MINIMIZE; + } + if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0) + { + decor |= GDK_DECOR_MAXIMIZE; + func |= GDK_FUNC_MAXIMIZE; + } + if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0) + { + func |= GDK_FUNC_RESIZE; + decor |= GDK_DECOR_RESIZEH; + } + gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor); + gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func); + + /* GTK's shrinking/growing policy */ + if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0) + gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1); + else + gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1); + + /* reset the icon */ + if (win->m_icon != wxNullIcon) + { + wxIcon icon( win->m_icon ); + win->m_icon = wxNullIcon; + win->SetIcon( icon ); + } + + return FALSE; +} + +//----------------------------------------------------------------------------- +// InsertChild for wxDialog +//----------------------------------------------------------------------------- + +/* Callback for wxFrame. This very strange beast has to be used because + * C++ has no virtual methods in a constructor. We have to emulate a + * virtual function here as wxWindows requires different ways to insert + * a child in container classes. */ + +static void wxInsertChildInDialog( wxDialog* parent, wxWindow* child ) +{ + gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow), + GTK_WIDGET(child->m_widget), + child->m_x, + child->m_y, + child->m_width, + child->m_height ); + + if (parent->HasFlag(wxTAB_TRAVERSAL)) + { + /* we now allow a window to get the focus as long as it + doesn't have any children. */ + GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS ); + } +} + //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- @@ -98,8 +228,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxPanel) void wxDialog::Init() { + m_returnCode = 0; m_sizeSet = FALSE; m_modalShowing = FALSE; + m_themeEnabled = TRUE; } wxDialog::wxDialog( wxWindow *parent, @@ -121,17 +253,32 @@ bool wxDialog::Create( wxWindow *parent, m_needParent = FALSE; - PreCreation( parent, id, pos, size, style, name ); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) + { + wxFAIL_MSG( wxT("wxDialog creation failed") ); + return FALSE; + } - m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); + // All dialogs should really have this style + m_windowStyle |= wxTAB_TRAVERSAL; + + m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog; + + m_widget = gtk_window_new( GTK_WINDOW_DIALOG ); + + if ((m_parent) && (GTK_IS_WINDOW(m_parent->m_widget))) + gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) ); + + if (!name.IsEmpty()) + gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() ); - gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL); + GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this ); - m_wxwindow = gtk_myfixed_new(); + m_wxwindow = gtk_pizza_new(); gtk_widget_show( m_wxwindow ); GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); @@ -143,56 +290,35 @@ bool wxDialog::Create( wxWindow *parent, PostCreation(); - gtk_widget_realize( m_widget ); + 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 ); - /* all this is for Motif Window Manager "hints" and is supposed to be - recognized by other WM as well. not tested. */ - long decor = (long) GDK_DECOR_ALL; - long func = (long) GDK_FUNC_ALL; - - if ((m_windowStyle & wxCAPTION) == 0) - decor |= GDK_DECOR_TITLE; -/* if ((m_windowStyle & wxMINIMIZE) == 0) - func |= GDK_FUNC_MINIMIZE; - if ((m_windowStyle & wxMAXIMIZE) == 0) - func |= GDK_FUNC_MAXIMIZE; */ - if ((m_windowStyle & wxSYSTEM_MENU) == 0) - decor |= GDK_DECOR_MENU; - if ((m_windowStyle & wxMINIMIZE_BOX) == 0) - decor |= GDK_DECOR_MINIMIZE; - if ((m_windowStyle & wxMAXIMIZE_BOX) == 0) - decor |= GDK_DECOR_MAXIMIZE; - if ((m_windowStyle & wxRESIZE_BORDER) == 0) - func |= GDK_FUNC_RESIZE; - - gdk_window_set_decorations(m_widget->window, (GdkWMDecoration)decor); - gdk_window_set_functions(m_widget->window, (GdkWMFunction)func); - - /* GTK's shrinking/growing policy */ - if ((m_windowStyle & wxRESIZE_BORDER) == 0) - gtk_window_set_policy(GTK_WINDOW(m_widget), 0, 0, 1); - else - gtk_window_set_policy(GTK_WINDOW(m_widget), 1, 1, 1); + /* we cannot set MWM hints before the widget has + been realized, so we do this directly after realization */ + gtk_signal_connect( GTK_OBJECT(m_widget), "realize", + GTK_SIGNAL_FUNC(gtk_dialog_realized_callback), (gpointer) this ); + /* the user resized the frame by dragging etc. */ gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_dialog_size_callback), (gpointer)this ); gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event", GTK_SIGNAL_FUNC(gtk_dialog_configure_callback), (gpointer)this ); + /* disable native tab traversal */ + gtk_signal_connect( GTK_OBJECT(m_widget), "focus", + GTK_SIGNAL_FUNC(gtk_dialog_focus_callback), (gpointer)this ); + return TRUE; } wxDialog::~wxDialog() { - wxTopLevelWindows.DeleteObject( this ); - - if (wxTheApp->GetTopWindow() == this) - { - wxTheApp->SetTopWindow( (wxWindow*) NULL ); - } + CleanUp(); - if (wxTopLevelWindows.Number() == 0) + if ((wxTopLevelWindows.Number() == 0) && + (wxTheApp->GetExitOnFrameDelete())) { wxTheApp->ExitMainLoop(); } @@ -201,13 +327,12 @@ wxDialog::~wxDialog() void wxDialog::SetTitle( const wxString& title ) { m_title = title; - if (m_title.IsNull()) m_title = _T(""); gtk_window_set_title( GTK_WINDOW(m_widget), m_title.mbc_str() ); } wxString wxDialog::GetTitle() const { - return (wxString&)m_title; + return m_title; } void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) ) @@ -224,13 +349,13 @@ 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()) { @@ -239,7 +364,7 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) ) else { SetReturnCode(wxID_OK); - this->Show(FALSE); + Show(FALSE); } } } @@ -249,7 +374,7 @@ void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) ) // yes } -void wxDialog::OnCloseWindow(wxCloseEvent& event) +void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { // We'll send a Cancel message by default, // which may close the dialog. @@ -280,20 +405,42 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event) bool wxDialog::Destroy() { - if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); + // schedule the dialog for the deletion + if ( !wxPendingDelete.Member(this) ) + { + wxPendingDelete.Append(this); + } + + // don't leave a dangling pointer as the app top window, we can be deleted + // any moment at all now! + CleanUp(); return TRUE; } +void wxDialog::CleanUp() +{ + m_isBeingDeleted = TRUE; + + if ( wxTheApp->GetTopWindow() == this ) + { + wxTheApp->SetTopWindow( (wxWindow*) NULL ); + } + + wxTopLevelWindows.DeleteObject( this ); +} + void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) ) { - wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") ); + wxASSERT_MSG( (m_widget != NULL), wxT("invalid dialog") ); +#if wxUSE_CONSTRAINTS if (GetAutoLayout()) { Layout(); } else +#endif // wxUSE_CONSTRAINTS { /* no child: go out ! */ if (!GetChildren().First()) return; @@ -318,20 +465,26 @@ void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) ) } } +void wxDialog::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) ) +{ + wxFAIL_MSG( wxT("DoMoveWindow called for wxDialog") ); +} + void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { - wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") ); - wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid dialog") ); + wxASSERT_MSG( (m_widget != NULL), wxT("invalid dialog") ); + wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid dialog") ); 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 ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0) { if (x != -1) m_x = x; if (y != -1) m_y = y; @@ -346,6 +499,7 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags ) m_height = height; } +/* if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH) { if (width == -1) m_width = 80; @@ -355,6 +509,7 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { 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; @@ -364,14 +519,19 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags ) if ((m_x != -1) || (m_y != -1)) { if ((m_x != old_x) || (m_y != old_y)) - { - /* m_sizeSet = FALSE; */ + { + /* we set the position here and when showing the dialog + for the first time in idle time */ 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 ); + + /* actual resizing is deferred to GtkOnSize in idle time and + when showing the dialog */ m_sizeSet = FALSE; } @@ -395,8 +555,19 @@ void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int heigh if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth; if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight; - /* we actually set the size of a frame here and no-where else */ - gtk_widget_set_usize( m_widget, m_width, m_height ); + /* set size hints */ + gint flag = 0; // GDK_HINT_POS; + if ((m_minWidth != -1) || (m_minHeight != -1)) flag |= GDK_HINT_MIN_SIZE; + if ((m_maxWidth != -1) || (m_maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE; + GdkGeometry geom; + geom.min_width = m_minWidth; + geom.min_height = m_minHeight; + geom.max_width = m_maxWidth; + geom.max_height = m_maxHeight; + gtk_window_set_geometry_hints( GTK_WINDOW(m_widget), + (GtkWidget*) NULL, + &geom, + (GdkWindowHints) flag ); m_sizeSet = TRUE; @@ -405,23 +576,12 @@ void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int heigh GetEventHandler()->ProcessEvent( event ); } -void wxDialog::Centre( int direction ) -{ - wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") ); - - int x = 0; - int y = 0; - - 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 ); -} - void wxDialog::OnInternalIdle() { - if (!m_sizeSet) + if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow)) GtkOnSize( m_x, m_y, m_width, m_height ); + + wxWindow::OnInternalIdle(); } bool wxDialog::Show( bool show ) @@ -441,11 +601,11 @@ bool wxDialog::Show( bool show ) GtkOnSize( m_x, m_y, m_width, m_height ); } - wxWindow::Show( show ); + bool ret = wxWindow::Show( show ); if (show) InitDialog(); - return TRUE; + return ret; } bool wxDialog::IsModal() const @@ -461,25 +621,41 @@ void wxDialog::SetModal( bool WXUNUSED(flag) ) else if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL; */ - wxFAIL_MSG( _T("wxDialog:SetModal obsolete now") ); + wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") ); } int wxDialog::ShowModal() { if (IsModal()) { - wxFAIL_MSG( _T("wxDialog:ShowModal called twice") ); + wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") ); return GetReturnCode(); } + if ( !GetParent() ) + { + 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(); } @@ -489,7 +665,7 @@ void wxDialog::EndModal( int retCode ) if (!IsModal()) { - wxFAIL_MSG( _T("wxDialog:EndModal called twice") ); + wxFAIL_MSG( wxT("wxDialog:EndModal called twice") ); return; } @@ -510,6 +686,8 @@ void wxDialog::SetIcon( const wxIcon &icon ) m_icon = icon; if (!icon.Ok()) return; + if (!m_widget->window) return; + wxMask *mask = icon.GetMask(); GdkBitmap *bm = (GdkBitmap *) NULL; if (mask) bm = mask->GetBitmap();