Merge lp:~cimi/overlay-scrollbar/peek-gtk-widget-class into lp:overlay-scrollbar

[Andrea Cimitan]

By calling directly gtk widget's class functions I could skip the creation of the useless (for us) event_window.
Will probably need to hook up for more vfunc events and add empty functions (button_release is the only remaining function in gtkrange that is asking for the event window, though afaics it can't be called because there's no area where the mouse could click).
I am overriding size_allocate because the size_allocate function in gtk_range is playing with the event window without checking if it's NULL or not, so we will have some errors.

[lp:~cimi/overlay-scrollbar/peek-gtk-widget-class]

159. By Andrea Cimitan on 2011-03-16

use directly gtkwidget's class

[Javier Jardón (jjardon)]

Maybe the proper way for this is to modify gtkrange and/or gtkscrollbar, but this works for us for now.

review: Approve

[David Barth (dbarth)]

What will happen if g_type_class_peek_parent returns NULL?

review: Needs Fixing

[Javier Jardón (jjardon)]

@David:

From the documentation:

"Since derived classes hold a reference count on their parent classes as long as they are instantiated, the returned class will always exist"

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-03-15 15:43:22 +0000
+++ os/os-scrollbar.c	2011-03-16 15:07:27 +0000
@@ -76,6 +76,7 @@
 static void os_scrollbar_parent_set (GtkWidget *widget, GtkWidget *old_parent);
 static void os_scrollbar_realize (GtkWidget *widget);
 static void os_scrollbar_show (GtkWidget *widget);
+static void os_scrollbar_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
 static void os_scrollbar_unmap (GtkWidget *widget);
 static void os_scrollbar_unrealize (GtkWidget *widget);
 static void os_scrollbar_dispose (GObject *object);
@@ -1262,14 +1263,15 @@
   gobject_class = G_OBJECT_CLASS (class);
   widget_class = GTK_WIDGET_CLASS (class);
 
-  widget_class->expose_event = os_scrollbar_expose_event;
-  widget_class->hide         = os_scrollbar_hide;
-  widget_class->map          = os_scrollbar_map;
-  widget_class->realize      = os_scrollbar_realize;
-  widget_class->parent_set   = os_scrollbar_parent_set;
-  widget_class->show         = os_scrollbar_show;
-  widget_class->unmap        = os_scrollbar_unmap;
-  widget_class->unrealize    = os_scrollbar_unrealize;
+  widget_class->expose_event  = os_scrollbar_expose_event;
+  widget_class->hide          = os_scrollbar_hide;
+  widget_class->map           = os_scrollbar_map;
+  widget_class->realize       = os_scrollbar_realize;
+  widget_class->parent_set    = os_scrollbar_parent_set;
+  widget_class->show          = os_scrollbar_show;
+  widget_class->size_allocate = os_scrollbar_size_allocate;
+  widget_class->unmap         = os_scrollbar_unmap;
+  widget_class->unrealize     = os_scrollbar_unrealize;
 
   gobject_class->dispose  = os_scrollbar_dispose;
   gobject_class->finalize = os_scrollbar_finalize;
@@ -1340,7 +1342,7 @@
 static void
 os_scrollbar_hide (GtkWidget *widget)
 {
-  GTK_WIDGET_CLASS (os_scrollbar_parent_class)->hide (widget);
+  GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->hide (widget);
 }
 
 static void
@@ -1352,7 +1354,7 @@
   scrollbar = OS_SCROLLBAR (widget);
   priv = scrollbar->priv;
 
-  GTK_WIDGET_CLASS (os_scrollbar_parent_class)->map (widget);
+  GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->map (widget);
 
   priv->proximity = TRUE;
 
@@ -1427,13 +1429,20 @@
 static void
 os_scrollbar_realize (GtkWidget *widget)
 {
-  GTK_WIDGET_CLASS (os_scrollbar_parent_class)->realize (widget);
+  GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->realize (widget);
 }
 
 static void
 os_scrollbar_show (GtkWidget *widget)
 {
-  GTK_WIDGET_CLASS (os_scrollbar_parent_class)->show (widget);
+  GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->show (widget);
+}
+
+static void
+os_scrollbar_size_allocate (GtkWidget     *widget,
+                            GtkAllocation *allocation)
+{
+  widget->allocation = *allocation;
 }
 
 static void
@@ -1445,7 +1454,7 @@
   scrollbar = OS_SCROLLBAR (widget);
   priv = scrollbar->priv;
 
-  GTK_WIDGET_CLASS (os_scrollbar_parent_class)->unmap (widget);
+  GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->unmap (widget);
 
   priv->proximity = FALSE;
 
@@ -1461,7 +1470,7 @@
 static void
 os_scrollbar_unrealize (GtkWidget *widget)
 {
-  GTK_WIDGET_CLASS (os_scrollbar_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->unrealize (widget);
 }
 
 /* Public functions. */