wine/programs/notepad dialog.c main.c
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Dec 1 06:01:18 CST 2005
ChangeSet ID: 21594
CVSROOT: /opt/cvs-commit
Module name: wine
Changes by: julliard at winehq.org 2005/12/01 06:01:18
Modified files:
programs/notepad: dialog.c main.c
Log message:
Pavel Roskin <proski at gnu.org>
Improve font support in Notepad.
Patch: http://cvs.winehq.org/patch.py?id=21594
Old revision New revision Changes Path
1.31 1.32 +1 -1 wine/programs/notepad/dialog.c
1.36 1.37 +31 -0 wine/programs/notepad/main.c
Index: wine/programs/notepad/dialog.c
diff -u -p wine/programs/notepad/dialog.c:1.31 wine/programs/notepad/dialog.c:1.32
--- wine/programs/notepad/dialog.c:1.31 1 Dec 2005 12: 1:18 -0000
+++ wine/programs/notepad/dialog.c 1 Dec 2005 12: 1:18 -0000
@@ -620,7 +620,7 @@ VOID DIALOG_SelectFont(VOID)
cf.lStructSize=sizeof(cf);
cf.hwndOwner=Globals.hMainWnd;
cf.lpLogFont=&lf;
- cf.Flags=CF_SCREENFONTS;
+ cf.Flags=CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT;
if( ChooseFont(&cf) )
{
Index: wine/programs/notepad/main.c
diff -u -p wine/programs/notepad/main.c:1.36 wine/programs/notepad/main.c:1.37
--- wine/programs/notepad/main.c:1.36 1 Dec 2005 12: 1:18 -0000
+++ wine/programs/notepad/main.c 1 Dec 2005 12: 1:18 -0000
@@ -49,6 +49,36 @@ VOID SetFileName(LPCWSTR szFileName)
/***********************************************************************
*
+ * NOTEPAD_InitFont
+ *
+ * Initialize font for the edit window
+ */
+static VOID NOTEPAD_InitFont()
+{
+ LOGFONT *lf = &Globals.lfFont;
+ static const WCHAR systemW[] = { 'S','y','s','t','e','m',0 };
+
+ lf->lfHeight = -10;
+ lf->lfWidth = 0;
+ lf->lfEscapement = 0;
+ lf->lfOrientation = 0;
+ lf->lfWeight = FW_BOLD;
+ lf->lfItalic = FALSE;
+ lf->lfUnderline = FALSE;
+ lf->lfStrikeOut = FALSE;
+ lf->lfCharSet = DEFAULT_CHARSET;
+ lf->lfOutPrecision = OUT_DEFAULT_PRECIS;
+ lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;
+ lf->lfQuality = DEFAULT_QUALITY;
+ lf->lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
+ lstrcpy(lf->lfFaceName, systemW);
+
+ Globals.hFont = CreateFontIndirect(lf);
+ SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE);
+}
+
+/***********************************************************************
+ *
* NOTEPAD_MenuCommand
*
* All handling of main menu events
@@ -153,6 +183,7 @@ static LRESULT WINAPI NOTEPAD_WndProc(HW
ES_AUTOVSCROLL | ES_MULTILINE,
0, 0, rc.right, rc.bottom, hWnd,
NULL, Globals.hInstance, NULL);
+ NOTEPAD_InitFont();
break;
}
More information about the wine-cvs
mailing list