forked from AuroraMiddleware/gtk
Update from contents of size entry on focus out. (#76493, Lauris
Wed May 15 16:52:57 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkfontsel.c: Update from contents of size entry on focus out. (#76493, Lauris Kaplinski) * gtk/gtkclipboard.c (selection_get_cb): Fix backwads info/time arguments. (#80226)
This commit is contained in:
parent
b835fe2cd7
commit
030ac8095a
@ -1,3 +1,11 @@
|
||||
Wed May 15 16:52:57 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c: Update from contents of size entry
|
||||
on focus out. (#76493, Lauris Kaplinski)
|
||||
|
||||
* gtk/gtkclipboard.c (selection_get_cb): Fix backwads
|
||||
info/time arguments. (#80226)
|
||||
|
||||
Wed May 15 11:13:19 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in gtk/stock-icons/Makefile.am: If not
|
||||
|
@ -1,3 +1,11 @@
|
||||
Wed May 15 16:52:57 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c: Update from contents of size entry
|
||||
on focus out. (#76493, Lauris Kaplinski)
|
||||
|
||||
* gtk/gtkclipboard.c (selection_get_cb): Fix backwads
|
||||
info/time arguments. (#80226)
|
||||
|
||||
Wed May 15 11:13:19 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in gtk/stock-icons/Makefile.am: If not
|
||||
|
@ -1,3 +1,11 @@
|
||||
Wed May 15 16:52:57 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c: Update from contents of size entry
|
||||
on focus out. (#76493, Lauris Kaplinski)
|
||||
|
||||
* gtk/gtkclipboard.c (selection_get_cb): Fix backwads
|
||||
info/time arguments. (#80226)
|
||||
|
||||
Wed May 15 11:13:19 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in gtk/stock-icons/Makefile.am: If not
|
||||
|
@ -1,3 +1,11 @@
|
||||
Wed May 15 16:52:57 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c: Update from contents of size entry
|
||||
on focus out. (#76493, Lauris Kaplinski)
|
||||
|
||||
* gtk/gtkclipboard.c (selection_get_cb): Fix backwads
|
||||
info/time arguments. (#80226)
|
||||
|
||||
Wed May 15 11:13:19 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in gtk/stock-icons/Makefile.am: If not
|
||||
|
@ -1,3 +1,11 @@
|
||||
Wed May 15 16:52:57 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c: Update from contents of size entry
|
||||
on focus out. (#76493, Lauris Kaplinski)
|
||||
|
||||
* gtk/gtkclipboard.c (selection_get_cb): Fix backwads
|
||||
info/time arguments. (#80226)
|
||||
|
||||
Wed May 15 11:13:19 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in gtk/stock-icons/Makefile.am: If not
|
||||
|
@ -1,3 +1,11 @@
|
||||
Wed May 15 16:52:57 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c: Update from contents of size entry
|
||||
on focus out. (#76493, Lauris Kaplinski)
|
||||
|
||||
* gtk/gtkclipboard.c (selection_get_cb): Fix backwads
|
||||
info/time arguments. (#80226)
|
||||
|
||||
Wed May 15 11:13:19 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in gtk/stock-icons/Makefile.am: If not
|
||||
|
@ -179,8 +179,8 @@ gtk_clipboard_get (GdkAtom selection)
|
||||
static void
|
||||
selection_get_cb (GtkWidget *widget,
|
||||
GtkSelectionData *selection_data,
|
||||
guint time,
|
||||
guint info)
|
||||
guint info,
|
||||
guint time)
|
||||
{
|
||||
GtkClipboard *clipboard = gtk_widget_get_clipboard (widget, selection_data->selection);
|
||||
|
||||
|
@ -138,6 +138,9 @@ static void gtk_font_selection_show_available_sizes (GtkFontSelection *fs,
|
||||
gboolean first_time);
|
||||
static void gtk_font_selection_size_activate (GtkWidget *w,
|
||||
gpointer data);
|
||||
static gboolean gtk_font_selection_size_focus_out (GtkWidget *w,
|
||||
GdkEventFocus *event,
|
||||
gpointer data);
|
||||
static void gtk_font_selection_select_size (GtkTreeSelection *selection,
|
||||
gpointer data);
|
||||
|
||||
@ -322,6 +325,9 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
|
||||
gtk_signal_connect (GTK_OBJECT (fontsel->size_entry), "activate",
|
||||
(GtkSignalFunc) gtk_font_selection_size_activate,
|
||||
fontsel);
|
||||
gtk_signal_connect_after (GTK_OBJECT (fontsel->size_entry), "focus_out_event",
|
||||
(GtkSignalFunc) gtk_font_selection_size_focus_out,
|
||||
fontsel);
|
||||
|
||||
font_label = gtk_label_new_with_mnemonic (_("_Family:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (font_label), 0.0, 0.5);
|
||||
@ -995,6 +1001,16 @@ gtk_font_selection_size_activate (GtkWidget *w,
|
||||
gtk_font_selection_set_size (fontsel, new_size);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gtk_font_selection_size_focus_out (GtkWidget *w,
|
||||
GdkEventFocus *event,
|
||||
gpointer data)
|
||||
{
|
||||
gtk_font_selection_size_activate (w, data);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* This is called when a size is selected in the list. */
|
||||
static void
|
||||
gtk_font_selection_select_size (GtkTreeSelection *selection,
|
||||
|
Loading…
Reference in New Issue
Block a user