OSDN -- 오픈 소스 소프트웨어 개발 및 다운로드
Translation Status of 한국말 translation status for ko

[Ttssh2-commit] [7933] 印字中止ダイアログが出なくなっていたので修正

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2019年 8月 10日 (土) 15:27:44 JST 

Revision: 7933
          https://osdn.net/projects/ttssh2/scm/svn/commits/7933
Author:   zmatsuo
Date:     2019-08-10 15:27:43 +0900 (Sat, 10 Aug 2019)
Log Message:
-----------
印字中止ダイアログが出なくなっていたので修正

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/teraprn.cpp

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2019-08-09 15:39:55 UTC (rev 7932)
+++ trunk/doc/en/html/about/history.html	2019-08-10 06:27:43 UTC (rev 7933)
@@ -36,7 +36,7 @@
   <li>Changes
     <ul>
       <li>MARCO: The <a href="../macro/command/fileopen.html">fileopen</a> command does not cause an error when a file can not be opened. Reverted changes in Ver 4.102.</li>
-	  <--li><a href="../macro/command/filetruncate.html">filetruncate</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xAA\x82Ńt\x83@\x83\x8B\x82\xAA\x8AJ\x82\xAF\x82Ȃ\xA2\x8Fꍇ\x81E\x83t\x83@\x83C\x83\x8B\x83T\x83C\x83Y\x82̕ύX\x82Ɏ\xB8\x94s\x82\xB5\x82\xBD\x8Fꍇ\x83G\x83\x89\x81[\x82ɂȂ\xE7\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B</li-->
+      <--li><a href="../macro/command/filetruncate.html">filetruncate</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xAA\x82Ńt\x83@\x83\x8B\x82\xAA\x8AJ\x82\xAF\x82Ȃ\xA2\x8Fꍇ\x81E\x83t\x83@\x83C\x83\x8B\x83T\x83C\x83Y\x82̕ύX\x82Ɏ\xB8\x94s\x82\xB5\x82\xBD\x8Fꍇ\x83G\x83\x89\x81[\x82ɂȂ\xE7\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B</li-->
       <li>Unspecified string font in IME uses your defined font.</li>
     </ul>
   </li>
@@ -48,8 +48,9 @@
       <li>Displayed unspecified string font in IME changes, when you open the font setting dialog.</li>
       <!--li><a href="../macro/command/filecopy.html">filecopy</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82̌\x8B\x89ʂ\xAA result \x83V\x83X\x83e\x83\x80\x95ϐ\x94\x82Ɋi\x94[\x82\xB3\x82\xEA\x82Ȃ\xA2\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li-->
       <li><!-- [File]/[Send file..]\x82\xA9\x82\xE7\x91傫\x82ȃt\x83@\x83C\x83\x8B\x82\xF0\x82\xA4\x82܂\xAD\x91\x97\x90M\x82ł\xAB\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.103\x82ł̃G\x83\x93\x83o\x83O\x81B --></li>
-	  <!--li><a href="../macro/command/filelock.html">filelock</a>, <a href="../macro/command/fileunlock.html">fileunlock</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xAA\x8F\xED\x82Ɏ\xB8\x94s\x82\xB5\x82Ă\xA2\x82\xBD\x81B4.101\x82ł̃G\x83\x93\x83o\x83O\x81B</li-->
+      <!--li><a href="../macro/command/filelock.html">filelock</a>, <a href="../macro/command/fileunlock.html">fileunlock</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xAA\x8F\xED\x82Ɏ\xB8\x94s\x82\xB5\x82Ă\xA2\x82\xBD\x81B4.101\x82ł̃G\x83\x93\x83o\x83O\x81B</li-->
       <!--li><a href="../macro/command/filestrseek2.html">filestrseek2</a>\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x83t\x83@\x83C\x83\x8B\x82\xCC1\x83o\x83C\x83g\x96ڂ\xAA\x88\xEA\x92v\x82\xB5\x82\xBD\x82Ƃ\xAB\x81A\x83t\x83@\x83C\x83\x8B\x83|\x83C\x83\x93\x83^\x82\xAA\x90擪\x82ɂȂ\xC1\x82Ă\xA2\x82Ȃ\xA9\x82\xC1\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.101\x82ł̃G\x83\x93\x83o\x83O\x81B</li-->
+      <!--li>\x88󎚒\x86\x8E~\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA\x8Fo\x82Ȃ\xAD\x82Ȃ\xC1\x82Ă\xA2\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.103\x82ł̃G\x83\x93\x83o\x83O\x81B</li-->
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2019-08-09 15:39:55 UTC (rev 7932)
+++ trunk/doc/ja/html/about/history.html	2019-08-10 06:27:43 UTC (rev 7933)
@@ -36,7 +36,7 @@
   <li>\x95ύX
     <ul>
       <li><a href="../macro/command/fileopen.html">fileopen</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x83t\x83@\x83C\x83\x8B\x82\xAA\x8AJ\x82\xAF\x82Ȃ\xA2\x8Fꍇ\x82ɃG\x83\x89\x81[\x82ɂȂ\xE7\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81BVer 4.102\x82ł̕ύX\x82\xF0\x8C\xB3\x82ɖ߂\xB5\x82\xBD\x81B</li>
-	  <li><a href="../macro/command/filetruncate.html">filetruncate</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xAA\x82Ńt\x83@\x83\x8B\x82\xAA\x8AJ\x82\xAF\x82Ȃ\xA2\x8Fꍇ\x81E\x83t\x83@\x83C\x83\x8B\x83T\x83C\x83Y\x82̕ύX\x82Ɏ\xB8\x94s\x82\xB5\x82\xBD\x8Fꍇ\x83G\x83\x89\x81[\x82ɂȂ\xE7\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      <li><a href="../macro/command/filetruncate.html">filetruncate</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xAA\x82Ńt\x83@\x83\x8B\x82\xAA\x8AJ\x82\xAF\x82Ȃ\xA2\x8Fꍇ\x81E\x83t\x83@\x83C\x83\x8B\x83T\x83C\x83Y\x82̕ύX\x82Ɏ\xB8\x94s\x82\xB5\x82\xBD\x8Fꍇ\x83G\x83\x89\x81[\x82ɂȂ\xE7\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
       <li>IME\x82̖\xA2\x8Am\x92蕶\x8E\x9A\x82̃t\x83H\x83\x93\x83g\x82\xAA\x8Ew\x92\xE8\x83t\x83H\x83\x93\x83g\x82Ɠ\xAF\x88\xEA\x82ɂȂ\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
@@ -48,8 +48,9 @@
       <li>IME\x82̖\xA2\x8Am\x92蕶\x8E\x9A\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ă\xA2\x82\xE9\x8F\xF3\x91ԂŃt\x83H\x83\x93\x83g\x91I\x91\xF0\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x82\xC6IME\x82̃t\x83H\x83\x93\x83g\x82\xAA\x95ω\xBB\x82\xB7\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li><a href="../macro/command/filecopy.html">filecopy</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82̌\x8B\x89ʂ\xAA result \x83V\x83X\x83e\x83\x80\x95ϐ\x94\x82Ɋi\x94[\x82\xB3\x82\xEA\x82Ȃ\xA2\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>[File]/[Send file..]\x82\xA9\x82\xE7\x91傫\x82ȃt\x83@\x83C\x83\x8B\x82\xF0\x82\xA4\x82܂\xAD\x91\x97\x90M\x82ł\xAB\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.103\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
-	  <li><a href="../macro/command/filelock.html">filelock</a>, <a href="../macro/command/fileunlock.html">fileunlock</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xAA\x8F\xED\x82Ɏ\xB8\x94s\x82\xB5\x82Ă\xA2\x82\xBD\x81B4.101\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
+      <li><a href="../macro/command/filelock.html">filelock</a>, <a href="../macro/command/fileunlock.html">fileunlock</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xAA\x8F\xED\x82Ɏ\xB8\x94s\x82\xB5\x82Ă\xA2\x82\xBD\x81B4.101\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
       <li><a href="../macro/command/filestrseek2.html">filestrseek2</a>\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x83t\x83@\x83C\x83\x8B\x82\xCC1\x83o\x83C\x83g\x96ڂ\xAA\x88\xEA\x92v\x82\xB5\x82\xBD\x82Ƃ\xAB\x81A\x83t\x83@\x83C\x83\x8B\x83|\x83C\x83\x93\x83^\x82\xAA\x90擪\x82ɂȂ\xC1\x82Ă\xA2\x82Ȃ\xA9\x82\xC1\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.101\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
+      <li>\x88󎚒\x86\x8E~\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA\x8Fo\x82Ȃ\xAD\x82Ȃ\xC1\x82Ă\xA2\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.103\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
     </ul>
   </li>
 

Modified: trunk/teraterm/teraterm/teraprn.cpp
===================================================================
--- trunk/teraterm/teraterm/teraprn.cpp	2019-08-09 15:39:55 UTC (rev 7932)
+++ trunk/teraterm/teraterm/teraprn.cpp	2019-08-10 06:27:43 UTC (rev 7933)
@@ -78,7 +78,7 @@
 static HWND HPrnAbortDlg;
 
 /* Print Abortion Call Back Function */
-BOOL CALLBACK PrnAbortProc(HDC PDC, int Code)
+static BOOL CALLBACK PrnAbortProc(HDC PDC, int Code)
 {
 	MSG m;
 
@@ -128,7 +128,7 @@
 {
 	DOCINFOA Doc;
 	char DocName[50];
-	CWnd* pParent;
+	HWND hParent;
 
 	Printing = FALSE;
 	PrintAbortFlag = FALSE;
@@ -138,12 +138,12 @@
 		return FALSE;
 	}
 	if (ActiveWin==IdVT) {
-		pParent = (CWnd*)pVTWin;
+		hParent = HVTWin;
 	}
 	else {
-		pParent = (CWnd*)pTEKWin;
+		hParent = HTEKWin;
 	}
-	PrnAbortDlg->Create(hInst, pParent->GetSafeHwnd(),&PrintAbortFlag,&ts);
+	PrnAbortDlg->Create(hInst,hParent,&PrintAbortFlag,&ts);
 	HPrnAbortDlg = PrnAbortDlg->GetSafeHwnd();
 
 	SetAbortProc(PrintDC,PrnAbortProc);
@@ -559,7 +559,7 @@
 
 void PrintFileDirect()
 {
-	CWnd* pParent;
+	HWND hParent;
 
 	PrnAbortDlg = new CPrnAbortDlg();
 	if (PrnAbortDlg==NULL) {
@@ -568,12 +568,12 @@
 		return;
 	}
 	if (ActiveWin==IdVT) {
-		pParent = (CWnd*)pVTWin;
+		hParent = HVTWin;
 	}
 	else {
-		pParent = (CWnd*)pTEKWin;
+		hParent = HTEKWin;
 	}
-	PrnAbortDlg->Create(hInst, pParent->GetSafeHwnd(),&PrintAbortFlag,&ts);
+	PrnAbortDlg->Create(hInst,hParent,&PrintAbortFlag,&ts);
 	HPrnAbortDlg = PrnAbortDlg->GetSafeHwnd();
 
 	HPrnFile = _lopen(PrnFName,OF_READ);

Ttssh2-commit メーリングリストの案内
Back to archive index