GtkXPaned: Convert expose-event signal to draw signal

[pspp] / lib / gtk-contrib / gtkxpaned.c

diff --git a/lib/gtk-contrib/gtkxpaned.c b/lib/gtk-contrib/gtkxpaned.c
index b465b7db5842719b54a1a04939ba032d8f79d4e6..f653f93c92346a7ddae2df6743f8045577d63948 100644 (file)
--- a/lib/gtk-contrib/gtkxpaned.c
+++ b/lib/gtk-contrib/gtkxpaned.c
@@ -36,6 +36,7 @@
 #include <gtk/gtk.h>
 #include <ui/gui/psppire-marshal.h>
 #include <gdk/gdkkeysyms.h>
+#include <gdk/gdkkeysyms-compat.h>
 
 enum WidgetProperties
   {
@@ -108,8 +109,8 @@ static void gtk_xpaned_map (GtkWidget * widget);
 
 static void gtk_xpaned_unmap (GtkWidget * widget);
 
-static gboolean gtk_xpaned_expose (GtkWidget * widget,
-                                   GdkEventExpose * event);
+static gboolean gtk_xpaned_draw (GtkWidget * widget,
+                                   cairo_t *ct);
 
 static gboolean gtk_xpaned_enter (GtkWidget * widget,
                                   GdkEventCrossing * event);
@@ -267,7 +268,7 @@ gtk_xpaned_class_init (GtkXPanedClass * class)
   widget_class->unrealize = gtk_xpaned_unrealize;
   widget_class->map = gtk_xpaned_map;
   widget_class->unmap = gtk_xpaned_unmap;
-  widget_class->expose_event = gtk_xpaned_expose;
+  widget_class->draw = gtk_xpaned_draw;
   widget_class->focus = gtk_xpaned_focus;
   widget_class->enter_notify_event = gtk_xpaned_enter;
   widget_class->leave_notify_event = gtk_xpaned_leave;
@@ -607,7 +608,6 @@ gtk_xpaned_init (GtkXPaned * xpaned)
   xpaned->handle_north = NULL;
   xpaned->handle_south = NULL;
   xpaned->handle_middle = NULL;
-  xpaned->xor_gc = NULL;
   xpaned->cursor_type_east = GDK_SB_V_DOUBLE_ARROW;
   xpaned->cursor_type_west = GDK_SB_V_DOUBLE_ARROW;
   xpaned->cursor_type_north = GDK_SB_H_DOUBLE_ARROW;
@@ -1291,12 +1291,6 @@ gtk_xpaned_unrealize (GtkWidget * widget)
 {
   GtkXPaned *xpaned = GTK_XPANED (widget);
 
-  if (xpaned->xor_gc)
-    {
-      g_object_unref (xpaned->xor_gc);
-      xpaned->xor_gc = NULL;
-    }
-
   if (xpaned->handle_east)
     {
       gdk_window_set_user_data (xpaned->handle_east, NULL);
@@ -1372,7 +1366,7 @@ gtk_xpaned_unmap (GtkWidget * widget)
 }
 
 static gboolean
-gtk_xpaned_expose (GtkWidget * widget, GdkEventExpose * event)
+gtk_xpaned_draw (GtkWidget * widget, cairo_t *cr)
 {
   GtkXPaned *xpaned = GTK_XPANED (widget);
   gint handle_size;
@@ -1419,10 +1413,9 @@ gtk_xpaned_expose (GtkWidget * widget, GdkEventExpose * event)
         xpaned->handle_pos_south.height;
 
       gtk_paint_handle (gtk_widget_get_style (widget),
-                        gtk_widget_get_window (widget),
+                        cr,
                         state,
                         GTK_SHADOW_NONE,
-                        &horizontalClipArea,
                         widget,
                         "paned",
                         xpaned->handle_pos_east.x - handle_size - 256 / 2,
@@ -1433,11 +1426,11 @@ gtk_xpaned_expose (GtkWidget * widget, GdkEventExpose * event)
                           xpaned->handle_pos_west.width + handle_size + xpaned->handle_pos_east.width,
                           handle_size - 2, */
                         GTK_ORIENTATION_HORIZONTAL);
+
       gtk_paint_handle (gtk_widget_get_style (widget),
-                        gtk_widget_get_window (widget),
+                        cr,
                         state,
                         GTK_SHADOW_NONE,
-                        &verticalClipArea,
                         widget,
                         "paned",
                         xpaned->handle_pos_north.x + 1,
@@ -1451,7 +1444,7 @@ gtk_xpaned_expose (GtkWidget * widget, GdkEventExpose * event)
     }
 
   /* Chain up to draw children */
-  GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+  GTK_WIDGET_CLASS (parent_class)->draw (widget, cr);
 
   return FALSE;
 }