summaryrefslogtreecommitdiff
path: root/iup/src/gtk/iupgtk_fontdlg.c
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2010-06-15 00:59:57 -0700
committerPixel <pixel@nobis-crew.org>2010-06-15 00:59:57 -0700
commiteed0eb6a476d54ce19aeff137984aa981d9e3976 (patch)
tree807891636efd2f87dcbd261e971216269973ae07 /iup/src/gtk/iupgtk_fontdlg.c
parentccc8261e4d48de89da4ddfe7b55e378ae0cd6f47 (diff)
Upgrading to iup 3.1
Diffstat (limited to 'iup/src/gtk/iupgtk_fontdlg.c')
-rwxr-xr-xiup/src/gtk/iupgtk_fontdlg.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/iup/src/gtk/iupgtk_fontdlg.c b/iup/src/gtk/iupgtk_fontdlg.c
index 5769cbc..dca0232 100755
--- a/iup/src/gtk/iupgtk_fontdlg.c
+++ b/iup/src/gtk/iupgtk_fontdlg.c
@@ -24,7 +24,7 @@ static int gtkFontDlgPopup(Ihandle* ih, int x, int y)
InativeHandle* parent = iupDialogGetNativeParent(ih);
GtkFontSelectionDialog* dialog;
int response;
- char* preview_text;
+ char* preview_text, *standardfont;
iupAttribSetInt(ih, "_IUPDLG_X", x); /* used in iupDialogUpdatePosition */
iupAttribSetInt(ih, "_IUPDLG_Y", y);
@@ -36,7 +36,10 @@ static int gtkFontDlgPopup(Ihandle* ih, int x, int y)
if (parent)
gtk_window_set_transient_for((GtkWindow*)dialog, (GtkWindow*)parent);
- gtk_font_selection_dialog_set_font_name(dialog, iupAttribGet(ih, "VALUE"));
+ standardfont = iupAttribGet(ih, "VALUE");
+ if (!standardfont)
+ standardfont = IupGetGlobal("DEFAULTFONT");
+ gtk_font_selection_dialog_set_font_name(dialog, standardfont);
preview_text = iupAttribGet(ih, "PREVIEWTEXT");
if (preview_text)