diff options
| author | oabad <oabad@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-21 12:19:19 +0000 |
|---|---|---|
| committer | oabad <oabad@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-21 12:19:19 +0000 |
| commit | 265e0ecc260e9dcec2a23488a68737c1c06c7c79 (patch) | |
| tree | 944261d25009aa52ff7af02585eb8c2b5ffcae98 /gtk | |
| parent | af4929692502cb8aff039d44d0641dbfffd66886 (diff) | |
gtk_font_selection_set_font_name doesn't work when run before appending
the font selection widget to the notebook (at least in GTK2).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9769 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gui_prefs.c | 11 | ||||
| -rw-r--r-- | gtk/prefs_dlg.c | 6 |
2 files changed, 6 insertions, 11 deletions
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c index 0d6fd07cca..f1335cdc09 100644 --- a/gtk/gui_prefs.c +++ b/gtk/gui_prefs.c @@ -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; diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 22606444ae..27af15896f 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -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, |