summaryrefslogtreecommitdiff
path: root/iup/src/win/iupwin_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/win/iupwin_fontdlg.c
parentccc8261e4d48de89da4ddfe7b55e378ae0cd6f47 (diff)
Upgrading to iup 3.1
Diffstat (limited to 'iup/src/win/iupwin_fontdlg.c')
-rwxr-xr-xiup/src/win/iupwin_fontdlg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/iup/src/win/iupwin_fontdlg.c b/iup/src/win/iupwin_fontdlg.c
index 0602441..ce27cf2 100755
--- a/iup/src/win/iupwin_fontdlg.c
+++ b/iup/src/win/iupwin_fontdlg.c
@@ -68,7 +68,7 @@ static int winFontDlgPopup(Ihandle* ih, int x, int y)
standardfont = iupAttribGet(ih, "VALUE");
if (!standardfont)
- return IUP_ERROR;
+ standardfont = IupGetGlobal("DEFAULTFONT");
/* parse the old format first */
if (!iupFontParseWin(standardfont, typeface, &height, &is_bold, &is_italic, &is_underline, &is_strikeout))
@@ -81,7 +81,7 @@ static int winFontDlgPopup(Ihandle* ih, int x, int y)
if (height < 0)
height_pixels = height; /* already in pixels */
else
- height_pixels = -IUPWIN_PT2PIXEL(height, res);
+ height_pixels = -iupWIN_PT2PIXEL(height, res);
if (height_pixels == 0)
return IUP_ERROR;
@@ -134,7 +134,7 @@ static int winFontDlgPopup(Ihandle* ih, int x, int y)
if (height < 0) /* not an error, use old value as a reference for the units */
height = height_pixels; /* return in pixels */
else
- height = IUPWIN_PIXEL2PT(-height_pixels, res); /* return in points */
+ height = iupWIN_PIXEL2PT(-height_pixels, res); /* return in points */
iupAttribSetStrf(ih, "VALUE", "%s, %s%s%s%s %d", logfont.lfFaceName,
is_bold?"Bold ":"",