CHexDlgModify is now MFC free. Child dialogs (tabs) keyboard navigati…

…on now works correctly. wnd::CWndTab class added.
jovibor · Dec 23, 2024 · e0cee8f · e0cee8f
1 parent 59bc632
commit e0cee8f
Show file tree

Hide file tree

Showing 6 changed files with 470 additions and 304 deletions.
diff --git a/HexCtrl/src/CHexCtrl.cpp b/HexCtrl/src/CHexCtrl.cpp
@@ -990,10 +990,10 @@ auto CHexCtrl::GetWndHandle(EHexWnd eWnd, bool fCreate)const->HWND
 		}
 		return m_pDlgDataInterp->m_hWnd;
 	case EHexWnd::DLG_MODIFY:
-		if (!IsWindow(m_pDlgModify->m_hWnd) && fCreate) {
-			m_pDlgModify->Create(IDD_HEXCTRL_MODIFY, CWnd::FromHandle(m_hWnd));
+		if (!IsWindow(m_pDlgModify->GetHWND()) && fCreate) {
+			m_pDlgModify->CreateDlg();
 		}
-		return m_pDlgModify->m_hWnd;
+		return m_pDlgModify->GetHWND();
 	case EHexWnd::DLG_SEARCH:
 		if (!IsWindow(m_pDlgSearch->m_hWnd) && fCreate) {
 			m_pDlgSearch->Create(IDD_HEXCTRL_SEARCH, CWnd::FromHandle(m_hWnd));

diff --git a/HexCtrl/src/Dialogs/CHexDlgDataInterp.cpp b/HexCtrl/src/Dialogs/CHexDlgDataInterp.cpp
@@ -150,7 +150,7 @@ BOOL CHexDlgDataInterp::ShowWindow(int nCmdShow)
 
 void CHexDlgDataInterp::UpdateData()
 {
-	if (!::IsWindowVisible(m_hWnd)) {
+	if (!::IsWindow(m_hWnd) || !::IsWindowVisible(m_hWnd)) {
 		return;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,7 +150,7 @@ BOOL CHexDlgDataInterp::ShowWindow(int nCmdShow) @@
     void CHexDlgDataInterp::UpdateData()
     {
-    	if (!::IsWindowVisible(m_hWnd)) {
+    	if (!::IsWindow(m_hWnd) || !::IsWindowVisible(m_hWnd)) {
     		return;
     	}
@@ Expand Down @@