- // GtkFileChooserButton will automatically destroy the
- // GtkFileChooserDialog associated with m_dialog.
- // Thus we have to set its m_widget to NULL to avoid
- // double destruction on same widget
- if (m_dialog)
- m_dialog->m_widget = NULL;
+ if ( m_dialog )
+ {
+ // when m_dialog is deleted, it will destroy the widget it is sharing
+ // with GtkFileChooserButton, which results in a bunch of Gtk-CRITICAL
+ // errors from GtkFileChooserButton. To avoid this, call gtk_widget_destroy()
+ // on GtkFileChooserButton first (our base dtor will do it again, but
+ // that does no harm). m_dialog holds a reference to the shared widget,
+ // so it won't go away until m_dialog base dtor unrefs it.
+ gtk_widget_destroy(m_widget);
+ delete m_dialog;
+ }