Revision: ae6269b51a7a
Author: Muneyuki Noguchi <nogu....@gmail.com>
Date: Sun Jun 10 00:27:29 2012
Log: Replace deprecated function in GTK+ 3.
* gtk2/candwin/gtk.c
- (candidate_window_init)
* Replace gtk_vbox_new() with gtk_box_new().
* Replace gtk_hbox_new() with gtk_box_new().
* gtk2/candwin/horizontal-gtk.c
- Ditto.
* gtk2/candwin/tbl-gtk.c
- Ditto.
* gtk2/dict/word-list-win-gtk.c
- (word_list_window_init): Replace gtk_vbox_new() with gtk_box_new().
* gtk2/dict/word-win-gtk.c
- (word_window_init)
* Replace gtk_vbox_new() with gtk_box_new().
* Replace gtk_hbox_new() with gtk_box_new().
* gtk2/immodule/caret-state-indicator.c
- (caret_state_indicator_new): Replace gtk_hbox_new() with gtk_box_new().
* gtk2/immodule/uim-cand-win-gtk.c
- (uim_cand_win_gtk_init)
* Replace gtk_vbox_new() with gtk_box_new().
* Replace gtk_hbox_new() with gtk_box_new().
- (uim_cand_win_gtk_layout):
Repalce gtk_widget_size_request() with gtk_widget_get_preferred_size().
* gtk2/pad/ja.c
- (create_tab, create_hiragana_tab, create_eisu_tab, create_symbol_tab,
create_greek_tab, create_cyrillic_tab):
Replace gtk_vbox_new() with gtk_box_new().
* gtk2/pref/gtk-custom-widgets.c
- (add_custom_type_bool, add_custom_type_integer,
add_custom_type_string, add_custom_type_pathname,
add_custom_type_choice, add_custom_type_orderedlist,
add_custom_type_key, add_custom_type_table)
Replace gtk_hbox_new() with gtk_box_new().
- (choose_olist_clicked_cb, choose_key_clicked_cb,
choose_table_clicked_cb)
* Replace gtk_vbox_new() with gtk_box_new().
* Replace gtk_hbox_new() with gtk_box_new().
- (choose_key_button_clicked_cb):
Replace gdk_keyboard_grab() with gdk_device_grab().
* gtk2/pref/gtk.c
- (create_setting_button_box)
Replace gtk_hbutton_box_new() with gtk_button_box_new().
- (create_group_widget, create_pref_window)
Replace gtk_vbox_new() with gtk_box_new().
- (create_sub_group_widgets)
* Replace gtk_vbox_new() with gtk_box_new().
* Replace gtk_hbox_new() with gtk_box_new().
* gtk2/switcher/gtk.c
- (create_switcher)
* Replace gtk_vbox_new() with gtk_box_new().
* Replace gtk_hbox_new() with gtk_box_new().
* Replace gtk_hbutton_box_new() with gtk_button_box_new().
* gtk2/test/entry.c
- (main)
* Replace gtk_vbox_new() with gtk_box_new().
* Replace gtk_hbox_new() with gtk_box_new().
* gtk2/toolbar/common-gtk.c
- (calc_menu_position):
Repalce gtk_widget_size_request() with gtk_widget_get_preferred_size().
- (popup_prop_menu, toolbar_new):
Replace gtk_hbox_new() with gtk_box_new().
* gtk2/toolbar/standalone-gtk.c
- (button_press_event_cb):
* Replace gdk_pointer_grab() with gdk_device_grab().
* Replace gdk_cursor_unref() with g_object_unref().
- (button_release_event_cb):
Replace gdk_pointer_ungrab() with gdk_device_ungrab().
- (main): Replace gtk_hbox_new() with gtk_box_new().
http://code.google.com/p/uim/source/detail?r=ae6269b51a7a
Modified:
/gtk2/candwin/gtk.c
/gtk2/candwin/horizontal-gtk.c
/gtk2/candwin/tbl-gtk.c
/gtk2/dict/word-list-win-gtk.c
/gtk2/dict/word-win-gtk.c
/gtk2/immodule/caret-state-indicator.c
/gtk2/immodule/uim-cand-win-gtk.c
/gtk2/pad/ja.c
/gtk2/pref/gtk-custom-widgets.c
/gtk2/pref/gtk.c
/gtk2/switcher/gtk.c
/gtk2/test/entry.c
/gtk2/toolbar/common-gtk.c
/gtk2/toolbar/standalone-gtk.c
=======================================
--- /gtk2/candwin/gtk.c Wed Jan 11 00:17:24 2012
+++ /gtk2/candwin/gtk.c Sun Jun 10 00:27:29 2012
@@ -419,7 +419,11 @@
GtkTreeSelection *selection;
GdkRectangle cursor_location;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+#else
vbox = gtk_vbox_new(FALSE, 0);
+#endif
frame = gtk_frame_new(NULL);
cwin->stores = g_ptr_array_new();
@@ -479,7 +483,11 @@
cwin->num_label = gtk_label_new("");
/* hbox with prev and next page button: [[<] num_label [>]] */
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new(FALSE, 0);
+#endif
cwin->prev_page_button = gtk_button_new_with_label("<");
cwin->next_page_button = gtk_button_new_with_label(">");
gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(cwin->prev_page_button),
=======================================
--- /gtk2/candwin/horizontal-gtk.c Mon Apr 30 21:39:16 2012
+++ /gtk2/candwin/horizontal-gtk.c Sun Jun 10 00:27:29 2012
@@ -461,7 +461,11 @@
GdkRectangle cursor_location;
gint col;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ cwin->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+#else
cwin->vbox = gtk_vbox_new(FALSE, 0);
+#endif
cwin->frame = gtk_frame_new(NULL);
cwin->stores = g_ptr_array_new();
@@ -518,7 +522,11 @@
cwin->num_label = gtk_label_new("");
/* hbox with prev and next page button: [[<] num_label [>]] */
+#if GTK_CHECK_VERSION(3, 2, 0)
+ cwin->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
cwin->hbox = gtk_hbox_new(FALSE, 0);
+#endif
cwin->prev_page_button = gtk_button_new_with_label("<");
cwin->next_page_button = gtk_button_new_with_label(">");
gtk_box_pack_start(GTK_BOX(cwin->hbox),
GTK_WIDGET(cwin->prev_page_button),
=======================================
--- /gtk2/candwin/tbl-gtk.c Wed Jan 11 00:17:24 2012
+++ /gtk2/candwin/tbl-gtk.c Sun Jun 10 00:27:29 2012
@@ -381,7 +381,11 @@
GdkRectangle cursor_location;
gint row, col;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ cwin->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+#else
cwin->vbox = gtk_vbox_new(FALSE, 0);
+#endif
cwin->frame = gtk_frame_new(NULL);
cwin->stores = g_ptr_array_new();
@@ -443,7 +447,11 @@
cwin->num_label = gtk_label_new("");
/* hbox with prev and next page button: [[<] num_label [>]] */
+#if GTK_CHECK_VERSION(3, 2, 0)
+ cwin->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
cwin->hbox = gtk_hbox_new(FALSE, 0);
+#endif
cwin->prev_page_button = gtk_button_new_with_label("<");
cwin->next_page_button = gtk_button_new_with_label(">");
gtk_box_pack_start(GTK_BOX(cwin->hbox),
GTK_WIDGET(cwin->prev_page_button),
=======================================
--- /gtk2/dict/word-list-win-gtk.c Wed Jan 11 00:17:24 2012
+++ /gtk2/dict/word-list-win-gtk.c Sun Jun 10 00:27:29 2012
@@ -245,7 +245,11 @@
gtk_window_set_default_size(GTK_WINDOW(window), 600, 450);
gtk_window_set_title(GTK_WINDOW(window), _("Edit the dictionary"));
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+#else
vbox = gtk_vbox_new(FALSE, 0);
+#endif
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_widget_show(vbox);
=======================================
--- /gtk2/dict/word-win-gtk.c Wed Jan 11 00:17:24 2012
+++ /gtk2/dict/word-win-gtk.c Sun Jun 10 00:27:29 2012
@@ -137,18 +137,30 @@
GtkWidget *button_add, *button_clear;
#endif
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
+#else
vbox1 = gtk_vbox_new(FALSE, 10);
+#endif
gtk_container_set_border_width(GTK_CONTAINER(vbox1), 10);
/* Necessary infomation area */
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+#else
vbox2 = gtk_vbox_new(FALSE, 6);
+#endif
gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0);
label = gtk_label_new(_("Necessary infomation"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new(FALSE, 0);
+#endif
gtk_box_pack_start(GTK_BOX(vbox2), hbox, TRUE, TRUE, 0);
label = gtk_label_new(" ");
@@ -161,14 +173,22 @@
word_window_necessary_create(window));
/* Additional infomation area */
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+#else
vbox2 = gtk_vbox_new(FALSE, 6);
+#endif
gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0);
label = gtk_label_new (_("Additional infomation"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 1.0);
gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new(FALSE, 0);
+#endif
gtk_box_pack_start(GTK_BOX(vbox2), hbox, TRUE, TRUE, 0);
label = gtk_label_new(" ");
=======================================
--- /gtk2/immodule/caret-state-indicator.c Wed Jan 11 00:17:24 2012
+++ /gtk2/immodule/caret-state-indicator.c Sun Jun 10 00:27:29 2012
@@ -125,7 +125,11 @@
label = gtk_label_new("");
frame = gtk_frame_new(NULL);
gtk_container_add(GTK_CONTAINER(frame), label);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new(TRUE, 0);
+#endif
gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0);
gtk_container_add(GTK_CONTAINER(window), hbox);
=======================================
--- /gtk2/immodule/uim-cand-win-gtk.c Wed Jan 11 00:17:24 2012
+++ /gtk2/immodule/uim-cand-win-gtk.c Sun Jun 10 00:27:29 2012
@@ -177,13 +177,21 @@
cwin->sub_window.active = FALSE;
/* build window */
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+#else
vbox = gtk_vbox_new(FALSE, 0);
+#endif
gtk_box_pack_start(GTK_BOX(vbox), cwin->scrolled_window, TRUE, TRUE, 0);
uim_cand_win_gtk_set_scrollable(cwin, FALSE);
/* hbox with prev and next page button: [[<] num_label [>]] */
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new(FALSE, 0);
+#endif
cwin->prev_page_button = gtk_button_new_with_label("<");
cwin->next_page_button = gtk_button_new_with_label(">");
gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(cwin->prev_page_button),
@@ -712,7 +720,11 @@
g_return_if_fail(UIM_IS_CAND_WIN_GTK(cwin));
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gtk_widget_get_preferred_size(GTK_WIDGET(cwin), &req, NULL);
+#else
gtk_widget_size_request(GTK_WIDGET(cwin), &req);
+#endif
cw_wi = req.width;
cw_he = req.height;
=======================================
--- /gtk2/pad/ja.c Wed Jan 11 00:17:24 2012
+++ /gtk2/pad/ja.c Sun Jun 10 00:27:29 2012
@@ -353,7 +353,11 @@
{
GtkWidget *vbox;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
+#else
vbox = gtk_vbox_new(FALSE, 10);
+#endif
gtk_box_pack_start(GTK_BOX(vbox),
buttontable_create(table, len),
@@ -367,7 +371,11 @@
{
GtkWidget *vbox;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
+#else
vbox = gtk_vbox_new(FALSE, 10);
+#endif
gtk_box_pack_start(GTK_BOX(vbox),
buttontable_create(hiragana,
sizeof(hiragana)/sizeof(gchar*)),
@@ -384,7 +392,11 @@
{
GtkWidget *vbox;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
+#else
vbox = gtk_vbox_new(FALSE, 10);
+#endif
gtk_box_pack_start(GTK_BOX(vbox),
buttontable_create(katakana,
sizeof(katakana)/sizeof(gchar*)),
@@ -401,7 +413,11 @@
{
GtkWidget *vbox;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
+#else
vbox = gtk_vbox_new(FALSE, 10);
+#endif
gtk_box_pack_start(GTK_BOX(vbox),
buttontable_create(alphabet_capital,
sizeof(alphabet_capital)/sizeof(gchar*)),
@@ -425,7 +441,11 @@
{
GtkWidget *vbox;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
+#else
vbox = gtk_vbox_new(FALSE, 10);
+#endif
gtk_box_pack_start(GTK_BOX(vbox),
buttontable_create(dot, sizeof(dot)/sizeof(gchar*)),
@@ -449,7 +469,11 @@
{
GtkWidget *vbox;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
+#else
vbox = gtk_vbox_new(FALSE, 10);
+#endif
gtk_box_pack_start(GTK_BOX(vbox),
buttontable_create(greek_capital,
sizeof(greek_capital)/sizeof(gchar*)),
@@ -467,7 +491,11 @@
{
GtkWidget *vbox;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
+#else
vbox = gtk_vbox_new(FALSE, 10);
+#endif
gtk_box_pack_start(GTK_BOX(vbox),
buttontable_create(cyrillic_capital,
sizeof(cyrillic_capital)/sizeof(gchar*)),
=======================================
--- /gtk2/pref/gtk-custom-widgets.c Wed Jan 11 00:17:24 2012
+++ /gtk2/pref/gtk-custom-widgets.c Sun Jun 10 00:27:29 2012
@@ -197,7 +197,11 @@
{
GtkWidget *hbox;
GtkWidget *check_button;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
+#else
hbox = gtk_hbox_new(FALSE, 8);
+#endif
check_button = gtk_check_button_new_with_label(custom->label);
g_object_set_data_full(G_OBJECT(check_button),
@@ -294,7 +298,11 @@
if (!spin_button_sgroup)
spin_button_sgroup = gtk_size_group_new(GTK_SIZE_GROUP_VERTICAL);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
+#else
hbox = gtk_hbox_new(FALSE, 8);
+#endif
label = gtk_label_new(custom->label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
@@ -413,7 +421,11 @@
GtkWidget *label;
GtkWidget *entry;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
+#else
hbox = gtk_hbox_new(FALSE, 8);
+#endif
label = gtk_label_new(custom->label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
@@ -478,7 +490,11 @@
GtkWidget *button;
const char *button_label;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
+#else
hbox = gtk_hbox_new(FALSE, 8);
+#endif
label = gtk_label_new(custom->label);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
@@ -639,7 +655,11 @@
GtkWidget *label;
GtkWidget *combobox;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
+#else
hbox = gtk_hbox_new(FALSE, 8);
+#endif
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
label = gtk_label_new(custom->label);
@@ -1196,14 +1216,22 @@
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(olist_pref_dialog_response_cb), olist_entry);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new(FALSE, 0);
+#endif
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
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 */
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+#else
vbox = gtk_vbox_new(FALSE, 0);
+#endif
gtk_box_pack_start(GTK_BOX(hbox), vbox,
TRUE, TRUE, 0);
gtk_widget_show(vbox);
@@ -1243,7 +1271,11 @@
g_object_unref(store);
/* button area */
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+#else
vbox = gtk_vbox_new(TRUE, 0);
+#endif
gtk_box_pack_start(GTK_BOX(hbox), vbox,
FALSE, FALSE, 4);
gtk_widget_show(vbox);
@@ -1307,7 +1339,11 @@
G_CALLBACK(olist_pref_right_button_clicked_cb), olist_entry);
/* right tree view */
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+#else
vbox = gtk_vbox_new(FALSE, 0);
+#endif
gtk_box_pack_start(GTK_BOX(hbox), vbox,
TRUE, TRUE, 0);
gtk_widget_show(vbox);
@@ -1366,7 +1402,11 @@
GtkWidget *hbox;
GtkWidget *label, *entry, *button;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
+#else
hbox = gtk_hbox_new(FALSE, 8);
+#endif
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new(custom->label);
@@ -1522,6 +1562,10 @@
static void
choose_key_button_clicked_cb(GtkWidget *widget, GtkEntry *key_entry)
{
+#if GTK_CHECK_VERSION(3, 0, 0)
+ GdkDevice *device = gtk_get_current_event_device();
+ GdkDevice *keyboard = gdk_device_get_associated_device(device);
+#endif
GtkWidget *dialog;
dialog =
gtk_message_dialog_new(GTK_WINDOW(gtk_widget_get_toplevel(widget)),
@@ -1536,9 +1580,14 @@
G_CALLBACK(grab_win_key_release_cb), key_entry);
gtk_widget_realize(dialog);
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gdk_device_grab(keyboard, gtk_widget_get_window(GTK_WIDGET(dialog)),
+ GDK_OWNERSHIP_NONE, TRUE,
+ GDK_KEY_PRESS_MASK, NULL, GDK_CURRENT_TIME);
+#else
gdk_keyboard_grab(gtk_widget_get_window(GTK_WIDGET(dialog)),
TRUE, GDK_CURRENT_TIME);
-
+#endif
gtk_dialog_run(GTK_DIALOG(dialog));
@@ -1766,7 +1815,11 @@
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(key_pref_dialog_response_cb), key_entry);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new(FALSE, 0);
+#endif
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
hbox, TRUE, TRUE, 0);
@@ -1800,7 +1853,11 @@
g_signal_connect (G_OBJECT(selection), "changed",
G_CALLBACK(key_pref_selection_changed), key_entry);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+#else
vbox = gtk_vbox_new(TRUE, 0);
+#endif
gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 4);
gtk_widget_show(vbox);
@@ -1830,7 +1887,11 @@
gtk_widget_set_sensitive(button, FALSE);
gtk_widget_show(button);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new(FALSE, 0);
+#endif
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);
@@ -1895,7 +1956,11 @@
GtkWidget *hbox;
GtkWidget *label, *entry, *button;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
+#else
hbox = gtk_hbox_new(FALSE, 8);
+#endif
label = gtk_label_new(custom->label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
@@ -2276,7 +2341,11 @@
DEFAULT_TABLE_WINDOW_WIDTH,
DEFAULT_TABLE_WINDOW_HEIGHT);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new(FALSE, 0);
+#endif
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
hbox, TRUE, TRUE, 0);
@@ -2299,7 +2368,11 @@
gtk_container_add(GTK_CONTAINER(scrwin), tree_view);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
+#else
vbox = gtk_vbutton_box_new();
+#endif
gtk_button_box_set_layout(GTK_BUTTON_BOX(vbox), GTK_BUTTONBOX_SPREAD);
gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 4);
gtk_widget_show(vbox);
@@ -2331,7 +2404,11 @@
GtkWidget *label;
GtkWidget *button;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
+#else
hbox = gtk_hbox_new(FALSE, 8);
+#endif
label = gtk_label_new(custom->label);
g_object_set_data_full(G_OBJECT(label),
=======================================
--- /gtk2/pref/gtk.c Wed Jan 11 00:17:24 2012
+++ /gtk2/pref/gtk.c Sun Jun 10 00:27:29 2012
@@ -377,7 +377,11 @@
GtkWidget *setting_button_box;
GtkWidget *button;
+#if GTK_CHECK_VERSION(3, 2, 0)
+ setting_button_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
+#else
setting_button_box = gtk_hbutton_box_new();
+#endif
gtk_button_box_set_layout(GTK_BUTTON_BOX(setting_button_box),
GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(setting_button_box), 8);
@@ -430,7 +434,11 @@
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_win),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
+#else
vbox = gtk_vbox_new(FALSE, 8);
+#endif
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_win),
vbox);
@@ -485,7 +493,11 @@
continue;
}
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
+#else
vbox = gtk_vbox_new(FALSE, 8);
+#endif
if (strcmp(*sgrp_sym, "main")) {
frame = gtk_frame_new(sgrp->label);
gtk_frame_set_label_align(GTK_FRAME(frame), 0.02, 0.5);
@@ -533,7 +545,11 @@
G_CALLBACK (key_press_cb), NULL);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ pref_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
+#else
pref_hbox = gtk_hbox_new(FALSE, 8);
+#endif
scrolled_win = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_win),
@@ -545,7 +561,11 @@
gtk_container_add(GTK_CONTAINER(scrolled_win), create_pref_treeview());
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
+#else
vbox = gtk_vbox_new(FALSE, 8);
+#endif
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
gtk_box_pack_start(GTK_BOX(vbox), pref_hbox, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox),
create_setting_button_box("dummy-group-name"), FALSE, TRUE, 0);
=======================================
--- /gtk2/switcher/gtk.c Wed Jan 11 00:17:24 2012
+++ /gtk2/switcher/gtk.c Sun Jun 10 00:27:29 2012
@@ -364,9 +364,15 @@
g_signal_connect(G_OBJECT(switcher_win), "focus-in-event",
G_CALLBACK(reload_im_list), NULL);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
+#else
vbox1 = gtk_vbox_new(FALSE, 0);
vbox3 = gtk_vbox_new(FALSE, 0);
hbox = gtk_hbox_new(FALSE, 8);
+#endif
gtk_container_set_border_width(GTK_CONTAINER(vbox3), 4);
scrolled_win = gtk_scrolled_window_new(NULL, NULL);
@@ -386,7 +392,11 @@
gtk_frame_set_label_align(GTK_FRAME(frame), 0.015, 0.5);
gtk_box_pack_start(GTK_BOX(vbox3), frame, FALSE, FALSE, 6);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
+#else
vbox2 = gtk_vbox_new(FALSE, 8);
+#endif
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 10);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
@@ -405,7 +415,11 @@
/* set radio0 (Change whole desktop) as default */
gtk_toggle_button_set_active((GtkToggleButton *)radio0, TRUE);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ setting_button_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
+#else
setting_button_box = gtk_hbutton_box_new();
+#endif
gtk_button_box_set_layout(GTK_BUTTON_BOX(setting_button_box),
GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(setting_button_box), 8);
=======================================
--- /gtk2/test/entry.c Wed Jan 11 00:17:24 2012
+++ /gtk2/test/entry.c Sun Jun 10 00:27:29 2012
@@ -87,7 +87,11 @@
g_signal_connect(G_OBJECT (window), "delete_event",
G_CALLBACK(exit), NULL);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#else
vbox = gtk_vbox_new (FALSE, 0);
+#endif
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_widget_show (vbox);
@@ -103,7 +107,11 @@
gtk_box_pack_start (GTK_BOX (vbox), entry, TRUE, TRUE, 0);
gtk_widget_show (entry);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new (FALSE, 0);
+#endif
gtk_container_add (GTK_CONTAINER (vbox), hbox);
gtk_widget_show (hbox);
=======================================
--- /gtk2/toolbar/common-gtk.c Sun Apr 29 23:18:50 2012
+++ /gtk2/toolbar/common-gtk.c Sun Jun 10 00:27:29 2012
@@ -256,7 +256,11 @@
sc_height = gdk_screen_get_height(gdk_screen_get_default());
sc_width = gdk_screen_get_width(gdk_screen_get_default());
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gtk_widget_get_preferred_size(GTK_WIDGET(menu), &requisition, NULL);
+#else
gtk_widget_size_request(GTK_WIDGET(menu), &requisition);
+#endif
menu_width = requisition.width;
menu_height = requisition.height;
@@ -428,7 +432,11 @@
if (selected != -1) {
menu_item = gtk_check_menu_item_new();
label = gtk_label_new(label_list->data);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new(FALSE, 0);
+#endif
#if GTK_CHECK_VERSION(2, 4, 0)
gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(menu_item),
TRUE);
@@ -1082,7 +1090,11 @@
init_icon();
/* create widgets */
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new(FALSE, 0);
+#endif
im_menu = gtk_menu_new();
prop_menu = gtk_menu_new();
=======================================
--- /gtk2/toolbar/standalone-gtk.c Sat Mar 17 02:19:06 2012
+++ /gtk2/toolbar/standalone-gtk.c Sun Jun 10 00:27:29 2012
@@ -72,16 +72,30 @@
GdkCursor *cursor;
GtkWidget *toolbar;
gint height, width;
+#if GTK_CHECK_VERSION(3, 0, 0)
+ GdkDevice *device = gtk_get_current_event_device();
+#endif
switch (event->type) {
case GDK_BUTTON_PRESS:
cursor = gdk_cursor_new(GDK_FLEUR);
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gdk_device_grab(device, gtk_widget_get_window(widget),
+ GDK_OWNERSHIP_NONE, FALSE,
+#else
gdk_pointer_grab(gtk_widget_get_window(widget), FALSE,
+#endif
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK,
+#if !GTK_CHECK_VERSION(3, 0, 0)
NULL,
+#endif
cursor, event->time);
+#if GTK_CHECK_VERSION(3, 0, 0)
+ g_object_unref(cursor);
+#else
gdk_cursor_unref(cursor);
+#endif
gtk_window_get_position(GTK_WINDOW(widget),
&window_drag_start_x,
@@ -177,7 +191,11 @@
if (!toolbar_dragging)
return FALSE;
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gdk_device_ungrab(gtk_get_current_event_device(), event->time);
+#else
gdk_pointer_ungrab(event->time);
+#endif
pointer_drag_start_x = -1;
pointer_drag_start_y = -1;
@@ -290,7 +308,11 @@
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
gtk_container_add(GTK_CONTAINER(window), frame);
+#if GTK_CHECK_VERSION(3, 2, 0)
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
hbox = gtk_hbox_new(FALSE, 0);
+#endif
gtk_container_add(GTK_CONTAINER(frame), hbox);
handle = gtk_drawing_area_new();
