Diff of /trunk/teraterm/teraterm/addsetting.cpp

OSDN > Find Software > Tera Term

 Browse Subversion Repository



/[ttssh2]/trunk/teraterm/teraterm/addsetting.cpp




Diff of /trunk/teraterm/teraterm/addsetting.cpp



 Parent Directory

|  Revision Log



|  Patch














revision 8766 by zmatsuo,
Sat May  2 13:24:54 2020 UTC




revision 8767 by zmatsuo,
Wed May  6 14:55:21 2020 UTC






#

Line 56 



Line 56 













56
 #include "i18n.h"
 #include "i18n.h"

















57
 #include "codeconv.h"
 #include "codeconv.h"

















58
 #include "layer_for_unicode.h"
 #include "layer_for_unicode.h"












59
 
 #include "coding_pp.h"












60
 
 

















61
 const mouse_cursor_t MouseCursor[] = {
 const mouse_cursor_t MouseCursor[] = {

















62
         {"ARROW", IDC_ARROW},
         {"ARROW", IDC_ARROW},











#

Line 1709 
 void CCygwinPropPageDlg::OnHelp()


Line 1710 
 void CCygwinPropPageDlg::OnHelp()












1710
 
 

















1711
 #define REWRITE_TEMPLATE        1
 #define REWRITE_TEMPLATE        1

















1712
 // quick hack :-(
 // quick hack :-(















1713


 static HINSTANCE ghInstance;


 HINSTANCE CAddSettingPropSheetDlg::ghInstance;













1714


 static class CAddSettingPropSheetDlg *gTTCPS;


 class CAddSettingPropSheetDlg *CAddSettingPropSheetDlg::gTTCPS;















1715
 
 

















1716
 int CALLBACK CAddSettingPropSheetDlg::PropSheetProc(HWND hWnd, UINT msg, LPARAM lp)
 int CALLBACK CAddSettingPropSheetDlg::PropSheetProc(HWND hWnd, UINT msg, LPARAM lp)

















1717
 {
 {











#

Line 1750 
 CAddSettingPropSheetDlg::CAddSettingProp


Line 1751 
 CAddSettingPropSheetDlg::CAddSettingProp












1751
         m_hParentWnd = hParentWnd;
         m_hParentWnd = hParentWnd;

















1752
         memset(&m_psh, 0, sizeof(m_psh));
         memset(&m_psh, 0, sizeof(m_psh));

















1753
         m_psh.dwSize = sizeof(m_psh);
         m_psh.dwSize = sizeof(m_psh);















1754


         m_psh.dwFlags = PSH_DEFAULT | PSH_NOAPPLYNOW | PSH_USECALLBACK; // | PSH_MODELESS


         m_psh.dwFlags = PSH_DEFAULT | PSH_NOAPPLYNOW | PSH_USECALLBACK;















1755
         //m_psh.dwFlags |= PSH_PROPTITLE;               // 「のプロパティー」が追加される?
         //m_psh.dwFlags |= PSH_PROPTITLE;               // 「のプロパティー」が追加される?

















1756
         m_psh.hwndParent = hParentWnd;
         m_psh.hwndParent = hParentWnd;

















1757
         m_psh.hInstance = hInstance;
         m_psh.hInstance = hInstance;

















1758
         m_psh.pfnCallback = PropSheetProc;
         m_psh.pfnCallback = PropSheetProc;

















1759
 
 












1760
 
         // CPP,tmfcのTTCPropertyPage派生クラスから生成












1761
         int i = 0;
         int i = 0;

















1762
         m_Page[i++] = new CGeneralPropPageDlg(hInstance);
         m_Page[i++] = new CGeneralPropPageDlg(hInstance);

















1763
         m_Page[i++] = new CSequencePropPageDlg(hInstance);
         m_Page[i++] = new CSequencePropPageDlg(hInstance);











#

Line 1767 
 CAddSettingPropSheetDlg::CAddSettingProp


Line 1769 
 CAddSettingPropSheetDlg::CAddSettingProp












1769
                 (GetKeyState(VK_SHIFT) & 0x8000) != 0 ) {
                 (GetKeyState(VK_SHIFT) & 0x8000) != 0 ) {

















1770
                 m_Page[i++] = new CDebugPropPage(hInstance);
                 m_Page[i++] = new CDebugPropPage(hInstance);

















1771
         }
         }















1772


         m_PageCount = i;


         m_PageCountCPP = i;













1773


 


         for (i = 0; i < m_PageCountCPP; i++) {
















         for (i = 0; i < m_PageCount; i++) {


 















1774
                 hPsp[i] = m_Page[i]->CreatePropertySheetPage();
                 hPsp[i] = m_Page[i]->CreatePropertySheetPage();

















1775
         }
         }

















1776
 
 












1777
 
         // TTCPropertyPage を使用しない PropertyPage







1778
 
         hPsp[m_PageCountCPP+0] = CodingPageCreate(hInstance, &ts);







1779
 
         m_PageCount = m_PageCountCPP+ 1;







1780
 
 












1781
         m_psh.nPages = m_PageCount;
         m_psh.nPages = m_PageCount;

















1782
         m_psh.phpage = hPsp;
         m_psh.phpage = hPsp;

















1783
 
 











#

Line 1785 
 CAddSettingPropSheetDlg::CAddSettingProp


Line 1790 
 CAddSettingPropSheetDlg::CAddSettingProp












1790
 CAddSettingPropSheetDlg::~CAddSettingPropSheetDlg()
 CAddSettingPropSheetDlg::~CAddSettingPropSheetDlg()

















1791
 {
 {

















1792
         free((void*)m_psh.pszCaption);
         free((void*)m_psh.pszCaption);















1793


         for (int i = 0; i < m_PageCount; i++) {


         for (int i = 0; i < m_PageCountCPP; i++) {















1794
                 delete m_Page[i];
                 delete m_Page[i];

















1795
         }
         }

















1796
 }
 }





























Legend:



Removed from v.8766
 


changed lines


 
Added in v.8767













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/trunk/teraterm/teraterm/addsetting.cpp
-revision 8766 by zmatsuo,
Sat May  2 13:24:54 2020 UTC
+revision 8767 by zmatsuo,
Wed May  6 14:55:21 2020 UTC
 Line 56
  #include "i18n.h"
  #include "codeconv.h"
  #include "layer_for_unicode.h"
+ #include "coding_pp.h"
  const mouse_cursor_t MouseCursor[] = {
          {"ARROW", IDC_ARROW},
-Line 1709 
 void CCygwinPropPageDlg::OnHelp()
+Line 1710 
 void CCygwinPropPageDlg::OnHelp()
  #define REWRITE_TEMPLATE        1
  // quick hack :-(
- static HINSTANCE ghInstance;
+ HINSTANCE CAddSettingPropSheetDlg::ghInstance;
- static class CAddSettingPropSheetDlg *gTTCPS;
+ class CAddSettingPropSheetDlg *CAddSettingPropSheetDlg::gTTCPS;
  int CALLBACK CAddSettingPropSheetDlg::PropSheetProc(HWND hWnd, UINT msg, LPARAM lp)
  {
-Line 1750 
 CAddSettingPropSheetDlg::CAddSettingProp
+Line 1751 
 CAddSettingPropSheetDlg::CAddSettingProp
          m_hParentWnd = hParentWnd;
          memset(&m_psh, 0, sizeof(m_psh));
          m_psh.dwSize = sizeof(m_psh);
-         m_psh.dwFlags = PSH_DEFAULT | PSH_NOAPPLYNOW | PSH_USECALLBACK; // | PSH_MODELESS
+         m_psh.dwFlags = PSH_DEFAULT | PSH_NOAPPLYNOW | PSH_USECALLBACK;
          //m_psh.dwFlags |= PSH_PROPTITLE;               // 「のプロパティー」が追加される?
          m_psh.hwndParent = hParentWnd;
          m_psh.hInstance = hInstance;
          m_psh.pfnCallback = PropSheetProc;
+         // CPP,tmfcのTTCPropertyPage派生クラスから生成
          int i = 0;
          m_Page[i++] = new CGeneralPropPageDlg(hInstance);
          m_Page[i++] = new CSequencePropPageDlg(hInstance);
-Line 1767 
 CAddSettingPropSheetDlg::CAddSettingProp
+Line 1769 
 CAddSettingPropSheetDlg::CAddSettingProp
                  (GetKeyState(VK_SHIFT) & 0x8000) != 0 ) {
                  m_Page[i++] = new CDebugPropPage(hInstance);
          }
-         m_PageCount = i;
+         m_PageCountCPP = i;
+         for (i = 0; i < m_PageCountCPP; i++) {
-         for (i = 0; i < m_PageCount; i++) {
                  hPsp[i] = m_Page[i]->CreatePropertySheetPage();
          }
+         // TTCPropertyPage を使用しない PropertyPage
+         hPsp[m_PageCountCPP+0] = CodingPageCreate(hInstance, &ts);
+         m_PageCount = m_PageCountCPP+ 1;
          m_psh.nPages = m_PageCount;
          m_psh.phpage = hPsp;
-Line 1785 
 CAddSettingPropSheetDlg::CAddSettingProp
+Line 1790 
 CAddSettingPropSheetDlg::CAddSettingProp
  CAddSettingPropSheetDlg::~CAddSettingPropSheetDlg()
  {
          free((void*)m_psh.pszCaption);
-         for (int i = 0; i < m_PageCount; i++) {
+         for (int i = 0; i < m_PageCountCPP; i++) {
                  delete m_Page[i];
          }
  }
 Legend:



Removed from v.8766
 


changed lines


 
Added in v.8767
 Legend:



Removed from v.8766
 


changed lines


 
Added in v.8767
-Removed from v.8766
+Added in v.8767
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Tera Term

Browse Subversion Repository