Browse Source

fix remaining bugs when EXT_ASC is defined

pre-master-46
Holger Vogt 6 years ago
parent
commit
921058cb39
  1. 4
      src/frontend/wdisp/windisp.c
  2. 1
      src/winmain.c

4
src/frontend/wdisp/windisp.c

@ -278,10 +278,10 @@ int WIN_Init(void)
lf.lfQuality = 0; lf.lfQuality = 0;
lf.lfPitchAndFamily = 0; lf.lfPitchAndFamily = 0;
/* set up fonts */ /* set up fonts */
if (!cp_getvar("wfont", CP_STRING, lf.lfFaceName)) {
if (!cp_getvar("wfont", CP_STRING, lf.lfFaceName, strlen(lf.lfFaceName))) {
(void)lstrcpy(lf.lfFaceName, DEF_FONTW); (void)lstrcpy(lf.lfFaceName, DEF_FONTW);
} }
if (!cp_getvar("wfont_size", CP_NUM, &(lf.lfHeight))) {
if (!cp_getvar("wfont_size", CP_NUM, &(lf.lfHeight), 0)) {
lf.lfHeight = 18; lf.lfHeight = 18;
} }
PlotFont = CreateFontIndirect(&lf); PlotFont = CreateFontIndirect(&lf);

1
src/winmain.c

@ -1159,6 +1159,7 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
const int iyt = iy / 3; /* height of screen divided by 3 */ const int iyt = iy / 3; /* height of screen divided by 3 */
#ifdef EXT_ASC #ifdef EXT_ASC
hwMain = CreateWindow(hwClassName, hwWindowName, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, hwMain = CreateWindow(hwClassName, hwWindowName, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
0, iyt * 2, ix, iyt, NULL, NULL, hInst, NULL);
#else #else
hwMain = CreateWindowW(hwClassNameW, hwWindowNameW, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, hwMain = CreateWindowW(hwClassNameW, hwWindowNameW, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
0, iyt * 2, ix, iyt, NULL, NULL, hInst, NULL); 0, iyt * 2, ix, iyt, NULL, NULL, hInst, NULL);

Loading…
Cancel
Save