Revision: 6943
Author: nogu.dev
Date: Sat Feb 12 04:56:34 2011
Log: * helper/candwin-gtk.c
- (uim_cand_win_gtk_layout_sub_window): Cosmetic changes.
http://code.google.com/p/uim/source/detail?r=6943
Modified:
/trunk/helper/candwin-gtk.c
=======================================
--- /trunk/helper/candwin-gtk.c Fri Feb 11 22:21:43 2011
+++ /trunk/helper/candwin-gtk.c Sat Feb 12 04:56:34 2011
@@ -1028,11 +1028,10 @@
static void
uim_cand_win_gtk_layout_sub_window(UIMCandidateWindow *cwin)
{
- gint x, y, w, h, sw, sh, x2, y2, w2, h2
#if GTK_CHECK_VERSION(2, 90, 0)
- ;
+ gint x, y, w, h, sw, sh, x2, y2, w2, h2;
#else
- , d, d2;
+ gint x, y, w, h, sw, sh, x2, y2, w2, h2, d, d2;
#endif
GdkRectangle rect;
GtkTreePath *path;
@@ -1045,23 +1044,23 @@
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_get_window(GTK_WIDGET(cwin)),
- &x, &y, &w, &h
#if GTK_CHECK_VERSION(2, 90, 0)
- );
+ gdk_window_get_geometry(gtk_widget_get_window(GTK_WIDGET(cwin)),
+ &x, &y, &w, &h);
#else
- , &d);
+ gdk_window_get_geometry(gtk_widget_get_window(GTK_WIDGET(cwin)),
+ &x, &y, &w, &h, &d);
#endif
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(gtk_widget_get_window(cwin->sub_window.window),
- &x2, &y2, &w2, &h2
#if GTK_CHECK_VERSION(2, 90, 0)
- );
+ gdk_window_get_geometry(gtk_widget_get_window(cwin->sub_window.window),
+ &x2, &y2, &w2, &h2);
#else
- , &d2);
+ gdk_window_get_geometry(gtk_widget_get_window(cwin->sub_window.window),
+ &x2, &y2, &w2, &h2, &d2);
#endif
if (x + w + w2 > sw)
x = x - w2;
