ダイアログフォントの設定をメモリに持つようにした
- common/tttype.h に ダイアログフォントに関するメンバを追加
- SetDialogFont()#common/dlglib_cpp.cpp の仕様を変更
- CVTWindow::OnSetupDlgFont#teraterm/vtwin.cpp
- ReadIniFile(),WriteIniFile()#ttpset/ttset.cで読み,書き追加
@@ -249,16 +249,14 @@ | ||
249 | 249 | switch (cmd) { |
250 | 250 | case ID_ABOUTMENU: |
251 | 251 | copy_UILanguageFile(); |
252 | - SetDialogFont(getInstance().ts->SetupFName, | |
253 | - getInstance().ts->UILanguageFile, | |
254 | - "TTProxy", "DLG_TAHOMA_FONT"); | |
252 | + SetDialogFont(getInstance().ts->DialogFontName, getInstance().ts->DialogFontPoint, getInstance().ts->DialogFontCharSet, | |
253 | + getInstance().ts->UILanguageFile, "TTProxy", "DLG_TAHOMA_FONT"); | |
255 | 254 | ProxyWSockHook::aboutDialog(hWin); |
256 | 255 | return 1; |
257 | 256 | case ID_PROXYSETUPMENU: |
258 | 257 | copy_UILanguageFile(); |
259 | - SetDialogFont(getInstance().ts->SetupFName, | |
260 | - getInstance().ts->UILanguageFile, | |
261 | - "TTProxy", "DLG_TAHOMA_FONT"); | |
258 | + SetDialogFont(getInstance().ts->DialogFontName, getInstance().ts->DialogFontPoint, getInstance().ts->DialogFontCharSet, | |
259 | + getInstance().ts->UILanguageFile, "TTProxy", "DLG_TAHOMA_FONT"); | |
262 | 260 | ProxyWSockHook::setupDialog(hWin); |
263 | 261 | return 1; |
264 | 262 | case ID_ASYNCMESSAGEBOX: |
@@ -582,9 +582,8 @@ | ||
582 | 582 | static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) { |
583 | 583 | switch (cmd) { |
584 | 584 | case ID_MENU_SETUP: |
585 | - SetDialogFont(pvar->ts->SetupFName, | |
586 | - pvar->ts->UILanguageFile, | |
587 | - SECTION, "DLG_TAHOMA_FONT"); | |
585 | + SetDialogFont(pvar->ts->DialogFontName, pvar->ts->DialogFontPoint, pvar->ts->DialogFontCharSet, | |
586 | + pvar->ts->UILanguageFile, SECTION, "DLG_TAHOMA_FONT"); | |
588 | 587 | switch (TTDialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SETUP_RECURRINGCOMMAND), |
589 | 588 | hWin, RecurringCommandSetting, (LPARAM)NULL)) { |
590 | 589 | case IDOK: |
@@ -223,8 +223,8 @@ | ||
223 | 223 | case ID_MENU_VIEWMODE: |
224 | 224 | if (pvar->enable) { |
225 | 225 | if (strcmp(pvar->password, "") != 0) { |
226 | - SetDialogFont(pvar->ts->SetupFName, pvar->ts->UILanguageFile, | |
227 | - "TTXViewMode", "DLG_TAHOMA_FONT"); | |
226 | + SetDialogFont(pvar->ts->DialogFontName, pvar->ts->DialogFontPoint, pvar->ts->DialogFontCharSet, | |
227 | + pvar->ts->UILanguageFile, "TTXViewMode", "DLG_TAHOMA_FONT"); | |
228 | 228 | switch (TTDialogBoxParam(hInst, MAKEINTRESOURCE(IDD_INPUT_PASSWORD), hWin, ViewModeInputPass, (LPARAM)NULL)) { |
229 | 229 | case IDOK: |
230 | 230 | pvar->enable = FALSE; |
@@ -250,8 +250,8 @@ | ||
250 | 250 | } |
251 | 251 | return 1; |
252 | 252 | case ID_MENU_SETPASS: |
253 | - SetDialogFont(pvar->ts->SetupFName, pvar->ts->UILanguageFile, | |
254 | - "TTXViewMode", "DLG_TAHOMA_FONT"); | |
253 | + SetDialogFont(pvar->ts->DialogFontName, pvar->ts->DialogFontPoint, pvar->ts->DialogFontCharSet, | |
254 | + pvar->ts->UILanguageFile, "TTXViewMode", "DLG_TAHOMA_FONT"); | |
255 | 255 | switch (TTDialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SET_PASSWORD), hWin, ViewModeSetPass, (LPARAM)NULL)) { |
256 | 256 | case IDOK: |
257 | 257 | break; |
@@ -87,7 +87,7 @@ | ||
87 | 87 | LPCTSTR lpTemplateName, |
88 | 88 | HWND hWndParent, |
89 | 89 | DLGPROC lpDialogFunc); |
90 | -void SetDialogFont(const char *SetupFName, | |
90 | +void SetDialogFont(const char *FontName, int FontHeight, int FontCharSet, | |
91 | 91 | const char *UILanguageFile, const char *Section, const char *Key); |
92 | 92 | HFONT SetDlgFonts(HWND hDlg, const int nIDDlgItems[], int nIDDlgItemCount, |
93 | 93 | const char *UILanguageFile, PCHAR key); |
@@ -250,35 +250,26 @@ | ||
250 | 250 | } |
251 | 251 | |
252 | 252 | /** |
253 | - * 使用するダイアログフォントを決定する | |
253 | + * ダイアログフォントを設定する | |
254 | 254 | */ |
255 | -void SetDialogFont(const char *SetupFName, | |
255 | +void SetDialogFont(const char *FontName, int FontPoint, int FontCharSet, | |
256 | 256 | const char *UILanguageFile, const char *Section, const char *Key) |
257 | 257 | { |
258 | 258 | LOGFONTA logfont; |
259 | 259 | BOOL result; |
260 | 260 | |
261 | - // teraterm.iniの指定 | |
262 | - if (SetupFName != NULL) { | |
263 | - result = GetI18nLogfont("Tera Term", "DlgFont", &logfont, 0, SetupFName); | |
261 | + // 指定フォントをセット | |
262 | + if (FontName != NULL && FontName[0] != 0) { | |
263 | + // 存在チェック | |
264 | + result = IsExistFontA(FontName, FontCharSet, TRUE); | |
264 | 265 | if (result == TRUE) { |
265 | - result = IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE); | |
266 | - if (result == TRUE) { | |
267 | - TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet); | |
268 | - return; | |
269 | - } | |
266 | + TTSetDlgFontA(FontName, FontPoint, FontCharSet); | |
267 | + return; | |
270 | 268 | } |
271 | 269 | } |
272 | 270 | |
273 | 271 | // .lngの指定 |
274 | 272 | if (UILanguageFile != NULL && Section != NULL && Key != NULL) { |
275 | -#if 0 | |
276 | - static const char *dlg_font_keys[] = { | |
277 | - "DLG_FONT", | |
278 | - "DLG_TAHOMA_FONT", | |
279 | - "DLG_SYSTEM_FONT", | |
280 | - }; | |
281 | -#endif | |
282 | 273 | result = GetI18nLogfont(Section, Key, &logfont, 0, UILanguageFile); |
283 | 274 | if (result == TRUE) { |
284 | 275 | if (IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE)) { |
@@ -684,6 +684,9 @@ | ||
684 | 684 | char LogTimestampFormat[48]; |
685 | 685 | int TerminalInputSpeed; |
686 | 686 | int TerminalOutputSpeed; |
687 | + char DialogFontName[LF_FACESIZE]; | |
688 | + int DialogFontPoint; | |
689 | + int DialogFontCharSet; | |
687 | 690 | }; |
688 | 691 | |
689 | 692 | typedef struct tttset TTTSet, *PTTSet; |
@@ -789,7 +789,7 @@ | ||
789 | 789 | return; |
790 | 790 | } |
791 | 791 | OldEmu = ts.TEKColorEmu; |
792 | - SetDialogFont(ts.SetupFName, | |
792 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
793 | 793 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
794 | 794 | Ok = (*SetupWin)(HTEKWin, &ts); |
795 | 795 | FreeTTDLG(); |
@@ -832,7 +832,7 @@ | ||
832 | 832 | if (! LoadTTDLG()) { |
833 | 833 | return; |
834 | 834 | } |
835 | - SetDialogFont(ts.SetupFName, | |
835 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
836 | 836 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
837 | 837 | (*WindowWindow)(HTEKWin,&Close); |
838 | 838 | FreeTTDLG(); |
@@ -276,7 +276,8 @@ | ||
276 | 276 | pVTWin = m_pMainWnd; |
277 | 277 | main_window = m_pMainWnd->m_hWnd; |
278 | 278 | // [Tera Term]セクションのDLG_SYSTEM_FONTをとりあえずセットする |
279 | - SetDialogFont(ts.SetupFName, ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); | |
279 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
280 | + ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); | |
280 | 281 | |
281 | 282 | MSG msg; |
282 | 283 | while (GetMessage(&msg, NULL, 0, 0)) { |
@@ -2253,7 +2253,7 @@ | ||
2253 | 2253 | if (!DoSameProcess) { |
2254 | 2254 | bool DoSameProcessNextDrop; |
2255 | 2255 | bool DoNotShowDialog = !DefaultShowDialog; |
2256 | - SetDialogFont(ts.SetupFName, | |
2256 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
2257 | 2257 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
2258 | 2258 | DropType = |
2259 | 2259 | ShowDropDialogBox(hInst, HVTWin, |
@@ -3909,7 +3909,7 @@ | ||
3909 | 3909 | return; |
3910 | 3910 | } |
3911 | 3911 | |
3912 | - SetDialogFont(ts.SetupFName, | |
3912 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
3913 | 3913 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
3914 | 3914 | if ((*GetHostName)(HVTWin,&GetHNRec)) { |
3915 | 3915 | if ((GetHNRec.PortType==IdTCPIP) && LoadTTSET()) { |
@@ -4467,7 +4467,7 @@ | ||
4467 | 4467 | if (! LoadTTDLG()) { |
4468 | 4468 | return; |
4469 | 4469 | } |
4470 | - SetDialogFont(ts.SetupFName, | |
4470 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
4471 | 4471 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
4472 | 4472 | (*ChangeDirectory)(HVTWin,ts.FileDir); |
4473 | 4473 | FreeTTDLG(); |
@@ -4605,7 +4605,7 @@ | ||
4605 | 4605 | { |
4606 | 4606 | DWORD ret; |
4607 | 4607 | |
4608 | - SetDialogFont(ts.SetupFName, | |
4608 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
4609 | 4609 | ts.UILanguageFile, "Tera Term", "DLG_TAHOMA_FONT"); |
4610 | 4610 | CAddSettingPropSheetDlg CAddSetting(hInst, _T("Tera Term: Additional settings"), HVTWin); |
4611 | 4611 | ret = CAddSetting.DoModal(); |
@@ -4658,7 +4658,7 @@ | ||
4658 | 4658 | if (! LoadTTDLG()) { |
4659 | 4659 | return; |
4660 | 4660 | } |
4661 | - SetDialogFont(ts.SetupFName, | |
4661 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
4662 | 4662 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
4663 | 4663 | Ok = (*SetupTerminal)(HVTWin, &ts); |
4664 | 4664 | FreeTTDLG(); |
@@ -4680,7 +4680,7 @@ | ||
4680 | 4680 | return; |
4681 | 4681 | } |
4682 | 4682 | |
4683 | - SetDialogFont(ts.SetupFName, | |
4683 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
4684 | 4684 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
4685 | 4685 | strncpy_s(orgTitle, sizeof(orgTitle), ts.Title, _TRUNCATE); |
4686 | 4686 | Ok = (*SetupWin)(HVTWin, &ts); |
@@ -4733,15 +4733,16 @@ | ||
4733 | 4733 | CHOOSEFONTA cf; |
4734 | 4734 | BOOL result; |
4735 | 4735 | |
4736 | - // LogFont.lfHeight は point | |
4737 | - result = GetI18nLogfont("Tera Term", "DlgFont", &LogFont, 0, ts.SetupFName); | |
4738 | - if (result == TRUE) { | |
4739 | - // pixelに変換 | |
4740 | - LogFont.lfHeight = -GetFontPixelFromPoint(m_hWnd, LogFont.lfHeight); | |
4741 | - } else { | |
4736 | + // LOGFONT準備 | |
4737 | + memset(&LogFont, 0, sizeof(LogFont)); | |
4738 | + strncpy_s(LogFont.lfFaceName, sizeof(LogFont.lfFaceName), ts.DialogFontName, _TRUNCATE); | |
4739 | + LogFont.lfHeight = -GetFontPixelFromPoint(m_hWnd, ts.DialogFontPoint); | |
4740 | + LogFont.lfCharSet = ts.DialogFontCharSet; | |
4741 | + if (LogFont.lfFaceName[0] == 0) { | |
4742 | 4742 | GetMessageboxFont(&LogFont); |
4743 | 4743 | } |
4744 | 4744 | |
4745 | + // ダイアログ表示 | |
4745 | 4746 | memset(&cf, 0, sizeof(cf)); |
4746 | 4747 | cf.lStructSize = sizeof(cf); |
4747 | 4748 | cf.hwndOwner = HVTWin; |
@@ -4758,14 +4759,12 @@ | ||
4758 | 4759 | cf.hInstance = hInst; |
4759 | 4760 | HelpId = HlpSetupFont; |
4760 | 4761 | result = ChooseFontA(&cf); |
4762 | + | |
4761 | 4763 | if (result) { |
4762 | - char Temp[80]; | |
4763 | - int font_point = cf.iPointSize / 10; // point で保存する | |
4764 | - _snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%s,%d,%d", | |
4765 | - LogFont.lfFaceName, | |
4766 | - font_point, | |
4767 | - LogFont.lfCharSet); | |
4768 | - WritePrivateProfileStringA("Tera Term", "DlgFont", Temp, ts.SetupFName); | |
4764 | + // 設定 | |
4765 | + strncpy_s(ts.DialogFontName, sizeof(ts.DialogFontName), LogFont.lfFaceName, _TRUNCATE); | |
4766 | + ts.DialogFontPoint = cf.iPointSize / 10; | |
4767 | + ts.DialogFontCharSet = LogFont.lfCharSet; | |
4769 | 4768 | } |
4770 | 4769 | } |
4771 | 4770 |
@@ -4782,7 +4781,7 @@ | ||
4782 | 4781 | if (! LoadTTDLG()) { |
4783 | 4782 | return; |
4784 | 4783 | } |
4785 | - SetDialogFont(ts.SetupFName, | |
4784 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
4786 | 4785 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
4787 | 4786 | Ok = (*SetupKeyboard)(HVTWin, &ts); |
4788 | 4787 | FreeTTDLG(); |
@@ -4801,7 +4800,7 @@ | ||
4801 | 4800 | if (! LoadTTDLG()) { |
4802 | 4801 | return; |
4803 | 4802 | } |
4804 | - SetDialogFont(ts.SetupFName, | |
4803 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
4805 | 4804 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
4806 | 4805 | Ok = (*SetupSerialPort)(HVTWin, &ts); |
4807 | 4806 | FreeTTDLG(); |
@@ -4828,7 +4827,7 @@ | ||
4828 | 4827 | if (! LoadTTDLG()) { |
4829 | 4828 | return; |
4830 | 4829 | } |
4831 | - SetDialogFont(ts.SetupFName, | |
4830 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
4832 | 4831 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
4833 | 4832 | if ((*SetupTCPIP)(HVTWin, &ts)) { |
4834 | 4833 | TelUpdateKeepAliveInterval(); |
@@ -4842,7 +4841,7 @@ | ||
4842 | 4841 | if (! LoadTTDLG()) { |
4843 | 4842 | return; |
4844 | 4843 | } |
4845 | - SetDialogFont(ts.SetupFName, | |
4844 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
4846 | 4845 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
4847 | 4846 | if ((*SetupGeneral)(HVTWin,&ts)) { |
4848 | 4847 | ResetCharSet(); |
@@ -6228,7 +6227,7 @@ | ||
6228 | 6227 | if (! LoadTTDLG()) { |
6229 | 6228 | return; |
6230 | 6229 | } |
6231 | - SetDialogFont(ts.SetupFName, | |
6230 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
6232 | 6231 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
6233 | 6232 | (*WindowWindow)(HVTWin,&Close); |
6234 | 6233 | FreeTTDLG(); |
@@ -6277,7 +6276,7 @@ | ||
6277 | 6276 | if (! LoadTTDLG()) { |
6278 | 6277 | return; |
6279 | 6278 | } |
6280 | - SetDialogFont(ts.SetupFName, | |
6279 | + SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet, | |
6281 | 6280 | ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); |
6282 | 6281 | (*AboutDialog)(HVTWin); |
6283 | 6282 | FreeTTDLG(); |
@@ -74,6 +74,7 @@ | ||
74 | 74 | static void init() |
75 | 75 | { |
76 | 76 | char UILanguageFileRel[MAX_PATH]; |
77 | + LOGFONTA logfont; | |
77 | 78 | |
78 | 79 | GetHomeDir(hInst, HomeDir, sizeof(HomeDir)); |
79 | 80 | GetDefaultFName(HomeDir, "TERATERM.INI", SetupFName, sizeof(SetupFName)); |
@@ -97,7 +98,9 @@ | ||
97 | 98 | } |
98 | 99 | |
99 | 100 | // UILanguageFileの "Tera Term" セクション "DLG_SYSTEM_FONT" のフォントに設定する |
100 | - SetDialogFont(SetupFName, UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); | |
101 | + GetI18nLogfont("Tera Term", "DlgFont", &logfont, 0, SetupFName); | |
102 | + SetDialogFont(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet, | |
103 | + UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT"); | |
101 | 104 | } |
102 | 105 | |
103 | 106 | // TTMACRO main engine |
@@ -250,15 +250,37 @@ | ||
250 | 250 | FontName[0] = 0; |
251 | 251 | FontSize->x = 0; |
252 | 252 | FontSize->y = 0; |
253 | - FontCharSet = 0; | |
253 | + *FontCharSet = 0; | |
254 | 254 | } else { |
255 | 255 | GetNthString(Temp, 1, FontNameLen, FontName); |
256 | 256 | GetNthNum(Temp, 2, &(FontSize->x)); |
257 | 257 | GetNthNum(Temp, 3, &(FontSize->y)); |
258 | 258 | GetNthNum(Temp, 4, FontCharSet); |
259 | + // TODO ちゃんとパースする | |
259 | 260 | } |
260 | 261 | } |
261 | 262 | |
263 | +// フォント情報読み込み、3パラメータ版 | |
264 | +static void ReadFont3( | |
265 | + const char *Sect, const char *Key, const char *Default, const char *FName, | |
266 | + char *FontName, size_t FontNameLen, int *FontPoint, int *FontCharSet) | |
267 | +{ | |
268 | + char Temp[MAX_PATH]; | |
269 | + GetPrivateProfileString(Sect, Key, Default, | |
270 | + Temp, _countof(Temp), FName); | |
271 | + if (Temp[0] == 0) { | |
272 | + // デフォルトがセットされていない & iniにエントリーがない場合 | |
273 | + FontName[0] = 0; | |
274 | + *FontPoint = 0; | |
275 | + *FontCharSet = 0; | |
276 | + } else { | |
277 | + GetNthString(Temp, 1, FontNameLen, FontName); | |
278 | + GetNthNum(Temp, 2, FontPoint); | |
279 | + GetNthNum(Temp, 3, FontCharSet); | |
280 | + // TODO ちゃんとパースする | |
281 | + } | |
282 | +} | |
283 | + | |
262 | 284 | #define CYGTERM_FILE "cygterm.cfg" // CygTerm configuration file |
263 | 285 | #define CYGTERM_FILE_MAXLINE 100 |
264 | 286 |
@@ -2060,6 +2082,11 @@ | ||
2060 | 2082 | |
2061 | 2083 | // CygTerm Configuration File |
2062 | 2084 | ReadCygtermConfFile(ts); |
2085 | + | |
2086 | + // dialog font | |
2087 | + ReadFont3("Tera Term", "DlgFont", NULL, FName, | |
2088 | + ts->DialogFontName, sizeof(ts->DialogFontName), | |
2089 | + &ts->DialogFontPoint, &ts->DialogFontCharSet); | |
2063 | 2090 | } |
2064 | 2091 | |
2065 | 2092 | void PASCAL WriteIniFile(PCHAR FName, PTTSet ts) |
@@ -3401,6 +3428,13 @@ | ||
3401 | 3428 | |
3402 | 3429 | // CygTerm Configuration File |
3403 | 3430 | WriteCygtermConfFile(ts); |
3431 | + | |
3432 | + // dialog font | |
3433 | + _snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%s,%d,%d", | |
3434 | + ts->DialogFontName, | |
3435 | + ts->DialogFontPoint, | |
3436 | + ts->DialogFontCharSet); | |
3437 | + WritePrivateProfileStringA("Tera Term", "DlgFont", Temp, FName); | |
3404 | 3438 | } |
3405 | 3439 | |
3406 | 3440 | #define VTEditor "VT editor keypad" |
@@ -1638,12 +1638,13 @@ | ||
1638 | 1638 | |
1639 | 1639 | static void UTIL_SetDialogFont() |
1640 | 1640 | { |
1641 | - SetDialogFont(pvar->ts->SetupFName, pvar->ts->UILanguageFile, "TTSSH", "DLG_TAHOMA_FONT"); | |
1641 | + SetDialogFont(pvar->ts->DialogFontName, pvar->ts->DialogFontPoint, pvar->ts->DialogFontCharSet, | |
1642 | + pvar->ts->UILanguageFile, "TTSSH", "DLG_TAHOMA_FONT"); | |
1642 | 1643 | } |
1643 | 1644 | |
1644 | 1645 | static BOOL PASCAL TTXGetHostName(HWND parent, PGetHNRec rec) |
1645 | 1646 | { |
1646 | - SetDialogFont(pvar->ts->SetupFName, | |
1647 | + SetDialogFont(pvar->ts->DialogFontName, pvar->ts->DialogFontPoint, pvar->ts->DialogFontCharSet, | |
1647 | 1648 | pvar->ts->UILanguageFile, "TTSSH", "DLG_SYSTEM_FONT"); |
1648 | 1649 | return (BOOL) DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_HOSTDLG), |
1649 | 1650 | parent, TTXHostDlg, (LPARAM)rec); |