GNOME.org
 

[dia] GSEAL: use gtk_dialog_get_content_area() instead of GtkDialog::vbox

commit 20d7caadc5b74de646e5e928236981df3e319ae2
Author: Hans Breuer <hans breuer org>
Date:   Sun Mar 27 21:58:18 2011 +0200

    GSEAL: use gtk_dialog_get_content_area() instead of GtkDialog::vbox

 app/autosave.c                         |    2 +-
 app/defaults.c                         |    2 +-
 app/dia-props.c                        |    2 +-
 app/exit_dialog.c                      |    2 +-
 app/find-and-replace.c                 |    2 +-
 app/layer_dialog.c                     |    4 ++--
 app/linewidth_area.c                   |    2 +-
 app/pagesetup.c                        |    2 +-
 app/plugin-manager.c                   |    2 +-
 app/preferences.c                      |    2 +-
 app/properties-dialog.c                |    2 +-
 lib/diaarrowchooser.c                  |    2 +-
 lib/dialinechooser.c                   |    2 +-
 lib/dialogs.c                          |    4 ++--
 lib/message.c                          |    8 ++++----
 plug-ins/postscript/paginate_psprint.c |    2 +-
 plug-ins/xslt/xsltdialog.c             |    2 +-
 17 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/app/autosave.c b/app/autosave.c
index 36214c0..3d27174 100644
--- a/app/autosave.c
+++ b/app/autosave.c
@@ -89,7 +89,7 @@ autosave_make_restore_dialog(GList *files)
   GtkWidget *ok, *cancel;
   GtkWidget *dialog = dialog_make(_("Recovering autosaved diagrams"),
 				  NULL, NULL, &ok, &cancel);
-  GtkWidget *vbox = GTK_DIALOG(dialog)->vbox;
+  GtkWidget *vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
   GtkWidget *selectarea = gtk_clist_new(1);
   GList *iter;
   gchar **filearray = (gchar**)g_new(gchar *, g_list_length(files)+1);
diff --git a/app/defaults.c b/app/defaults.c
index 91a222e..8c65acb 100644
--- a/app/defaults.c
+++ b/app/defaults.c
@@ -50,7 +50,7 @@ static void create_dialog()
 
   gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
 
-  dialog_vbox = GTK_DIALOG (dialog)->vbox;
+  dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
   
   gtk_window_set_role (GTK_WINDOW (dialog), "defaults_window");
 
diff --git a/app/dia-props.c b/app/dia-props.c
index 4377924..49aa6ff 100644
--- a/app/dia-props.c
+++ b/app/dia-props.c
@@ -93,7 +93,7 @@ create_diagram_properties_dialog(Diagram *dia)
 
   gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
 
-  dialog_vbox = GTK_DIALOG(dialog)->vbox;
+  dialog_vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 
   gtk_window_set_role(GTK_WINDOW(dialog), "diagram_properties");
 
diff --git a/app/exit_dialog.c b/app/exit_dialog.c
index a6fa0d6..d9392cf 100644
--- a/app/exit_dialog.c
+++ b/app/exit_dialog.c
@@ -82,7 +82,7 @@ exit_dialog_make (GtkWindow * parent_window,
                                                       EXIT_DIALOG_EXIT_SAVE_SELECTED,
                                                       NULL);
 
-    GtkBox * vbox = GTK_BOX (GTK_DIALOG(dialog)->vbox);
+    GtkBox * vbox = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG(dialog)));
 
     GtkWidget * label = gtk_label_new (_("The following are not saved:"));
 
diff --git a/app/find-and-replace.c b/app/find-and-replace.c
index 1185eae..4aeede4 100644
--- a/app/find-and-replace.c
+++ b/app/find-and-replace.c
@@ -448,7 +448,7 @@ fnr_dialog_setup_common (GtkWidget *dialog, gboolean is_replace, DDisplay *ddisp
   g_signal_connect(GTK_OBJECT(dialog), "delete_event",
 		   G_CALLBACK(gtk_true), NULL);
 
-  vbox = GTK_DIALOG(dialog)->vbox;
+  vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 
   hbox = gtk_hbox_new (FALSE, 12);
   label = gtk_label_new_with_mnemonic (_("_Search for:"));
diff --git a/app/layer_dialog.c b/app/layer_dialog.c
index 2dbe8a6..f22d8de 100644
--- a/app/layer_dialog.c
+++ b/app/layer_dialog.c
@@ -395,7 +395,7 @@ create_layer_dialog(void)
                       G_CALLBACK(gtk_widget_destroyed), 
 		      &(layer_dialog->dialog));
 
-  vbox = GTK_DIALOG(dialog)->vbox;
+  vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 
   hbox = gtk_hbox_new(FALSE, 1);
   
@@ -1207,7 +1207,7 @@ layer_dialog_edit_layer (DiaLayerWidget *layer_widget, Diagram *dia, Layer *laye
   /*  the main vbox  */
   vbox = gtk_vbox_new (FALSE, 1);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog->dialog)->vbox), vbox, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), vbox, TRUE, TRUE, 0);
 
   /*  the name entry hbox, label and entry  */
   hbox = gtk_hbox_new (FALSE, 1);
diff --git a/app/linewidth_area.c b/app/linewidth_area.c
index 65e7b0f..c8b9d4b 100644
--- a/app/linewidth_area.c
+++ b/app/linewidth_area.c
@@ -267,7 +267,7 @@ linewidth_create_dialog()
   gtk_box_pack_start(GTK_BOX (hbox), linewidth_button, TRUE, TRUE, 0);
   gtk_widget_show (linewidth_button);
   gtk_widget_show(hbox);
-  gtk_box_pack_start (GTK_BOX(GTK_DIALOG (linewidth_dialog)->vbox), hbox, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG (linewidth_dialog))), hbox, TRUE, TRUE, 0);
   
   gtk_widget_show (linewidth_button);
 
diff --git a/app/pagesetup.c b/app/pagesetup.c
index 02f0abb..7b34115 100644
--- a/app/pagesetup.c
+++ b/app/pagesetup.c
@@ -82,7 +82,7 @@ create_page_setup_dlg(Diagram *dia)
 			GTK_STOCK_OK, GTK_RESPONSE_OK,
 			NULL);
   gtk_dialog_set_default_response (GTK_DIALOG(ps->window), GTK_RESPONSE_OK);
-  vbox = GTK_DIALOG(ps->window)->vbox;
+  vbox = gtk_dialog_get_content_area(GTK_DIALOG(ps->window));
   gtk_dialog_set_response_sensitive(GTK_DIALOG(ps->window), GTK_RESPONSE_APPLY, FALSE);
   ps->changed = FALSE;
 
diff --git a/app/plugin-manager.c b/app/plugin-manager.c
index b9d3326..f77b14d 100644
--- a/app/plugin-manager.c
+++ b/app/plugin-manager.c
@@ -204,7 +204,7 @@ get_plugin_manager(void)
 
   gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
 
-  vbox = GTK_DIALOG(dialog)->vbox;
+  vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
   /* don't destroy dialog when window manager close button pressed */
   g_signal_connect(G_OBJECT (dialog), "response",
diff --git a/app/preferences.c b/app/preferences.c
index f6af704..7190bed 100644
--- a/app/preferences.c
+++ b/app/preferences.c
@@ -599,7 +599,7 @@ prefs_create_dialog(void)
   gtk_dialog_set_default_response (GTK_DIALOG(prefs_dialog), GTK_RESPONSE_OK);
   gtk_window_set_resizable (GTK_WINDOW (prefs_dialog), TRUE);
 
-  dialog_vbox = GTK_DIALOG (prefs_dialog)->vbox;
+  dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (prefs_dialog));
   
   gtk_window_set_role (GTK_WINDOW (prefs_dialog), "preferences_window");
 
diff --git a/app/properties-dialog.c b/app/properties-dialog.c
index 0248b5e..00821c8 100644
--- a/app/properties-dialog.c
+++ b/app/properties-dialog.c
@@ -67,7 +67,7 @@ create_dialog(GtkWidget *parent)
 
   gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
 
-  dialog_vbox = GTK_DIALOG(dialog)->vbox;
+  dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG(dialog));
 
   gtk_window_set_role(GTK_WINDOW (dialog), "properties_window");
 
diff --git a/lib/diaarrowchooser.c b/lib/diaarrowchooser.c
index 8a091c4..a72c65c 100644
--- a/lib/diaarrowchooser.c
+++ b/lib/diaarrowchooser.c
@@ -395,7 +395,7 @@ dia_arrow_chooser_dialog_new(DiaArrowChooser *chooser)
 
   wid = dia_arrow_selector_new();
   gtk_container_set_border_width(GTK_CONTAINER(wid), 5);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(chooser->dialog)->vbox), wid,
+  gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(chooser->dialog))), wid,
                      TRUE, TRUE, 0);
   gtk_widget_show(wid);
   chooser->selector = DIA_ARROW_SELECTOR(wid);
diff --git a/lib/dialinechooser.c b/lib/dialinechooser.c
index fb15520..6f38193 100644
--- a/lib/dialinechooser.c
+++ b/lib/dialinechooser.c
@@ -321,7 +321,7 @@ dia_line_chooser_init (DiaLineChooser *lchooser)
 
   wid = dia_line_style_selector_new();
   gtk_container_set_border_width(GTK_CONTAINER(wid), 5);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lchooser->dialog)->vbox), wid,
+  gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG(lchooser->dialog))), wid,
 		     TRUE, TRUE, 0);
   gtk_widget_show(wid);
   lchooser->selector = DIALINESTYLESELECTOR(wid);
diff --git a/lib/dialogs.c b/lib/dialogs.c
index 166a7e3..5f1a1fe 100644
--- a/lib/dialogs.c
+++ b/lib/dialogs.c
@@ -46,7 +46,7 @@ dialog_make(char *title, char *okay_text, char *cancel_text,
   GtkWidget *dialog = gtk_dialog_new();
   GtkWidget *label = gtk_label_new(title);
 
-  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
+  gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), label);
 
   *okay_button = gtk_button_new_with_label((okay_text!=NULL?okay_text:_("OK")));
   *cancel_button = gtk_button_new_with_label((cancel_text!=NULL?cancel_text:_("Cancel")));
@@ -73,7 +73,7 @@ dialog_add_spinbutton(GtkWidget *dialog, char *title,
 
   gtk_box_pack_start (GTK_BOX(box), label, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX(box), entry, TRUE, TRUE, 0);
-  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), box);
+  gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), box);
 
   return GTK_SPIN_BUTTON(entry);
 }
diff --git a/lib/message.c b/lib/message.c
index 024cc44..6ce70a2 100644
--- a/lib/message.c
+++ b/lib/message.c
@@ -117,18 +117,18 @@ message_create_dialog(const gchar *title, DiaMessageInfo *msginfo, gchar *buf)
 		    msginfo);
 
   msginfo->repeat_label = gtk_label_new(_("There is one similar message."));
-  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(msginfo->dialog)->vbox), 
+  gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(msginfo->dialog))), 
 		    msginfo->repeat_label);
 
   msginfo->show_repeats =
     gtk_check_button_new_with_label(_("Show repeated messages"));
-  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(msginfo->dialog)->vbox), 
+  gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(msginfo->dialog))), 
 		    msginfo->show_repeats);
   g_signal_connect(G_OBJECT(msginfo->show_repeats), "toggled", 
 		   G_CALLBACK(gtk_message_toggle_repeats), msginfo);
 
   msginfo->repeat_view = gtk_text_view_new();
-  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(msginfo->dialog)->vbox), 
+  gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(msginfo->dialog))), 
 		    msginfo->repeat_view);
   gtk_text_view_set_editable(GTK_TEXT_VIEW(msginfo->repeat_view), FALSE);
 
@@ -143,7 +143,7 @@ message_create_dialog(const gchar *title, DiaMessageInfo *msginfo, gchar *buf)
 
   msginfo->no_show_again =
     gtk_check_button_new_with_label(_("Don't show this message again"));
-  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(msginfo->dialog)->vbox), 
+  gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(msginfo->dialog))), 
 		    msginfo->no_show_again);
   g_signal_connect(G_OBJECT(msginfo->no_show_again), "toggled",
 		   G_CALLBACK(gtk_message_toggle_show_again), msginfo);
diff --git a/plug-ins/postscript/paginate_psprint.c b/plug-ins/postscript/paginate_psprint.c
index d48bddf..75b1ff8 100644
--- a/plug-ins/postscript/paginate_psprint.c
+++ b/plug-ins/postscript/paginate_psprint.c
@@ -268,7 +268,7 @@ diagram_print_ps(DiagramData *dia, const gchar* original_filename)
 		   G_CALLBACK(gtk_main_quit), NULL);
   g_signal_connect(GTK_OBJECT(dialog), "delete_event",
 		   G_CALLBACK(gtk_true), NULL);
-  vbox = GTK_DIALOG(dialog)->vbox;
+  vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 
   frame = gtk_frame_new(_("Select Printer"));
   gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
diff --git a/plug-ins/xslt/xsltdialog.c b/plug-ins/xslt/xsltdialog.c
index c6eab04..3b03f30 100644
--- a/plug-ins/xslt/xsltdialog.c
+++ b/plug-ins/xslt/xsltdialog.c
@@ -105,7 +105,7 @@ xslt_dialog_create(void) {
 	gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
 
   
-	box = GTK_DIALOG(dialog)->vbox;
+	box = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
   
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]