X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15b24b148ad8ceadc501893ce34df3867f519a41..ea5c6ca7f7c3dc448da4be353a1153a792d01db4:/src/gtk1/dialog.cpp diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index fc6e7041ff..987c3b9c34 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -38,14 +38,8 @@ extern wxList wxPendingDelete; bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win ) { - if (g_isIdle) wxapp_install_idle_handler(); - -/* - printf( "OnDelete from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); -*/ + if (g_isIdle) + wxapp_install_idle_handler(); win->Close(); @@ -58,23 +52,17 @@ 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) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); - if (!win->HasVMT()) return; + if (!win->m_hasVMT) return; -/* - printf( "OnDialogResize from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); -*/ - - 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->UpdateSize(); + } } //----------------------------------------------------------------------------- @@ -83,9 +71,10 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); - if (!win->HasVMT()) return FALSE; + if (!win->m_hasVMT) return FALSE; win->m_x = event->x; win->m_y = event->y; @@ -107,14 +96,20 @@ static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEvent static gint gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); + + /* I haven''t been able to set the position of + the dialog before it is shown, so I set the + position in "realize" and "map" */ + gtk_widget_set_uposition( widget, win->m_x, win->m_y ); /* reset the icon */ if (win->m_icon != wxNullIcon) { wxIcon icon( win->m_icon ); win->m_icon = wxNullIcon; - win->SetIcon( icon ); + win->SetIcon( icon ); } return FALSE; @@ -127,37 +122,46 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win ) static gint gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win ) { + if (g_isIdle) + wxapp_install_idle_handler(); + /* I haven''t been able to set the position of - the dialog before it is shown, so I do it here */ + the dialog before it is shown, so I set the + position in "realize" and "map" */ gtk_widget_set_uposition( widget, win->m_x, win->m_y ); /* 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; + long decor = (long) GDK_DECOR_BORDER; + long func = (long) GDK_FUNC_MOVE ; - if ((win->m_windowStyle & wxCAPTION) == 0) - decor |= GDK_DECOR_TITLE; - if ((win->m_windowStyle & wxSYSTEM_MENU) == 0) - decor |= GDK_DECOR_MENU; - if ((win->m_windowStyle & wxMINIMIZE_BOX) == 0) + 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; + func |= GDK_FUNC_MINIMIZE; + decor |= GDK_DECOR_MINIMIZE; } - if ((win->m_windowStyle & wxMAXIMIZE_BOX) == 0) + if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0) { - decor |= GDK_DECOR_MAXIMIZE; - func |= GDK_FUNC_MAXIMIZE; + decor |= GDK_DECOR_MAXIMIZE; + func |= GDK_FUNC_MAXIMIZE; + } + if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0) + { + func |= GDK_FUNC_RESIZE; + decor |= GDK_DECOR_RESIZEH; } - if ((win->m_windowStyle & wxRESIZE_BORDER) == 0) - func |= GDK_FUNC_RESIZE; - 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->m_windowStyle & wxRESIZE_BORDER) == 0) + 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); @@ -181,6 +185,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxPanel) void wxDialog::Init() { + m_returnCode = 0; m_sizeSet = FALSE; m_modalShowing = FALSE; } @@ -207,10 +212,12 @@ bool wxDialog::Create( wxWindow *parent, PreCreation( parent, id, pos, size, style, name ); m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + + 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_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 ); @@ -229,12 +236,12 @@ bool wxDialog::Create( wxWindow *parent, /* 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 ); + GTK_SIGNAL_FUNC(gtk_dialog_realized_callback), (gpointer) this ); /* we set the position of the window after the map event. setting it before has no effect (with KWM) */ gtk_signal_connect( GTK_OBJECT(m_widget), "map", - GTK_SIGNAL_FUNC(gtk_dialog_map_callback), (gpointer) this ); + GTK_SIGNAL_FUNC(gtk_dialog_map_callback), (gpointer) this ); /* the user resized the frame by dragging etc. */ gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", @@ -248,6 +255,8 @@ bool wxDialog::Create( wxWindow *parent, wxDialog::~wxDialog() { + m_isBeingDeleted = TRUE; + wxTopLevelWindows.DeleteObject( this ); if (wxTheApp->GetTopWindow() == this) @@ -287,13 +296,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()) { @@ -427,17 +436,17 @@ 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)) - { - /* we set the position here and when showing the dialog - for the first time in idle time */ + { + /* 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)) { /* actual resizing is deferred to GtkOnSize in idle time and - when showing the dialog */ + when showing the dialog */ m_sizeSet = FALSE; } @@ -507,21 +516,11 @@ bool wxDialog::Show( bool show ) GtkOnSize( m_x, m_y, m_width, m_height ); } - if (show != m_isShown) - { - if (show) - { - gtk_widget_show( m_widget ); - } - else - gtk_widget_hide( m_widget ); - - m_isShown = show; - } + bool ret = wxWindow::Show( show ); if (show) InitDialog(); - return TRUE; + return ret; } bool wxDialog::IsModal() const @@ -586,6 +585,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();