Have tree view process exposes after adjustments have been updated

[~andy/gtk] / gtk / gtktextchild.c

diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c
index 05a1a3c7e32dd539b3bee70b75b944f51c018935..163954f6e490836a38b524cbdc6127fb345d84ca 100644 (file)
--- a/gtk/gtktextchild.c
+++ b/gtk/gtktextchild.c
@@ -48,28 +48,30 @@
  */
 
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-#include <config.h>
+#include "config.h"
 #include "gtktextchild.h"
 #include "gtktextbtree.h"
 #include "gtktextlayout.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
-#define CHECK_IN_BUFFER(anchor)                                                            \
-  G_STMT_START {                                                                           \
-    if ((anchor)->segment == NULL)                                                         \
-      {                                                                                    \
-        g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); \
-      }                                                                                    \
+#define CHECK_IN_BUFFER(anchor)                                         \
+  G_STMT_START {                                                        \
+    if ((anchor)->segment == NULL)                                      \
+      {                                                                 \
+        g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet",\
+                   G_STRFUNC);                                          \
+      }                                                                 \
   } G_STMT_END
 
-#define CHECK_IN_BUFFER_RETURN(anchor, val)                                                \
-  G_STMT_START {                                                                           \
-    if ((anchor)->segment == NULL)                                                         \
-      {                                                                                    \
-        g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); \
-        return (val);                                                                      \
-      }                                                                                    \
+#define CHECK_IN_BUFFER_RETURN(anchor, val)                             \
+  G_STMT_START {                                                        \
+    if ((anchor)->segment == NULL)                                      \
+      {                                                                 \
+        g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet",\
+                   G_STRFUNC);                                          \
+        return (val);                                                   \
+      }                                                                 \
   } G_STMT_END
 
 static GtkTextLineSegment *
@@ -108,7 +110,7 @@ pixbuf_segment_check_func (GtkTextLineSegment *seg,
 }
 
 
-GtkTextLineSegmentClass gtk_text_pixbuf_type = {
+const GtkTextLineSegmentClass gtk_text_pixbuf_type = {
   "pixbuf",                          /* name */
   FALSE,                                            /* leftGravity */
   NULL,                                          /* splitFunc */
@@ -206,7 +208,7 @@ child_segment_check_func (GtkTextLineSegment *seg,
     g_error ("child segment has char count of %d", seg->char_count);
 }
 
-GtkTextLineSegmentClass gtk_text_child_type = {
+const GtkTextLineSegmentClass gtk_text_child_type = {
   "child-widget",                                        /* name */
   FALSE,                                                 /* leftGravity */
   NULL,                                                  /* splitFunc */
@@ -304,38 +306,9 @@ _gtk_anchored_child_set_layout (GtkWidget     *child,
                      layout);  
 }
      
-static void gtk_text_child_anchor_init       (GtkTextChildAnchor      *child_anchor);
-static void gtk_text_child_anchor_class_init (GtkTextChildAnchorClass *klass);
-static void gtk_text_child_anchor_finalize   (GObject                 *obj);
+static void gtk_text_child_anchor_finalize (GObject *obj);
 
-static gpointer parent_class = NULL;
-
-GType
-gtk_text_child_anchor_get_type (void)
-{
-  static GType object_type = 0;
-
-  if (!object_type)
-    {
-      static const GTypeInfo object_info =
-      {
-        sizeof (GtkTextChildAnchorClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) gtk_text_child_anchor_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data */
-        sizeof (GtkTextChildAnchor),
-        0,              /* n_preallocs */
-        (GInstanceInitFunc) gtk_text_child_anchor_init,
-      };
-
-      object_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextChildAnchor"),
-                                            &object_info, 0);
-    }
-
-  return object_type;
-}
+G_DEFINE_TYPE (GtkTextChildAnchor, gtk_text_child_anchor, G_TYPE_OBJECT)
 
 static void
 gtk_text_child_anchor_init (GtkTextChildAnchor *child_anchor)
@@ -348,8 +321,6 @@ gtk_text_child_anchor_class_init (GtkTextChildAnchorClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  parent_class = g_type_class_peek_parent (klass);
-
   object_class->finalize = gtk_text_child_anchor_finalize;
 }
 
@@ -404,7 +375,7 @@ gtk_text_child_anchor_finalize (GObject *obj)
 
   anchor->segment = NULL;
 
-  G_OBJECT_CLASS (parent_class)->finalize (obj);
+  G_OBJECT_CLASS (gtk_text_child_anchor_parent_class)->finalize (obj);
 }
 
 /**