Fix problem with menus without accel groups, such as the menus for option

Wed Jan  9 11:13:12 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmenuitem.c (_gtk_menu_item_refresh_accel_path):
        Fix problem with menus without accel groups, such as the
        menus for option menus.

        * gtk/gtkpaned.c (gtk_paned_expose): Only conditionalize
        drawing of handle on whether both children are visible,
        not the drawing of the other child!. (#68325, Diego Gonzalez)

ChangeLog

+Wed Jan  9 11:13:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenuitem.c (_gtk_menu_item_refresh_accel_path): 
+	Fix problem with menus without accel groups, such as the
+	menus for option menus.
+
+	* gtk/gtkpaned.c (gtk_paned_expose): Only conditionalize
+	drawing of handle on whether both children are visible,
+	not the drawing of the other child!. (#68325, Diego Gonzalez)
+
 Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for

ChangeLog.pre-2-0

+Wed Jan  9 11:13:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenuitem.c (_gtk_menu_item_refresh_accel_path): 
+	Fix problem with menus without accel groups, such as the
+	menus for option menus.
+
+	* gtk/gtkpaned.c (gtk_paned_expose): Only conditionalize
+	drawing of handle on whether both children are visible,
+	not the drawing of the other child!. (#68325, Diego Gonzalez)
+
 Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for

ChangeLog.pre-2-10

+Wed Jan  9 11:13:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenuitem.c (_gtk_menu_item_refresh_accel_path): 
+	Fix problem with menus without accel groups, such as the
+	menus for option menus.
+
+	* gtk/gtkpaned.c (gtk_paned_expose): Only conditionalize
+	drawing of handle on whether both children are visible,
+	not the drawing of the other child!. (#68325, Diego Gonzalez)
+
 Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for

ChangeLog.pre-2-2

+Wed Jan  9 11:13:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenuitem.c (_gtk_menu_item_refresh_accel_path): 
+	Fix problem with menus without accel groups, such as the
+	menus for option menus.
+
+	* gtk/gtkpaned.c (gtk_paned_expose): Only conditionalize
+	drawing of handle on whether both children are visible,
+	not the drawing of the other child!. (#68325, Diego Gonzalez)
+
 Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for

ChangeLog.pre-2-4

+Wed Jan  9 11:13:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenuitem.c (_gtk_menu_item_refresh_accel_path): 
+	Fix problem with menus without accel groups, such as the
+	menus for option menus.
+
+	* gtk/gtkpaned.c (gtk_paned_expose): Only conditionalize
+	drawing of handle on whether both children are visible,
+	not the drawing of the other child!. (#68325, Diego Gonzalez)
+
 Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for

ChangeLog.pre-2-6

+Wed Jan  9 11:13:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenuitem.c (_gtk_menu_item_refresh_accel_path): 
+	Fix problem with menus without accel groups, such as the
+	menus for option menus.
+
+	* gtk/gtkpaned.c (gtk_paned_expose): Only conditionalize
+	drawing of handle on whether both children are visible,
+	not the drawing of the other child!. (#68325, Diego Gonzalez)
+
 Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for

ChangeLog.pre-2-8

+Wed Jan  9 11:13:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenuitem.c (_gtk_menu_item_refresh_accel_path): 
+	Fix problem with menus without accel groups, such as the
+	menus for option menus.
+
+	* gtk/gtkpaned.c (gtk_paned_expose): Only conditionalize
+	drawing of handle on whether both children are visible,
+	not the drawing of the other child!. (#68325, Diego Gonzalez)
+
 Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for

gtk/gtkmenuitem.c

@@ -1043,10 +1043,16 @@ _gtk_menu_item_refresh_accel_path (GtkMenuItem   *menu_item,
   GtkWidget *widget;
 
   g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
-  g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+  g_return_if_fail (!accel_group || GTK_IS_ACCEL_GROUP (accel_group));
 
   widget = GTK_WIDGET (menu_item);
 
+  if (!accel_group)
+    {
+      _gtk_widget_set_accel_path (widget, NULL, NULL);
+      return;
+    }
+
   path = _gtk_widget_get_accel_path (widget);
   if (!path)					/* no active accel_path yet */
     {

gtk/gtkpaned.c

@@ -338,10 +338,10 @@ gtk_paned_expose (GtkWidget      *widget,
 	}
 
       gdk_region_destroy (region);
-      
-      /* Chain up to draw children */
-      GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
     }
+  
+  /* Chain up to draw children */
+  GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
 
   return FALSE;
 }