Revision: 6957
Author: nogu.dev
Date: Mon Feb 14 04:37:08 2011
Log: * gtk/caret-state-indicator.c
- (caret_state_indicator_paint_window)
* Change function prototype in GTK+3.
* Change 2nd argument of gtk_render_frame() in GTK+3.
- (caret_state_indicator_new):
Connect to draw signal instead of expose_event.
http://code.google.com/p/uim/source/detail?r=6957
Modified:
/trunk/gtk/caret-state-indicator.c
=======================================
--- /trunk/gtk/caret-state-indicator.c Fri Feb 11 22:21:43 2011
+++ /trunk/gtk/caret-state-indicator.c Mon Feb 14 04:37:08 2011
@@ -80,12 +80,15 @@
}
static gint
+#if GTK_CHECK_VERSION(2, 90, 0)
+caret_state_indicator_paint_window(GtkWidget *window, cairo_t *cr)
+#else
caret_state_indicator_paint_window(GtkWidget *window)
+#endif
{
#if GTK_CHECK_VERSION(2, 90, 0)
- gtk_render_frame(gtk_widget_get_style_context(window),
- gtk_widget_get_window(window),
- 0, 0, -1, -1);
+ gtk_render_frame(gtk_widget_get_style_context(window), cr,
+ 0, 0, 1, 1);
#else
gtk_paint_flat_box(gtk_widget_get_style(window),
gtk_widget_get_window(window),
@@ -129,9 +132,15 @@
DEFAULT_WINDOW_HEIGHT);
gtk_widget_set_app_paintable(window, TRUE);
+#if GTK_CHECK_VERSION(2, 90, 0)
+ g_signal_connect(window, "draw",
+ G_CALLBACK(caret_state_indicator_paint_window),
+ NULL);
+#else
g_signal_connect(window, "expose_event",
G_CALLBACK(caret_state_indicator_paint_window),
NULL);
+#endif
g_signal_connect(window, "destroy",
G_CALLBACK(caret_state_indicator_destroy_cb),
NULL);
