Revision: 6761
Author: nogu.dev
Date: Sat Sep 11 17:41:08 2010
Log: * gtk/caret-state-indicator.c
- (caret_state_indicator_timeout): Use gtk_widget_get_window() for GTK+3.
* gtk/uim-cand-win-gtk.c
- (uim_cand_win_gtk_layout_sub_window): Ditto.
* helper/candwin-gtk.c
- (uim_cand_win_gtk_layout_sub_window): Ditto.
* helper/eggtrayicon.c
- (egg_tray_icon_expose, egg_tray_icon_send_manager_message,
egg_tray_icon_realize): Ditto.
* helper/pref-gtk-custom-widgets.c
- (choose_key_button_clicked_cb): Ditto.
* helper/toolbar-common-gtk.c
- (calc_menu_position): Ditto.
* helper/toolbar-standalone-gtk.c
- (button_press_event_cb, helper_win_set_position,
motion_notify_event_cb, handle_expose_event_cb): Ditto.
http://code.google.com/p/uim/source/detail?r=6761
Modified:
/trunk/gtk/caret-state-indicator.c
/trunk/gtk/uim-cand-win-gtk.c
/trunk/helper/candwin-gtk.c
/trunk/helper/eggtrayicon.c
/trunk/helper/pref-gtk-custom-widgets.c
/trunk/helper/toolbar-common-gtk.c
/trunk/helper/toolbar-standalone-gtk.c
=======================================
--- /trunk/gtk/caret-state-indicator.c Sun Apr 4 20:35:54 2010
+++ /trunk/gtk/caret-state-indicator.c Sat Sep 11 17:41:08 2010
@@ -82,9 +82,9 @@
static gint
caret_state_indicator_paint_window(GtkWidget *window)
{
- gtk_paint_flat_box(window->style, window->window, GTK_STATE_NORMAL,
- GTK_SHADOW_OUT, NULL, GTK_WIDGET(window), "tooltip",
- 0, 0, -1, -1);
+ gtk_paint_flat_box(window->style, gtk_widget_get_window(window),
+ GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, GTK_WIDGET(window),
+ "tooltip", 0, 0, -1, -1);
return FALSE;
}
=======================================
--- /trunk/gtk/uim-cand-win-gtk.c Thu Jul 15 19:00:23 2010
+++ /trunk/gtk/uim-cand-win-gtk.c Sat Sep 11 17:41:08 2010
@@ -926,13 +926,13 @@
gtk_tree_view_get_cell_area(GTK_TREE_VIEW(cwin->view), path, NULL,
&rect);
gtk_tree_path_free(path);
- gdk_window_get_geometry(GTK_WIDGET(cwin)->window,
+ gdk_window_get_geometry(gtk_widget_get_window(GTK_WIDGET(cwin)),
&x, &y, &w, &h, &d);
- gdk_window_get_origin(GTK_WIDGET(cwin)->window, &x, &y);
+ gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(cwin)), &x, &y);
sw = gdk_screen_get_width (gdk_screen_get_default ());
sh = gdk_screen_get_height (gdk_screen_get_default ());
- gdk_window_get_geometry(cwin->sub_window.window->window,
+ gdk_window_get_geometry(gtk_widget_get_window(cwin->sub_window.window),
&x2, &y2, &w2, &h2, &d2);
if (x + w + w2 > sw)
x = x - w2;
=======================================
--- /trunk/helper/candwin-gtk.c Thu Jul 15 19:00:23 2010
+++ /trunk/helper/candwin-gtk.c Sat Sep 11 17:41:08 2010
@@ -1041,13 +1041,13 @@
gtk_tree_view_get_cell_area(GTK_TREE_VIEW(cwin->view), path, NULL,
&rect);
gtk_tree_path_free(path);
- gdk_window_get_geometry(GTK_WIDGET(cwin)->window,
+ gdk_window_get_geometry(gtk_widget_get_window(GTK_WIDGET(cwin)),
&x, &y, &w, &h, &d);
- gdk_window_get_origin(GTK_WIDGET(cwin)->window, &x, &y);
+ gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(cwin)), &x, &y);
sw = gdk_screen_get_width (gdk_screen_get_default ());
sh = gdk_screen_get_height (gdk_screen_get_default ());
- gdk_window_get_geometry(cwin->sub_window.window->window,
+ gdk_window_get_geometry(gtk_widget_get_window(cwin->sub_window.window),
&x2, &y2, &w2, &h2, &d2);
if (x + w + w2 > sw)
x = x - w2;
=======================================
--- /trunk/helper/eggtrayicon.c Sat Sep 11 04:34:50 2010
+++ /trunk/helper/eggtrayicon.c Sat Sep 11 17:41:08 2010
@@ -254,7 +254,7 @@
if (icon->manager_visual_rgba)
{
/* Clear to transparent */
- cairo_t *cr = gdk_cairo_create (widget->window);
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
cairo_set_source_rgba (cr, 0, 0, 0, 0);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
gdk_cairo_region (cr, event->region);
@@ -265,7 +265,8 @@
#endif
{
/* Clear to parent-relative pixmap */
- gdk_window_clear_area (widget->window, event->area.x, event->area.y,
+ gdk_window_clear_area (gtk_widget_get_window(widget),
+ event->area.x, event->area.y,
event->area.width, event->area.height);
}
@@ -283,7 +284,7 @@
width = widget->allocation.width - 2 * border_width;
height = widget->allocation.height - 2 * border_width;
- gtk_paint_focus (widget->style, widget->window,
+ gtk_paint_focus (widget->style, gtk_widget_get_window(widget),
gtk_widget_get_state (widget),
&event->area, widget, "tray_icon",
x, y, width, height);
@@ -440,7 +441,8 @@
ev.window = window;
ev.message_type = icon->system_tray_opcode_atom;
ev.format = 32;
- ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
+ ev.data.l[0]
+ = gdk_x11_get_server_time (gtk_widget_get_window(GTK_WIDGET (icon)));
ev.data.l[1] = message;
ev.data.l[2] = data1;
ev.data.l[3] = data2;
@@ -599,12 +601,12 @@
{
/* Set a transparent background */
GdkColor transparent = { 0, 0, 0, 0 }; /* Only pixel=0 matters */
- gdk_window_set_background (widget->window, &transparent);
+ gdk_window_set_background (gtk_widget_get_window(widget),
&transparent);
}
else
{
/* Set a parent-relative background pixmap */
- gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+ gdk_window_set_back_pixmap (gtk_widget_get_window(widget), NULL,
TRUE);
}
if (icon->manager_window != None)
=======================================
--- /trunk/helper/pref-gtk-custom-widgets.c Sat Sep 11 01:16:11 2010
+++ /trunk/helper/pref-gtk-custom-widgets.c Sat Sep 11 17:41:08 2010
@@ -1522,7 +1522,7 @@
G_CALLBACK(grab_win_key_release_cb), key_entry);
gtk_widget_realize(dialog);
- gdk_keyboard_grab(GTK_WIDGET(dialog)->window,
+ gdk_keyboard_grab(gtk_widget_get_window(GTK_WIDGET(dialog)),
TRUE, GDK_CURRENT_TIME);
=======================================
--- /trunk/helper/toolbar-common-gtk.c Sat Sep 11 01:14:41 2010
+++ /trunk/helper/toolbar-common-gtk.c Sat Sep 11 17:41:08 2010
@@ -196,8 +196,8 @@
g_return_if_fail(x && y);
g_return_if_fail(GTK_IS_BUTTON(button));
- gdk_window_get_origin(button->window, x, y);
- gdk_drawable_get_size(button->window, NULL, &button_height);
+ gdk_window_get_origin(gtk_widget_get_window(button), x, y);
+ gdk_drawable_get_size(gtk_widget_get_window(button), NULL,
&button_height);
if (!gtk_widget_get_has_window(button))
*x += button->allocation.x;
=======================================
--- /trunk/helper/toolbar-standalone-gtk.c Sat Sep 11 01:15:19 2010
+++ /trunk/helper/toolbar-standalone-gtk.c Sat Sep 11 17:41:08 2010
@@ -74,7 +74,7 @@
switch (event->type) {
case GDK_BUTTON_PRESS:
cursor = gdk_cursor_new(GDK_FLEUR);
- gdk_pointer_grab(widget->window, FALSE,
+ gdk_pointer_grab(gtk_widget_get_window(widget), FALSE,
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK,
NULL,
@@ -115,7 +115,7 @@
sc_w = gdk_screen_width();
sc_h = gdk_screen_height();
- gdk_drawable_get_size(window->window, &w, &h);
+ gdk_drawable_get_size(gtk_widget_get_window(window), &w, &h);
if (wx < 0)
wx = 0;
@@ -139,7 +139,7 @@
sc_w = gdk_screen_width();
sc_h = gdk_screen_height();
- gdk_drawable_get_size(widget->window, &w, &h);
+ gdk_drawable_get_size(gtk_widget_get_window(widget), &w, &h);
wx = window_drag_start_x + ((gint)event->x_root -
pointer_drag_start_x);
wy = window_drag_start_y + ((gint)event->y_root -
pointer_drag_start_y);
@@ -172,7 +172,7 @@
{
GdkRectangle *rect = &event->area;
- gtk_paint_handle(widget->style, widget->window,
+ gtk_paint_handle(widget->style, gtk_widget_get_window(widget),
GTK_STATE_NORMAL, GTK_SHADOW_OUT,
rect, widget, "handlebox",
widget->allocation.x, widget->allocation.y,
