Commit 278582d6 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Discard configure events from SubstructureNotify. (#81760, Rich Burridge)

Tue May 14 11:21:19 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkevents-x11.c (gdk_event_translate):
        Discard configure events from SubstructureNotify.
        (#81760, Rich Burridge)

        * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
        strcmp().

        * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp
	width of child allocation to >= 1. (Fixes warnings from
        #77639, Martin Schulze)
parent 3fd4c9f1
Tue May 14 11:21:19 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate):
Discard configure events from SubstructureNotify.
(#81760, Rich Burridge)
* gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
strcmp().
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp
width of child allocation to >= 1. (Fixes warnings from
#77639, Martin Schulze)
2002-05-14 Matthias Clasen <maclas@gmx.de> 2002-05-14 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcontainer.c (gtk_container_class_install_child_property): * gtk/gtkcontainer.c (gtk_container_class_install_child_property):
......
Tue May 14 11:21:19 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate):
Discard configure events from SubstructureNotify.
(#81760, Rich Burridge)
* gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
strcmp().
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp
width of child allocation to >= 1. (Fixes warnings from
#77639, Martin Schulze)
2002-05-14 Matthias Clasen <maclas@gmx.de> 2002-05-14 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcontainer.c (gtk_container_class_install_child_property): * gtk/gtkcontainer.c (gtk_container_class_install_child_property):
......
Tue May 14 11:21:19 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate):
Discard configure events from SubstructureNotify.
(#81760, Rich Burridge)
* gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
strcmp().
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp
width of child allocation to >= 1. (Fixes warnings from
#77639, Martin Schulze)
2002-05-14 Matthias Clasen <maclas@gmx.de> 2002-05-14 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcontainer.c (gtk_container_class_install_child_property): * gtk/gtkcontainer.c (gtk_container_class_install_child_property):
......
Tue May 14 11:21:19 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate):
Discard configure events from SubstructureNotify.
(#81760, Rich Burridge)
* gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
strcmp().
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp
width of child allocation to >= 1. (Fixes warnings from
#77639, Martin Schulze)
2002-05-14 Matthias Clasen <maclas@gmx.de> 2002-05-14 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcontainer.c (gtk_container_class_install_child_property): * gtk/gtkcontainer.c (gtk_container_class_install_child_property):
......
Tue May 14 11:21:19 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate):
Discard configure events from SubstructureNotify.
(#81760, Rich Burridge)
* gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
strcmp().
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp
width of child allocation to >= 1. (Fixes warnings from
#77639, Martin Schulze)
2002-05-14 Matthias Clasen <maclas@gmx.de> 2002-05-14 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcontainer.c (gtk_container_class_install_child_property): * gtk/gtkcontainer.c (gtk_container_class_install_child_property):
......
Tue May 14 11:21:19 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate):
Discard configure events from SubstructureNotify.
(#81760, Rich Burridge)
* gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
strcmp().
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp
width of child allocation to >= 1. (Fixes warnings from
#77639, Martin Schulze)
2002-05-14 Matthias Clasen <maclas@gmx.de> 2002-05-14 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcontainer.c (gtk_container_class_install_child_property): * gtk/gtkcontainer.c (gtk_container_class_install_child_property):
......
...@@ -1382,13 +1382,17 @@ gdk_event_translate (GdkDisplay *display, ...@@ -1382,13 +1382,17 @@ gdk_event_translate (GdkDisplay *display,
? " (discarding)" ? " (discarding)"
: GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD : GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD
? " (discarding child)" ? " (discarding child)"
: xevent->xconfigure.event != xevent->xconfigure.window
? " (discarding substructure)"
: "")); : ""));
if (window && if (window &&
xevent->xconfigure.event == xevent->xconfigure.window &&
!GDK_WINDOW_DESTROYED (window) && !GDK_WINDOW_DESTROYED (window) &&
(window_private->extension_events != 0)) (window_private->extension_events != 0))
_gdk_input_configure_event (&xevent->xconfigure, window); _gdk_input_configure_event (&xevent->xconfigure, window);
if (!window || if (!window ||
xevent->xconfigure.event != xevent->xconfigure.window ||
GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD || GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD ||
GDK_WINDOW_TYPE (window) == GDK_WINDOW_ROOT) GDK_WINDOW_TYPE (window) == GDK_WINDOW_ROOT)
return_val = FALSE; return_val = FALSE;
......
...@@ -670,7 +670,7 @@ cmp_families (const void *a, const void *b) ...@@ -670,7 +670,7 @@ cmp_families (const void *a, const void *b)
const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a); const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a);
const char *b_name = pango_font_family_get_name (*(PangoFontFamily **)b); const char *b_name = pango_font_family_get_name (*(PangoFontFamily **)b);
return strcmp (a_name, b_name); return g_utf8_collate (a_name, b_name);
} }
static void static void
......
...@@ -515,6 +515,9 @@ gtk_menu_item_size_allocate (GtkWidget *widget, ...@@ -515,6 +515,9 @@ gtk_menu_item_size_allocate (GtkWidget *widget,
if (menu_item->submenu && menu_item->show_submenu_indicator) if (menu_item->submenu && menu_item->show_submenu_indicator)
child_allocation.width -= child_requisition.height; child_allocation.width -= child_requisition.height;
if (child_allocation.width < 1)
child_allocation.width = 1;
gtk_widget_size_allocate (bin->child, &child_allocation); gtk_widget_size_allocate (bin->child, &child_allocation);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment