X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/173348db5fd89f79aaaa40388c3b1c76732002d3..57c4d796c56bd48ce370240107f3e4c07e142985:/src/gtk1/dialog.cpp diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index ee9764f77a..8739c60b35 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -31,6 +31,7 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; +extern int g_openDialogs; //----------------------------------------------------------------------------- // data @@ -44,7 +45,7 @@ extern wxList wxPendingDelete; bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win ) { - if (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); win->Close(); @@ -58,7 +59,7 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxDialog *win ) { - if (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); if (!win->m_hasVMT) return; @@ -75,19 +76,19 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation // "configure_event" //----------------------------------------------------------------------------- -static gint -#if (GTK_MINOR_VERSON > 0) +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 (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); if (!win->m_hasVMT) return FALSE; -#if (GTK_MINOR_VERSON > 0) +#if (GTK_MINOR_VERSION > 0) int x = 0; int y = 0; gdk_window_get_root_origin( win->m_widget->window, &x, &y ); @@ -109,13 +110,13 @@ gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *e // "realize" from m_widget //----------------------------------------------------------------------------- -/* we cannot MWM hints and icons before the widget has been realized, +/* we cannot MWM hints and icons before the widget has been realized, so we do this directly after realization */ -static gint +static gint gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win ) { - if (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); /* I haven't been able to set the position of @@ -127,7 +128,15 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win ) 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) @@ -143,7 +152,7 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win ) if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0) { decor |= GDK_DECOR_MAXIMIZE; - func |= GDK_FUNC_MAXIMIZE; + func |= GDK_FUNC_MAXIMIZE; } if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0) { @@ -152,24 +161,24 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win ) } 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); - + /* set size hints */ - gint flag = GDK_HINT_POS; + gint flag = 0; // GDK_HINT_POS; if ((win->GetMinWidth() != -1) || (win->GetMinHeight() != -1)) flag |= GDK_HINT_MIN_SIZE; if ((win->GetMaxWidth() != -1) || (win->GetMaxHeight() != -1)) flag |= GDK_HINT_MAX_SIZE; if (flag) { - gdk_window_set_hints( win->m_widget->window, - win->m_x, win->m_y, - win->GetMinWidth(), win->GetMinHeight(), - win->GetMaxWidth(), win->GetMaxHeight(), - flag ); + gdk_window_set_hints( win->m_widget->window, + win->m_x, win->m_y, + win->GetMinWidth(), win->GetMinHeight(), + win->GetMaxWidth(), win->GetMaxHeight(), + flag ); } /* reset the icon */ @@ -179,10 +188,10 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win ) win->m_icon = wxNullIcon; win->SetIcon( icon ); } - + return FALSE; } - + //----------------------------------------------------------------------------- // InsertChild for wxDialog //----------------------------------------------------------------------------- @@ -246,6 +255,8 @@ bool wxDialog::Create( wxWindow *parent, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { + g_openDialogs++; + wxTopLevelWindows.Append( this ); m_needParent = FALSE; @@ -254,16 +265,19 @@ bool wxDialog::Create( wxWindow *parent, !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { wxFAIL_MSG( wxT("wxDialog creation failed") ); - return FALSE; + return FALSE; } 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_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", @@ -299,7 +313,7 @@ bool wxDialog::Create( wxWindow *parent, wxDialog::~wxDialog() { m_isBeingDeleted = TRUE; - + wxTopLevelWindows.DeleteObject( this ); if (wxTheApp->GetTopWindow() == this) @@ -311,6 +325,8 @@ wxDialog::~wxDialog() { wxTheApp->ExitMainLoop(); } + + g_openDialogs--; } void wxDialog::SetTitle( const wxString& title ) @@ -445,6 +461,7 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags ) int old_x = m_x; int old_y = m_y; + int old_width = m_width; int old_height = m_height; @@ -584,7 +601,7 @@ int wxDialog::ShowModal() } wxBusyCursorSuspender cs; // temporarily suppress the busy cursor - + Show( TRUE ); m_modalShowing = TRUE;