• R/O
  • SSH
  • HTTPS

ttssh2: 提交


Commit MetaInfo

修订版8567 (tree)
时间2020-02-27 01:26:42
作者zmatsuo

Log Message

印字中ダイアログ整理

- CreateDialogIndirectParam() -> TTCreateDialogParam()

更改概述

差异

--- trunk/teraterm/common/dlglib.h (revision 8566)
+++ trunk/teraterm/common/dlglib.h (revision 8567)
@@ -1,6 +1,6 @@
11 /*
22 * Copyright (C) 1994-1998 T. Teranishi
3- * (C) 2005-2019 TeraTerm Project
3+ * (C) 2005-2020 TeraTerm Project
44 * All rights reserved.
55 *
66 * Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,12 @@
7171 HWND hWndParent,
7272 DLGPROC lpDialogFunc,
7373 LPARAM lParamInit);
74+HWND TTCreateDialogParam(
75+ HINSTANCE hInstance,
76+ LPCTSTR lpTemplateName,
77+ HWND hWndParent,
78+ DLGPROC lpDialogFunc,
79+ LPARAM lParamInit);
7480 HWND TTCreateDialog(
7581 HINSTANCE hInstance,
7682 LPCTSTR lpTemplateName,
--- trunk/teraterm/common/dlglib_cpp.cpp (revision 8566)
+++ trunk/teraterm/common/dlglib_cpp.cpp (revision 8567)
@@ -64,6 +64,20 @@
6464 }
6565
6666 /**
67+ * CreateDialogParam() 互換関数
68+ */
69+HWND TTCreateDialogParam(
70+ HINSTANCE hInstance,
71+ LPCTSTR lpTemplateName,
72+ HWND hWndParent,
73+ DLGPROC lpDialogFunc,
74+ LPARAM lParamInit)
75+{
76+ return TTCreateDialogIndirectParam(hInstance, lpTemplateName,
77+ hWndParent, lpDialogFunc, lParamInit);
78+}
79+
80+/**
6781 * CreateDialog() 互換関数
6882 */
6983 HWND TTCreateDialog(
@@ -72,8 +86,8 @@
7286 HWND hWndParent,
7387 DLGPROC lpDialogFunc)
7488 {
75- return TTCreateDialogIndirectParam(hInstance, lpTemplateName,
76- hWndParent, lpDialogFunc, NULL);
89+ return TTCreateDialogParam(hInstance, lpTemplateName,
90+ hWndParent, lpDialogFunc, NULL);
7791 }
7892
7993 /**
--- trunk/teraterm/teraterm/prnabort.cpp (revision 8566)
+++ trunk/teraterm/teraterm/prnabort.cpp (revision 8567)
@@ -40,7 +40,7 @@
4040 LRESULT CALLBACK CPrnAbortDlg::OnDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
4141 {
4242 static const DlgTextInfo TextInfos[] = {
43- { IDC_PRNABORT_PRINTING, "DLG_PRNABORT_PRINTING" },
43+ { IDC_PRNABORT_PRINTING, "DLG_PRNABORT_PRINTING" },
4444 { IDCANCEL, "BTN_CANCEL" },
4545 };
4646
@@ -84,11 +84,9 @@
8484
8585 SetDialogFont(m_ts->DialogFontName, m_ts->DialogFontPoint, m_ts->DialogFontCharSet,
8686 m_ts->UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
87- DLGTEMPLATE *lpTemplate = TTGetDlgTemplate(hInstance, MAKEINTRESOURCE(IDD_PRNABORTDLG));
88- HWND hWnd = ::CreateDialogIndirectParam(
89- hInstance, lpTemplate, hParent,
87+ HWND hWnd = TTCreateDialogParam(
88+ hInstance, MAKEINTRESOURCE(IDD_PRNABORTDLG), hParent,
9089 (DLGPROC)OnDlgProc, (LPARAM)this);
91- free(lpTemplate);
9290 if (hWnd == NULL)
9391 {
9492 return FALSE;
Show on old repository browser