Tera TermRevision: 7817
https://osdn.net/projects/ttssh2/scm/svn/commits/7817
Author: zmatsuo
Date: 2019-06-28 01:51:39 +0900 (Fri, 28 Jun 2019)
Log Message:
-----------
PROPSHEETPAGE_V1 を明示的に使用するようにした
Modified Paths:
--------------
trunk/teraterm/common/tmfc.cpp
trunk/teraterm/common/tmfc.h
trunk/teraterm/teraterm/addsetting.cpp
-------------- next part --------------
Modified: trunk/teraterm/common/tmfc.cpp
===================================================================
--- trunk/teraterm/common/tmfc.cpp 2019-06-27 16:26:50 UTC (rev 7816)
+++ trunk/teraterm/common/tmfc.cpp 2019-06-27 16:51:39 UTC (rev 7817)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 TeraTerm Project
+ * Copyright (C) 2018-2019 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -640,7 +640,6 @@
m_psp.dwFlags |= PSP_DLGINDIRECT;
m_psp.pResource = TTGetDlgTemplate(inst, m_psp.pszTemplate);
#endif
-// m_psp.pfnDlgProc = (DLGPROC)Proc;
m_psp.pfnDlgProc = Proc;
m_psp.lParam = (LPARAM)this;
Modified: trunk/teraterm/common/tmfc.h
===================================================================
--- trunk/teraterm/common/tmfc.h 2019-06-27 16:26:50 UTC (rev 7816)
+++ trunk/teraterm/common/tmfc.h 2019-06-27 16:51:39 UTC (rev 7817)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 TeraTerm Project
+ * Copyright (C) 2018-2019 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -178,8 +178,10 @@
virtual void OnOK();
virtual BOOL OnCommand(WPARAM wp, LPARAM lp);
virtual HBRUSH OnCtlColor(HDC hDC, HWND hWnd);
-
- PROPSHEETPAGE m_psp;
+ PROPSHEETPAGE *GetPropSheetPage() const { return (PROPSHEETPAGE *)&m_psp; };
+protected:
+ PROPSHEETPAGE_V1 m_psp;
+private:
static INT_PTR CALLBACK Proc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp);
static UINT CALLBACK PropSheetPageProc(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp);
TTCPropertySheet *m_pSheet;
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp 2019-06-27 16:26:50 UTC (rev 7816)
+++ trunk/teraterm/teraterm/addsetting.cpp 2019-06-27 16:51:39 UTC (rev 7817)
@@ -1490,12 +1490,12 @@
m_LogPage = new CLogPropPageDlg(hInstance, this);
m_CygwinPage = new CCygwinPropPageDlg(hInstance, this);
- hPsp[0] = CreatePropertySheetPage(&m_GeneralPage->m_psp);
- hPsp[1] = CreatePropertySheetPage(&m_SequencePage->m_psp);
- hPsp[2] = CreatePropertySheetPage(&m_CopypastePage->m_psp);
- hPsp[3] = CreatePropertySheetPage(&m_VisualPage->m_psp);
- hPsp[4] = CreatePropertySheetPage(&m_LogPage->m_psp);
- hPsp[5] = CreatePropertySheetPage(&m_CygwinPage->m_psp);
+ hPsp[0] = CreatePropertySheetPage(m_GeneralPage->GetPropSheetPage());
+ hPsp[1] = CreatePropertySheetPage(m_SequencePage->GetPropSheetPage());
+ hPsp[2] = CreatePropertySheetPage(m_CopypastePage->GetPropSheetPage());
+ hPsp[3] = CreatePropertySheetPage(m_VisualPage->GetPropSheetPage());
+ hPsp[4] = CreatePropertySheetPage(m_LogPage->GetPropSheetPage());
+ hPsp[5] = CreatePropertySheetPage(m_CygwinPage->GetPropSheetPage());
m_psh.nPages = 6;
m_psh.phpage = hPsp;