AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

move function to a somewhat more logical place,

Browse Source 
Wed Nov 19 23:19:23 2003  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtkcombobox.[ch] (gtk_combo_box_scroll_event): move function
	to a somewhat more logical place,
	(gtk_combo_box_remove_text): New function (#125262, Owen Taylor).
This commit is contained in:
Kristian Rietveld 2003-11-19 22:26:42 +00:00 committed by Kristian Rietveld
parent 720873b9cc
commit 6438147763
7 changed files with 79 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Nov 19 23:19:23 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcombobox.[ch] (gtk_combo_box_scroll_event): move function
to a somewhat more logical place,
(gtk_combo_box_remove_text): New function (#125262, Owen Taylor).
Wed Nov 19 22:15:01 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_completion_timeout): always resize

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Wed Nov 19 23:19:23 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcombobox.[ch] (gtk_combo_box_scroll_event): move function
to a somewhat more logical place,
(gtk_combo_box_remove_text): New function (#125262, Owen Taylor).
Wed Nov 19 22:15:01 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_completion_timeout): always resize

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Wed Nov 19 23:19:23 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcombobox.[ch] (gtk_combo_box_scroll_event): move function
to a somewhat more logical place,
(gtk_combo_box_remove_text): New function (#125262, Owen Taylor).
Wed Nov 19 22:15:01 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_completion_timeout): always resize

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Wed Nov 19 23:19:23 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcombobox.[ch] (gtk_combo_box_scroll_event): move function
to a somewhat more logical place,
(gtk_combo_box_remove_text): New function (#125262, Owen Taylor).
Wed Nov 19 22:15:01 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_completion_timeout): always resize

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Wed Nov 19 23:19:23 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcombobox.[ch] (gtk_combo_box_scroll_event): move function
to a somewhat more logical place,
(gtk_combo_box_remove_text): New function (#125262, Owen Taylor).
Wed Nov 19 22:15:01 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_completion_timeout): always resize

67
gtk/gtkcombobox.c
View File

@ -1171,6 +1171,31 @@ gtk_combo_box_expose_event (GtkWidget *widget,
return FALSE;
}
static gboolean
gtk_combo_box_scroll_event (GtkWidget *widget,
GdkEventScroll *event)
{
GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
gint index;
gint items;
index = gtk_combo_box_get_active (combo_box);
if (index != -1)
{
items = gtk_tree_model_iter_n_children (combo_box->priv->model, NULL);
if (event->direction == GDK_SCROLL_UP)
index--;
else
index++;
gtk_combo_box_set_active (combo_box, CLAMP (index, 0, items - 1));
}
return TRUE;
}
/*
* menu style
*/
@ -2670,28 +2695,30 @@ gtk_combo_box_prepend_text (GtkComboBox *combo_box,
gtk_list_store_set (store, &iter, 0, text, -1);
}
static gboolean
gtk_combo_box_scroll_event (GtkWidget *widget,
GdkEventScroll *event)
/**
* gtk_combo_box_remove_text:
* @combo_box: A #GtkComboBox constructed with gtk_combo_box_new_text().
* @position: Index of the item to remove.
*
* Removes the string at @position from @combo_box. Note that you can only use
* this function with combo boxes constructed with gtk_combo_box_new_text().
*
* Since: 2.4
*/
void
gtk_combo_box_remove_text (GtkComboBox *combo_box,
gint position)
{
GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
gint index;
gint items;
index = gtk_combo_box_get_active (combo_box);
GtkTreeIter iter;
GtkListStore *store;
if (index != -1)
{
items = gtk_tree_model_iter_n_children (combo_box->priv->model, NULL);
if (event->direction == GDK_SCROLL_UP)
index--;
else
index++;
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
g_return_if_fail (position >= 0);
gtk_combo_box_set_active (combo_box, CLAMP (index, 0, items - 1));
}
store = GTK_LIST_STORE (combo_box->priv->model);
return TRUE;
if (gtk_tree_model_iter_nth_child (combo_box->priv->model, &iter,
NULL, position))
gtk_list_store_remove (store, &iter);
}

2
gtk/gtkcombobox.h
View File

@ -96,6 +96,8 @@ void gtk_combo_box_insert_text (GtkComboBox *combo_box,
const gchar *text);
void gtk_combo_box_prepend_text (GtkComboBox *combo_box,
const gchar *text);
void gtk_combo_box_remove_text (GtkComboBox *combo_box,
gint position);
G_END_DECLS