callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement grab_focus for GtkComboBox and GtkComboBoxEntry. (#171912,

Browse Source 
2005-04-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_grab_focus):
	* gtk/gtkcombobox.c (gtk_combo_box_grab_focus): Implement
	grab_focus for GtkComboBox and GtkComboBoxEntry.  (#171912,
	Gustavo Carneiro)
This commit is contained in:
Matthias Clasen
2005-04-06 04:01:19 +00:00
committed by Matthias Clasen
parent a6259bbd4d
commit c825c71a66
5 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2005-04-05 Matthias Clasen <mclasen@redhat.com> 2005-04-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_grab_focus):
* gtk/gtkcombobox.c (gtk_combo_box_grab_focus): Implement
grab_focus for GtkComboBox and GtkComboBoxEntry. (#171912,
Gustavo Carneiro)
* gtk/gtkicontheme.c: Store icon caches along with the * gtk/gtkicontheme.c: Store icon caches along with the
mtimes of the toplevel directories. The previous mtimes of the toplevel directories. The previous
mechanism of a hashtable-per-theme caused duplicate icon mechanism of a hashtable-per-theme caused duplicate icon

5
ChangeLog.pre-2-10
View File

@ -1,5 +1,10 @@
2005-04-05 Matthias Clasen <mclasen@redhat.com> 2005-04-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_grab_focus):
* gtk/gtkcombobox.c (gtk_combo_box_grab_focus): Implement
grab_focus for GtkComboBox and GtkComboBoxEntry. (#171912,
Gustavo Carneiro)
* gtk/gtkicontheme.c: Store icon caches along with the * gtk/gtkicontheme.c: Store icon caches along with the
mtimes of the toplevel directories. The previous mtimes of the toplevel directories. The previous
mechanism of a hashtable-per-theme caused duplicate icon mechanism of a hashtable-per-theme caused duplicate icon

5
ChangeLog.pre-2-8
View File

@ -1,5 +1,10 @@
2005-04-05 Matthias Clasen <mclasen@redhat.com> 2005-04-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_grab_focus):
* gtk/gtkcombobox.c (gtk_combo_box_grab_focus): Implement
grab_focus for GtkComboBox and GtkComboBoxEntry. (#171912,
Gustavo Carneiro)
* gtk/gtkicontheme.c: Store icon caches along with the * gtk/gtkicontheme.c: Store icon caches along with the
mtimes of the toplevel directories. The previous mtimes of the toplevel directories. The previous
mechanism of a hashtable-per-theme caused duplicate icon mechanism of a hashtable-per-theme caused duplicate icon

12
gtk/gtkcombobox.c
View File

@ -221,7 +221,7 @@ static void gtk_combo_box_get_property (GObject *object,
GParamSpec *spec); GParamSpec *spec);
static void gtk_combo_box_state_changed (GtkWidget *widget, static void gtk_combo_box_state_changed (GtkWidget *widget,
GtkStateType previous); GtkStateType previous);static void gtk_combo_box_grab_focus (GtkWidget *widget);
static void gtk_combo_box_style_set (GtkWidget *widget, static void gtk_combo_box_style_set (GtkWidget *widget,
GtkStyle *previous); GtkStyle *previous);
static void gtk_combo_box_button_toggled (GtkWidget *widget, static void gtk_combo_box_button_toggled (GtkWidget *widget,
@ -506,6 +506,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
widget_class->expose_event = gtk_combo_box_expose_event; widget_class->expose_event = gtk_combo_box_expose_event;
widget_class->scroll_event = gtk_combo_box_scroll_event; widget_class->scroll_event = gtk_combo_box_scroll_event;
widget_class->mnemonic_activate = gtk_combo_box_mnemonic_activate; widget_class->mnemonic_activate = gtk_combo_box_mnemonic_activate;
widget_class->grab_focus = gtk_combo_box_grab_focus;
widget_class->style_set = gtk_combo_box_style_set; widget_class->style_set = gtk_combo_box_style_set;
widget_class->state_changed = gtk_combo_box_state_changed; widget_class->state_changed = gtk_combo_box_state_changed;
@ -4794,6 +4795,14 @@ gtk_combo_box_mnemonic_activate (GtkWidget *widget,
return TRUE; return TRUE;
} }
static void
gtk_combo_box_grab_focus (GtkWidget *widget)
{
GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
gtk_widget_grab_focus (combo_box->priv->button);
}
static void static void
gtk_combo_box_destroy (GtkObject *object) gtk_combo_box_destroy (GtkObject *object)
{ {
@ -5163,5 +5172,6 @@ gtk_combo_box_get_focus_on_click (GtkComboBox *combo)
return combo->priv->focus_on_click; return combo->priv->focus_on_click;
} }
#define __GTK_COMBO_BOX_C__ #define __GTK_COMBO_BOX_C__
#include "gtkaliasdef.c" #include "gtkaliasdef.c"

11
gtk/gtkcomboboxentry.c
View File

@ -57,6 +57,7 @@ static void gtk_combo_box_entry_contents_changed (GtkEntry *entry,
gpointer user_data); gpointer user_data);
static gboolean gtk_combo_box_entry_mnemonic_activate (GtkWidget *entry, static gboolean gtk_combo_box_entry_mnemonic_activate (GtkWidget *entry,
gboolean group_cycling); gboolean group_cycling);
static void gtk_combo_box_entry_grab_focus (GtkWidget *widget);
static void has_frame_changed (GtkComboBoxEntry *entry_box, static void has_frame_changed (GtkComboBoxEntry *entry_box,
GParamSpec *pspec, GParamSpec *pspec,
gpointer data); gpointer data);
@ -110,6 +111,7 @@ gtk_combo_box_entry_class_init (GtkComboBoxEntryClass *klass)
widget_class = (GtkWidgetClass *)klass; widget_class = (GtkWidgetClass *)klass;
widget_class->mnemonic_activate = gtk_combo_box_entry_mnemonic_activate; widget_class->mnemonic_activate = gtk_combo_box_entry_mnemonic_activate;
widget_class->grab_focus = gtk_combo_box_entry_grab_focus;
combo_class = (GtkComboBoxClass *)klass; combo_class = (GtkComboBoxClass *)klass;
combo_class->get_active_text = gtk_combo_box_entry_get_active_text; combo_class->get_active_text = gtk_combo_box_entry_get_active_text;
@ -359,6 +361,15 @@ gtk_combo_box_entry_mnemonic_activate (GtkWidget *widget,
return TRUE; return TRUE;
} }
static void
gtk_combo_box_entry_grab_focus (GtkWidget *widget)
{
GtkComboBoxEntry *entry_box = GTK_COMBO_BOX_ENTRY (widget);
gtk_widget_grab_focus (entry_box->priv->entry);
}
/* convenience API for simple text combos */ /* convenience API for simple text combos */