Revision: 6775
Author: nogu.dev
Date: Sat Sep 11 17:43:22 2010
Log: * helper/dict-cclass-dialog.c
- (cclass_dialog): Use gtk_dialog_get_content_area() for GTK+3.
* helper/dict-word-list-win-gtk.c
- (help_about_action_cb): Ditto.
* helper/dict-word-win-gtk.c
- (word_window_init): Ditto.
* helper/pref-gtk-custom-widgets.c
- (choose_olist_clicked_cb, choose_key_clicked_cb): Ditto.
http://code.google.com/p/uim/source/detail?r=6775
Modified:
/trunk/helper/dict-cclass-dialog.c
/trunk/helper/dict-word-list-win-gtk.c
/trunk/helper/dict-word-win-gtk.c
/trunk/helper/pref-gtk-custom-widgets.c
=======================================
--- /trunk/helper/dict-cclass-dialog.c Sun Apr 4 20:35:54 2010
+++ /trunk/helper/dict-cclass-dialog.c Sat Sep 11 17:43:22 2010
@@ -82,7 +82,7 @@
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin_pos),
GTK_SHADOW_IN);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
+
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
scrollwin_pos,
TRUE, TRUE, 10);
gtk_widget_show(scrollwin_pos);
=======================================
--- /trunk/helper/dict-word-list-win-gtk.c Sun Apr 4 20:35:54 2010
+++ /trunk/helper/dict-word-list-win-gtk.c Sat Sep 11 17:43:22 2010
@@ -621,8 +621,9 @@
gtk_widget_show(label1);
gtk_label_set_markup(GTK_LABEL(label1), about_name);
g_free(about_name);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(about_dialog)->vbox),
- label1, FALSE, FALSE, 0);
+ gtk_box_pack_start(
+ GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(about_dialog))),
+ label1, FALSE, FALSE, 0);
gtk_window_set_transient_for(GTK_WINDOW(about_dialog),
GTK_WINDOW(window));
=======================================
--- /trunk/helper/dict-word-win-gtk.c Sat Sep 11 01:16:11 2010
+++ /trunk/helper/dict-word-win-gtk.c Sat Sep 11 17:43:22 2010
@@ -211,8 +211,8 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_ADD,WORD_WINDOW_RESPONSE_ADD,
NULL);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox), vbox1,
- TRUE, TRUE, 0);
+
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(window))),
+ vbox1, TRUE, TRUE, 0);
gtk_widget_show_all(vbox1);
window->pane = GTK_WIDGET(vbox1);
=======================================
--- /trunk/helper/pref-gtk-custom-widgets.c Sat Sep 11 17:43:13 2010
+++ /trunk/helper/pref-gtk-custom-widgets.c Sat Sep 11 17:43:22 2010
@@ -1187,8 +1187,8 @@
hbox = gtk_hbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox,
- TRUE, TRUE, 0);
+
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
+ hbox, TRUE, TRUE, 0);
gtk_widget_show(hbox);
/* left tree view */
@@ -1759,8 +1759,8 @@
hbox = gtk_hbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox,
- TRUE, TRUE, 0);
+
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
+ hbox, TRUE, TRUE, 0);
gtk_widget_show(hbox);
scrwin = gtk_scrolled_window_new(NULL, NULL);
@@ -1822,7 +1822,8 @@
gtk_widget_show(button);
hbox = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE,
FALSE, 0);
+
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
+ hbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
gtk_widget_show(hbox);