Tera TermRevision: 8947
https://osdn.net/projects/ttssh2/scm/svn/commits/8947
Author: zmatsuo
Date: 2020-10-03 00:46:12 +0900 (Sat, 03 Oct 2020)
Log Message:
-----------
protodlg で PFileVar, PTTSet に依存しないようにした
Modified Paths:
--------------
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/protodlg.cpp
trunk/teraterm/teraterm/protodlg.h
-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2020-10-02 15:46:01 UTC (rev 8946)
+++ trunk/teraterm/teraterm/filesys.cpp 2020-10-02 15:46:12 UTC (rev 8947)
@@ -663,7 +663,11 @@
ProtoVar = NULL;
return FALSE;
}
- pd->Create(hInst, HVTWin, fv, &ts);
+ CProtoDlgInfo info;
+ info.UILanguageFile = ts.UILanguageFile;
+ info.HMainWin = fv->HMainWin;
+ pd->Create(hInst, HVTWin, &info);
+ fv->HWin = pd->m_hWnd;
(*ProtoInit)(ProtoId,FileVar,ProtoVar,&cv,&ts);
Modified: trunk/teraterm/teraterm/protodlg.cpp
===================================================================
--- trunk/teraterm/teraterm/protodlg.cpp 2020-10-02 15:46:01 UTC (rev 8946)
+++ trunk/teraterm/teraterm/protodlg.cpp 2020-10-02 15:46:12 UTC (rev 8947)
@@ -31,7 +31,7 @@
#include "teraterm.h"
#include "tt_res.h"
#include "tttypes.h"
-#include "ttftypes.h"
+//#include "ttftypes.h"
#include "ttlib.h"
#include "dlglib.h"
#include "protodlg.h"
@@ -39,17 +39,16 @@
/////////////////////////////////////////////////////////////////////////////
// CProtoDlg dialog
-BOOL CProtoDlg::Create(HINSTANCE hInstance, HWND hParent, PFileVar pfv, PTTSet pts)
+BOOL CProtoDlg::Create(HINSTANCE hInstance, HWND hParent, const CProtoDlgInfo *info)
{
- m_pts = pts;
- fv = pfv;
+ UILanguageFile = info->UILanguageFile;
+ HMainWin = info->HMainWin;
BOOL Ok = TTCDialog::Create(hInstance, hParent, IDD_PROTDLG);
- fv->HWin = GetSafeHwnd();
-
return Ok;
}
+
/////////////////////////////////////////////////////////////////////////////
// CProtoDlg message handler
@@ -63,7 +62,7 @@
{ IDC_PROT_ELAPSED, "DLG_PROT_ELAPSED" },
{ IDCANCEL, "BTN_CANCEL" },
};
- SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), m_pts->UILanguageFile);
+ SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), UILanguageFile);
return TRUE;
}
@@ -70,7 +69,7 @@
BOOL CProtoDlg::OnCancel()
{
- ::PostMessage(fv->HMainWin,WM_USER_PROTOCANCEL,0,0);
+ ::PostMessage(HMainWin,WM_USER_PROTOCANCEL,0,0);
return TRUE;
}
@@ -78,7 +77,7 @@
{
switch (LOWORD(wParam)) {
case IDCANCEL:
- ::PostMessage(fv->HMainWin,WM_USER_PROTOCANCEL,0,0);
+ ::PostMessage(HMainWin,WM_USER_PROTOCANCEL,0,0);
return TRUE;
default:
return (TTCDialog::OnCommand(wParam,lParam));
Modified: trunk/teraterm/teraterm/protodlg.h
===================================================================
--- trunk/teraterm/teraterm/protodlg.h 2020-10-02 15:46:01 UTC (rev 8946)
+++ trunk/teraterm/teraterm/protodlg.h 2020-10-02 15:46:12 UTC (rev 8947)
@@ -29,14 +29,19 @@
/* TERATERM.EXE, file-transfer-protocol dialog box */
#include "tmfc.h"
-#include "tttypes.h"
// CProtoDlg dialog
+
+typedef struct {
+ const char *UILanguageFile;
+ HWND HMainWin;
+} CProtoDlgInfo;
+
class CProtoDlg : public TTCDialog
{
public:
- BOOL Create(HINSTANCE hInstance, HWND hParent, PFileVar pfv, PTTSet pts);
+ BOOL Create(HINSTANCE hInstance, HWND hParent, const CProtoDlgInfo *info);
protected:
virtual BOOL OnCancel();
@@ -44,8 +49,8 @@
virtual BOOL OnInitDialog();
virtual BOOL PostNcDestroy();
private:
- PFileVar fv;
- TTTSet *m_pts;
+ const char *UILanguageFile;
+ HWND HMainWin;
};
typedef CProtoDlg *PProtoDlg;