raise event window afte children, in order for the input pnly window to

Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>

        * gtk/gtkbutton.c (gtk_button_map): raise event window afte
        children, in order for the input pnly window to stay *above*
        children.

Wed Nov 21 22:44:27 2001  Tim Janik  <timj@gtk.org>

        * tests/testtreeview.c: make hackery worse ;) by checking fundamental
        type walks againts G_TYPE_FUNDAMENTAL_MAX.

        * tests/prop-editor.c: disable type hackery.

diff --git a/ChangeLog b/ChangeLog
index 06db28cf4140b9f3c06fa1a6dbc15c60684366bd..77041cbcb434b035e49a436b3cebd062c0a66432 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkbutton.c (gtk_button_map): raise event window afte
+       children, in order for the input pnly window to stay *above*
+       children.
+
+Wed Nov 21 22:44:27 2001  Tim Janik  <timj@gtk.org>
+
+       * tests/testtreeview.c: make hackery worse ;) by checking fundamental
+       type walks againts G_TYPE_FUNDAMENTAL_MAX.
+       
+       * tests/prop-editor.c: disable type hackery.
+
 Wed Nov 21 17:41:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_get): Fix problem with

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 06db28cf4140b9f3c06fa1a6dbc15c60684366bd..77041cbcb434b035e49a436b3cebd062c0a66432 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkbutton.c (gtk_button_map): raise event window afte
+       children, in order for the input pnly window to stay *above*
+       children.
+
+Wed Nov 21 22:44:27 2001  Tim Janik  <timj@gtk.org>
+
+       * tests/testtreeview.c: make hackery worse ;) by checking fundamental
+       type walks againts G_TYPE_FUNDAMENTAL_MAX.
+       
+       * tests/prop-editor.c: disable type hackery.
+
 Wed Nov 21 17:41:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_get): Fix problem with

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 06db28cf4140b9f3c06fa1a6dbc15c60684366bd..77041cbcb434b035e49a436b3cebd062c0a66432 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkbutton.c (gtk_button_map): raise event window afte
+       children, in order for the input pnly window to stay *above*
+       children.
+
+Wed Nov 21 22:44:27 2001  Tim Janik  <timj@gtk.org>
+
+       * tests/testtreeview.c: make hackery worse ;) by checking fundamental
+       type walks againts G_TYPE_FUNDAMENTAL_MAX.
+       
+       * tests/prop-editor.c: disable type hackery.
+
 Wed Nov 21 17:41:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_get): Fix problem with

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 06db28cf4140b9f3c06fa1a6dbc15c60684366bd..77041cbcb434b035e49a436b3cebd062c0a66432 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkbutton.c (gtk_button_map): raise event window afte
+       children, in order for the input pnly window to stay *above*
+       children.
+
+Wed Nov 21 22:44:27 2001  Tim Janik  <timj@gtk.org>
+
+       * tests/testtreeview.c: make hackery worse ;) by checking fundamental
+       type walks againts G_TYPE_FUNDAMENTAL_MAX.
+       
+       * tests/prop-editor.c: disable type hackery.
+
 Wed Nov 21 17:41:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_get): Fix problem with

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 06db28cf4140b9f3c06fa1a6dbc15c60684366bd..77041cbcb434b035e49a436b3cebd062c0a66432 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkbutton.c (gtk_button_map): raise event window afte
+       children, in order for the input pnly window to stay *above*
+       children.
+
+Wed Nov 21 22:44:27 2001  Tim Janik  <timj@gtk.org>
+
+       * tests/testtreeview.c: make hackery worse ;) by checking fundamental
+       type walks againts G_TYPE_FUNDAMENTAL_MAX.
+       
+       * tests/prop-editor.c: disable type hackery.
+
 Wed Nov 21 17:41:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_get): Fix problem with

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 06db28cf4140b9f3c06fa1a6dbc15c60684366bd..77041cbcb434b035e49a436b3cebd062c0a66432 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkbutton.c (gtk_button_map): raise event window afte
+       children, in order for the input pnly window to stay *above*
+       children.
+
+Wed Nov 21 22:44:27 2001  Tim Janik  <timj@gtk.org>
+
+       * tests/testtreeview.c: make hackery worse ;) by checking fundamental
+       type walks againts G_TYPE_FUNDAMENTAL_MAX.
+       
+       * tests/prop-editor.c: disable type hackery.
+
 Wed Nov 21 17:41:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_get): Fix problem with

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 06db28cf4140b9f3c06fa1a6dbc15c60684366bd..77041cbcb434b035e49a436b3cebd062c0a66432 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkbutton.c (gtk_button_map): raise event window afte
+       children, in order for the input pnly window to stay *above*
+       children.
+
+Wed Nov 21 22:44:27 2001  Tim Janik  <timj@gtk.org>
+
+       * tests/testtreeview.c: make hackery worse ;) by checking fundamental
+       type walks againts G_TYPE_FUNDAMENTAL_MAX.
+       
+       * tests/prop-editor.c: disable type hackery.
+
 Wed Nov 21 17:41:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_get): Fix problem with

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 81d92113e921da96a095ab78ee42d5655ee38611..87af04de7d2b5bb2a17a8bab0c56ab62af38584b 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -632,10 +632,10 @@ gtk_button_map (GtkWidget *widget)
   
   g_return_if_fail (GTK_IS_BUTTON (widget));
 
+  GTK_WIDGET_CLASS (parent_class)->map (widget);
+
   if (button->event_window)
     gdk_window_show (button->event_window);
-
-  GTK_WIDGET_CLASS (parent_class)->map (widget);
 }
 
 static void

diff --git a/tests/prop-editor.c b/tests/prop-editor.c
index 6967b9328e07d108ac52a2883d4bb983bfb50580..3617335e92bfe9890c9131f92bcc2c541ddd7927 100644 (file)
--- a/tests/prop-editor.c
+++ b/tests/prop-editor.c
@@ -457,6 +457,7 @@ property_widget (GObject *object, GParamSpec *spec, gboolean can_modify)
   GtkAdjustment *adj;
   gchar *msg;
   
+#if 0
   switch (G_PARAM_SPEC_TYPE (spec))
     {
     case G_TYPE_PARAM_INT:
@@ -641,6 +642,7 @@ property_widget (GObject *object, GParamSpec *spec, gboolean can_modify)
       g_free (msg);
       gtk_misc_set_alignment (GTK_MISC (prop_edit), 0.0, 0.5);
     }
+#endif
   
   return prop_edit;
 }

diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index 5509537e4618187b1132fe8a74ced632bbaa1d89..10b5377e4805098aea2f2e1016cb03397eea9622 100644 (file)
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -559,7 +559,7 @@ create_tree_model (void)
                              t[6], t[7], t[8]);
 
   i = 0;
-  while (i < G_TYPE_RESERVED_LAST_FUNDAMENTAL)
+  while (i < G_TYPE_FUNDAMENTAL_MAX)
     {
       typesystem_recurse (i, NULL, store);
       
@@ -987,13 +987,17 @@ gtk_real_model_types_iter_next (GtkTreeModel  *tree_model,
   type = GPOINTER_TO_INT (iter->user_data);
 
   parent = g_type_parent (type);
-
+  
   if (parent == G_TYPE_INVALID)
     {
-      /* fundamental type, add 1 */
-      if ((type + 1) < G_TYPE_RESERVED_LAST_FUNDAMENTAL)
-        {
-          iter->user_data = GINT_TO_POINTER (type + 1);
+      /* find next _valid_ fundamental type */
+      do
+       type++;
+      while (!g_type_name (type) && type <= G_TYPE_FUNDAMENTAL_MAX);
+      if (type <= G_TYPE_FUNDAMENTAL_MAX)
+       {
+         /* found one */
+          iter->user_data = GINT_TO_POINTER (type);
           return TRUE;
         }
       else
@@ -1079,7 +1083,7 @@ gtk_real_model_types_iter_n_children (GtkTreeModel *tree_model,
 {
   if (iter == NULL)
     {
-      return G_TYPE_RESERVED_LAST_FUNDAMENTAL - 1;
+      return G_TYPE_FUNDAMENTAL_MAX;
     }
   else
     {
@@ -1106,7 +1110,7 @@ gtk_real_model_types_iter_nth_child (GtkTreeModel *tree_model,
   if (parent == NULL)
     {
       /* fundamental type */
-      if (n < G_TYPE_RESERVED_LAST_FUNDAMENTAL)
+      if (n < G_TYPE_FUNDAMENTAL_MAX)
         {
           iter->user_data = GINT_TO_POINTER (n);
           return TRUE;
@@ -1154,7 +1158,7 @@ gtk_real_model_types_iter_parent (GtkTreeModel *tree_model,
   
   if (parent == G_TYPE_INVALID)
     {
-      if (type >= G_TYPE_RESERVED_LAST_FUNDAMENTAL)
+      if (type > G_TYPE_FUNDAMENTAL_MAX)
         g_warning ("no parent for %d %s\n", type, g_type_name (type));
       return FALSE;
     }