osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

gtk_font_selection_set_font_name doesn't work when run before appending 

the font selection widget to the notebook (at least in GTK2).

svn path=/trunk/; revision=9769
This commit is contained in:
Olivier Abad 2004-01-21 12:19:19 +00:00
parent e338b18e4f
commit 7728b2c563
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gui_prefs.c
View File

@ -1,7 +1,7 @@
/* gui_prefs.c
* Dialog box for GUI preferences
*
* $Id: gui_prefs.c,v 1.56 2004/01/20 19:33:23 ulfl Exp $
* $Id: gui_prefs.c,v 1.57 2004/01/21 12:19:19 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -313,15 +313,6 @@ gui_font_prefs_show(void)
#endif
#endif
/* Set the font to the current font.
XXX - GTK+ 1.2.8, and probably earlier versions, have a bug
wherein that doesn't necessarily cause that font to be
selected in the dialog box. I've sent to the GTK+ folk
a fix; hopefully, it'll show up in 1.2.9 if, as, and when
they put out a 1.2.9 release. */
gtk_font_selection_set_font_name(
GTK_FONT_SELECTION(font_browse_w), prefs.PREFS_GUI_FONT_NAME);
gtk_widget_show(font_browse_w);
return font_browse_w;

6
gtk/prefs_dlg.c
View File

@ -1,7 +1,7 @@
/* prefs_dlg.c
* Routines for handling preferences
*
* $Id: prefs_dlg.c,v 1.72 2004/01/17 00:26:22 ulfl Exp $
* $Id: prefs_dlg.c,v 1.73 2004/01/21 12:19:19 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -486,6 +486,10 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
gtk_container_add(GTK_CONTAINER(frame), gui_font_pg);
OBJECT_SET_DATA(prefs_w, E_GUI_FONT_PAGE_KEY, gui_font_pg);
gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
/* gtk_font_selection_set_font_name doesn't work when run before appending the
* frame to the notebook (at least in GTK2) */
gtk_font_selection_set_font_name(
GTK_FONT_SELECTION(gui_font_pg), prefs.PREFS_GUI_FONT_NAME);
strcpy(label_str, "Font");
#if GTK_MAJOR_VERSION < 2
ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.tree), ct_base_node, NULL,