・ログウィンドウを閉じると開けないバグを修正

amate · Feb 6, 2016 · c0dd56e · c0dd56e
1 parent 4a5d092
commit c0dd56e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/Proxydomo/AppConst.h b/Proxydomo/AppConst.h
@@ -39,7 +39,7 @@
 #endif
 
 /// アプリケーションのバージョン
-#define APP_VERSION	_T("1.80")
+#define APP_VERSION	_T("1.80.1")
 
 
 

diff --git a/Proxydomo/LogViewWindow.cpp b/Proxydomo/LogViewWindow.cpp
@@ -481,11 +481,6 @@ BOOL CLogViewWindow::OnInitDialog(CWindow wndFocus, LPARAM lInitParam)
 	return 0;
 }
 
-void CLogViewWindow::OnClose()
-{
-	DestroyWindow();
-}
-
 void CLogViewWindow::OnDestroy()
 {
 	CLog::RemoveLogTrace(this);

diff --git a/Proxydomo/LogViewWindow.h b/Proxydomo/LogViewWindow.h
@@ -45,7 +45,10 @@ class CLogViewWindow :
 public:
 	enum { IDD = IDD_LOGVIEW };
 
-	enum { WM_APPENDTEXT = WM_APP + 100 };
+	enum { 
+		WM_APPENDTEXT = WM_APP + 100,
+		WM_EXECDESTROYWINDOW = WM_APP + 101,
+	};
 
 	CLogViewWindow();
 	~CLogViewWindow();
@@ -99,8 +102,8 @@ class CLogViewWindow :
 
 	BEGIN_MSG_MAP_EX( CLogViewWindow )
 		MSG_WM_INITDIALOG( OnInitDialog )
-		MSG_WM_CLOSE( OnClose )
 		MSG_WM_DESTROY( OnDestroy )
+		MESSAGE_HANDLER_EX(WM_EXECDESTROYWINDOW, OnExecDestroyWindow)
 
 		COMMAND_ID_HANDLER_EX( IDCANCEL, OnCancel )
 		COMMAND_ID_HANDLER_EX(IDC_BUTTON_CLEAR, OnClear)
@@ -130,9 +133,13 @@ class CLogViewWindow :
 	// void OnCommandIDHandlerEX(UINT uNotifyCode, int nID, CWindow wndCtl)
 
 	BOOL OnInitDialog(CWindow wndFocus, LPARAM lInitParam);
-	void OnClose();
 	void OnDestroy();
 
+	LRESULT OnExecDestroyWindow(UINT uMsg, WPARAM wParam, LPARAM lParam) {
+		DestroyWindow();
+		return 0;
+	}
+
 	void OnCancel(UINT uNotifyCode, int nID, CWindow wndCtl);
 	void OnClear(UINT uNotifyCode, int nID, CWindow wndCtl);
 	void OnViewConnectionMonitor(UINT uNotifyCode, int nID, CWindow wndCtl);

diff --git a/Proxydomo/MainDlg.cpp b/Proxydomo/MainDlg.cpp
@@ -196,7 +196,7 @@ LRESULT CMainDlg::OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/,
 
 	_SaveMainDlgWindowPos();
 
-	m_logView.PostMessage(WM_CLOSE);
+	m_logView.PostMessage(CLogViewWindow::WM_EXECDESTROYWINDOW);
 	m_threadLogView.join();
 
 	return 0;