Classifiy Page Up/Down as cursor move, but not Home and End.

Fri Feb 27 02:33:21 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkentry.c (keyval_is_cursor_move): Classifiy Page Up/Down as
	cursor move, but not Home and End.

	* gtk/gtkentry.c (gtk_entry_completion_key_press): Lets Page Up/Down
	jump to the ends of the list, not Home and End - since we're not
	scrolling yet, a "page" is always the complete list.  (#127430, Marco
	Pesenti Gritti)

Fri Feb 27 00:39:11 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcombobox.c (gtk_combo_box_list_destroy):
	* gtk/gtkcombobox.c (gtk_combo_box_menu_destroy): Don't let
	the priv pointers dangle.  (#127623, Damon Chaplin)
This commit is contained in:
Matthias Clasen 2004-02-27 01:34:11 +00:00 committed by Matthias Clasen
parent 7f31ba2bd6
commit c4d2bb0a98
7 changed files with 99 additions and 5 deletions

View File

@ -1,3 +1,19 @@
Fri Feb 27 02:33:21 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentry.c (keyval_is_cursor_move): Classifiy Page Up/Down as
cursor move, but not Home and End.
* gtk/gtkentry.c (gtk_entry_completion_key_press): Lets Page Up/Down
jump to the ends of the list, not Home and End - since we're not
scrolling yet, a "page" is always the complete list. (#127430, Marco
Pesenti Gritti)
Fri Feb 27 00:39:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_list_destroy):
* gtk/gtkcombobox.c (gtk_combo_box_menu_destroy): Don't let
the priv pointers dangle. (#127623, Damon Chaplin)
Thu Feb 26 17:31:34 2004 Manish Singh <yosh@gimp.org>
* gdk/x11/xsettings-client.c (read_settings): fix ytpo: s/eles/else/

View File

@ -1,3 +1,19 @@
Fri Feb 27 02:33:21 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentry.c (keyval_is_cursor_move): Classifiy Page Up/Down as
cursor move, but not Home and End.
* gtk/gtkentry.c (gtk_entry_completion_key_press): Lets Page Up/Down
jump to the ends of the list, not Home and End - since we're not
scrolling yet, a "page" is always the complete list. (#127430, Marco
Pesenti Gritti)
Fri Feb 27 00:39:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_list_destroy):
* gtk/gtkcombobox.c (gtk_combo_box_menu_destroy): Don't let
the priv pointers dangle. (#127623, Damon Chaplin)
Thu Feb 26 17:31:34 2004 Manish Singh <yosh@gimp.org>
* gdk/x11/xsettings-client.c (read_settings): fix ytpo: s/eles/else/

View File

@ -1,3 +1,19 @@
Fri Feb 27 02:33:21 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentry.c (keyval_is_cursor_move): Classifiy Page Up/Down as
cursor move, but not Home and End.
* gtk/gtkentry.c (gtk_entry_completion_key_press): Lets Page Up/Down
jump to the ends of the list, not Home and End - since we're not
scrolling yet, a "page" is always the complete list. (#127430, Marco
Pesenti Gritti)
Fri Feb 27 00:39:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_list_destroy):
* gtk/gtkcombobox.c (gtk_combo_box_menu_destroy): Don't let
the priv pointers dangle. (#127623, Damon Chaplin)
Thu Feb 26 17:31:34 2004 Manish Singh <yosh@gimp.org>
* gdk/x11/xsettings-client.c (read_settings): fix ytpo: s/eles/else/

View File

@ -1,3 +1,19 @@
Fri Feb 27 02:33:21 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentry.c (keyval_is_cursor_move): Classifiy Page Up/Down as
cursor move, but not Home and End.
* gtk/gtkentry.c (gtk_entry_completion_key_press): Lets Page Up/Down
jump to the ends of the list, not Home and End - since we're not
scrolling yet, a "page" is always the complete list. (#127430, Marco
Pesenti Gritti)
Fri Feb 27 00:39:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_list_destroy):
* gtk/gtkcombobox.c (gtk_combo_box_menu_destroy): Don't let
the priv pointers dangle. (#127623, Damon Chaplin)
Thu Feb 26 17:31:34 2004 Manish Singh <yosh@gimp.org>
* gdk/x11/xsettings-client.c (read_settings): fix ytpo: s/eles/else/

View File

@ -1,3 +1,19 @@
Fri Feb 27 02:33:21 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentry.c (keyval_is_cursor_move): Classifiy Page Up/Down as
cursor move, but not Home and End.
* gtk/gtkentry.c (gtk_entry_completion_key_press): Lets Page Up/Down
jump to the ends of the list, not Home and End - since we're not
scrolling yet, a "page" is always the complete list. (#127430, Marco
Pesenti Gritti)
Fri Feb 27 00:39:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_list_destroy):
* gtk/gtkcombobox.c (gtk_combo_box_menu_destroy): Don't let
the priv pointers dangle. (#127623, Damon Chaplin)
Thu Feb 26 17:31:34 2004 Manish Singh <yosh@gimp.org>
* gdk/x11/xsettings-client.c (read_settings): fix ytpo: s/eles/else/

View File

@ -1499,13 +1499,21 @@ gtk_combo_box_menu_destroy (GtkComboBox *combo_box)
if (combo_box->priv->cell_view)
{
gtk_widget_unparent (combo_box->priv->arrow);
combo_box->priv->arrow = NULL;
gtk_widget_unparent (combo_box->priv->separator);
combo_box->priv->separator = NULL;
gtk_widget_unparent (combo_box->priv->button);
combo_box->priv->button = NULL;
}
else
{
/* will destroy the arrow too */
gtk_widget_unparent (combo_box->priv->button);
combo_box->priv->button = NULL;
combo_box->priv->arrow = NULL;
}
/* changing the popup window will unref the menu and the childs */
@ -1836,6 +1844,7 @@ gtk_combo_box_list_setup (GtkComboBox *combo_box)
combo_box->priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
gtk_container_add (GTK_CONTAINER (combo_box->priv->button),
combo_box->priv->arrow);
combo_box->priv->separator = NULL;
gtk_widget_show_all (combo_box->priv->button);
if (combo_box->priv->cell_view)
@ -1937,6 +1946,8 @@ gtk_combo_box_list_destroy (GtkComboBox *combo_box)
* last unref on button will destroy the arrow
*/
gtk_widget_unparent (combo_box->priv->button);
combo_box->priv->button = NULL;
combo_box->priv->arrow = NULL;
if (combo_box->priv->cell_view)
{
@ -1945,9 +1956,11 @@ gtk_combo_box_list_destroy (GtkComboBox *combo_box)
NULL);
gtk_widget_unparent (combo_box->priv->cell_view_frame);
combo_box->priv->cell_view_frame = NULL;
}
gtk_widget_destroy (combo_box->priv->tree_view);
combo_box->priv->tree_view = NULL;
combo_box->priv->popup_widget = NULL;
}

View File

@ -4532,10 +4532,10 @@ keyval_is_cursor_move (guint keyval)
if (keyval == GDK_Down || keyval == GDK_KP_Down)
return TRUE;
if (keyval == GDK_Home || keyval == GDK_KP_Home)
if (keyval == GDK_Page_Up)
return TRUE;
if (keyval == GDK_End || keyval == GDK_KP_End)
if (keyval == GDK_Page_Down)
return TRUE;
return FALSE;
@ -4573,9 +4573,10 @@ gtk_entry_completion_key_press (GtkWidget *widget,
if (completion->priv->current_selected > matches + actions - 1)
completion->priv->current_selected = matches + actions - 1;
}
else if (event->keyval == GDK_Home || event->keyval == GDK_KP_Home)
completion->priv->current_selected = -1;
else if (event->keyval == GDK_End || event->keyval == GDK_KP_End)
else if (event->keyval == GDK_Page_Up)
completion->priv->current_selected = 0;
else if (event->keyval == GDK_Page_Down)
completion->priv->current_selected = matches + actions - 1;
if (completion->priv->current_selected < 0)