weight value should be an int

Sat Sep 22 16:50:34 2001  Kristian Rietveld  <kristian@planet.nl>

        * gtk/gtktexttag.c (gtk_text_tag_set_property): (case PROP_WEIGHT):
        weight value should be an int

Sat Sep 22 15:17:41 2001  Kristian Rietveld  <kristian@planet.nl>

        * gtk/gtkmenu.c (gtk_menu_select_item): move most code
        to gtk_menu_scroll_item_visible(). Only call
        gtk_menu_scroll_item_visible() if the menu widget has been
        realized. Fixes bug #55310.

diff --git a/ChangeLog b/ChangeLog
index 983e388f2f240cecd38e6743e388eed14e565077..f4e4329726b3cdec3149420371e388bc48cb8414 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sat Sep 22 16:50:34 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): (case PROP_WEIGHT):
+       weight value should be an int
+
+Sat Sep 22 15:17:41 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenu.c (gtk_menu_select_item): move most code
+       to gtk_menu_scroll_item_visible(). Only call
+       gtk_menu_scroll_item_visible() if the menu widget has been
+       realized. Fixes bug #55310.
+
 2001-09-21  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): don't pass

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 983e388f2f240cecd38e6743e388eed14e565077..f4e4329726b3cdec3149420371e388bc48cb8414 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+Sat Sep 22 16:50:34 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): (case PROP_WEIGHT):
+       weight value should be an int
+
+Sat Sep 22 15:17:41 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenu.c (gtk_menu_select_item): move most code
+       to gtk_menu_scroll_item_visible(). Only call
+       gtk_menu_scroll_item_visible() if the menu widget has been
+       realized. Fixes bug #55310.
+
 2001-09-21  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): don't pass

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 983e388f2f240cecd38e6743e388eed14e565077..f4e4329726b3cdec3149420371e388bc48cb8414 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Sat Sep 22 16:50:34 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): (case PROP_WEIGHT):
+       weight value should be an int
+
+Sat Sep 22 15:17:41 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenu.c (gtk_menu_select_item): move most code
+       to gtk_menu_scroll_item_visible(). Only call
+       gtk_menu_scroll_item_visible() if the menu widget has been
+       realized. Fixes bug #55310.
+
 2001-09-21  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): don't pass

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 983e388f2f240cecd38e6743e388eed14e565077..f4e4329726b3cdec3149420371e388bc48cb8414 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+Sat Sep 22 16:50:34 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): (case PROP_WEIGHT):
+       weight value should be an int
+
+Sat Sep 22 15:17:41 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenu.c (gtk_menu_select_item): move most code
+       to gtk_menu_scroll_item_visible(). Only call
+       gtk_menu_scroll_item_visible() if the menu widget has been
+       realized. Fixes bug #55310.
+
 2001-09-21  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): don't pass

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 983e388f2f240cecd38e6743e388eed14e565077..f4e4329726b3cdec3149420371e388bc48cb8414 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+Sat Sep 22 16:50:34 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): (case PROP_WEIGHT):
+       weight value should be an int
+
+Sat Sep 22 15:17:41 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenu.c (gtk_menu_select_item): move most code
+       to gtk_menu_scroll_item_visible(). Only call
+       gtk_menu_scroll_item_visible() if the menu widget has been
+       realized. Fixes bug #55310.
+
 2001-09-21  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): don't pass

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 983e388f2f240cecd38e6743e388eed14e565077..f4e4329726b3cdec3149420371e388bc48cb8414 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Sat Sep 22 16:50:34 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): (case PROP_WEIGHT):
+       weight value should be an int
+
+Sat Sep 22 15:17:41 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenu.c (gtk_menu_select_item): move most code
+       to gtk_menu_scroll_item_visible(). Only call
+       gtk_menu_scroll_item_visible() if the menu widget has been
+       realized. Fixes bug #55310.
+
 2001-09-21  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): don't pass

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 983e388f2f240cecd38e6743e388eed14e565077..f4e4329726b3cdec3149420371e388bc48cb8414 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Sat Sep 22 16:50:34 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): (case PROP_WEIGHT):
+       weight value should be an int
+
+Sat Sep 22 15:17:41 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenu.c (gtk_menu_select_item): move most code
+       to gtk_menu_scroll_item_visible(). Only call
+       gtk_menu_scroll_item_visible() if the menu widget has been
+       realized. Fixes bug #55310.
+
 2001-09-21  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): don't pass

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index fb9dbaac3d6f19a3561e89847d58c81700b6b708..d1e910bd8b7ea8112d0cfd02ecdaa74461aa762f 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -97,6 +97,8 @@ static void     gtk_menu_scroll_to         (GtkMenu          *menu,
                                            gint              offset);
 static void     gtk_menu_stop_scrolling    (GtkMenu          *menu);
 static gboolean gtk_menu_scroll_timeout    (gpointer          data);
+static void     gtk_menu_scroll_item_visible (GtkMenuShell    *menu_shell,
+                                             GtkWidget       *menu_item);
 static void     gtk_menu_select_item       (GtkMenuShell     *menu_shell,
                                            GtkWidget        *menu_item);
 static void     gtk_menu_real_insert       (GtkMenuShell     *menu_shell,
@@ -1124,6 +1126,9 @@ gtk_menu_realize (GtkWidget *widget)
   gtk_style_set_background (widget->style, menu->view_window, GTK_STATE_NORMAL);
   gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
 
+  gtk_menu_scroll_item_visible (GTK_MENU_SHELL (widget),
+                               GTK_MENU_SHELL (widget)->active_menu_item);
+
   gtk_menu_paint (widget);
   
   gdk_window_show (menu->bin_window);
@@ -2204,7 +2209,6 @@ gtk_menu_scroll_to (GtkMenu *menu,
        y += MENU_SCROLL_ARROW_HEIGHT;
     }
   
-  
   gdk_window_move_resize (menu->view_window,
                          x,
                          y,
@@ -2215,8 +2219,8 @@ gtk_menu_scroll_to (GtkMenu *menu,
 }
 
 static void
-gtk_menu_select_item (GtkMenuShell  *menu_shell,
-                     GtkWidget     *menu_item)
+gtk_menu_scroll_item_visible (GtkMenuShell    *menu_shell,
+                             GtkWidget       *menu_item)
 {
   GtkMenu *menu;
   GtkWidget *child;
@@ -2228,8 +2232,6 @@ gtk_menu_select_item (GtkMenuShell  *menu_shell,
   gint arrow_height;
   gboolean last_child = 0;
   
-  g_return_if_fail (GTK_IS_MENU (menu_shell));
-
   menu = GTK_MENU (menu_shell);
 
   /* We need to check if the selected item fully visible.
@@ -2303,6 +2305,16 @@ gtk_menu_select_item (GtkMenuShell  *menu_shell,
        }    
       
     }
+}
+
+static void
+gtk_menu_select_item (GtkMenuShell  *menu_shell,
+                     GtkWidget     *menu_item)
+{
+  GtkMenu *menu = GTK_MENU (menu_shell);
+
+  if (GTK_WIDGET_REALIZED (GTK_WIDGET (menu)))
+    gtk_menu_scroll_item_visible (menu_shell, menu_item);
 
   GTK_MENU_SHELL_CLASS (parent_class)->select_item (menu_shell, menu_item);
 }

diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 658e2ab82990b7c0a581daae6b05114c21d62607..fbd90eb4cac3f25cd7b8b7fefe7216458cebd380 100644 (file)
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -986,7 +986,7 @@ gtk_text_tag_set_property (GObject      *object,
            break;
          case PROP_WEIGHT:
            pango_font_description_set_weight (text_tag->values->font,
-                                              g_value_get_enum (value));
+                                              g_value_get_int (value));
            break;
          case PROP_STRETCH:
            pango_font_description_set_stretch (text_tag->values->font,