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)

diff --git a/ChangeLog b/ChangeLog
index ac680b51b3d1ba5c632009062d06795c4933480d..40b103d38172395cf5957f7782e6313d362474db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ac680b51b3d1ba5c632009062d06795c4933480d..40b103d38172395cf5957f7782e6313d362474db 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+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

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ac680b51b3d1ba5c632009062d06795c4933480d..40b103d38172395cf5957f7782e6313d362474db 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+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

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ac680b51b3d1ba5c632009062d06795c4933480d..40b103d38172395cf5957f7782e6313d362474db 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+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

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ac680b51b3d1ba5c632009062d06795c4933480d..40b103d38172395cf5957f7782e6313d362474db 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+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

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ac680b51b3d1ba5c632009062d06795c4933480d..40b103d38172395cf5957f7782e6313d362474db 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+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

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ac680b51b3d1ba5c632009062d06795c4933480d..40b103d38172395cf5957f7782e6313d362474db 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+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

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index c1636a16101497ade248d244ce9716caec8e25e7..a7d576470632cfee4e31a150396065dc2dfe0e24 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/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 */
     {

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index a4b3bc7b9c2674d91fbea8f8c34a06f12248b39e..508382dfb55531c19cde374c2340193c61c007a5 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/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;
 }