CHexDlgBkmMgr is now MFC free.

jovibor · Dec 23, 2024 · 7da7ed1 · 7da7ed1
1 parent e0cee8f
commit 7da7ed1
Show file tree

Hide file tree

Showing 12 changed files with 197 additions and 163 deletions.
diff --git a/HexCtrl/res/HexCtrl.rc b/HexCtrl/res/HexCtrl.rc
@@ -473,9 +473,7 @@ END
 
 IDD_HEXCTRL_BKMMGR AFX_DIALOG_LAYOUT
 BEGIN
-    0,
-    0, 0, 100, 100,
-    0, 100, 0, 0
+    0
 END
 
 IDD_HEXCTRL_GOTO AFX_DIALOG_LAYOUT
@@ -523,9 +521,7 @@ END
 
 IDD_HEXCTRL_CODEPAGE AFX_DIALOG_LAYOUT
 BEGIN
-    0,
-    0, 0, 100, 100,
-    0, 0, 0, 0
+    0
 END
 
 IDD_HEXCTRL_MODIFY AFX_DIALOG_LAYOUT

diff --git a/HexCtrl/src/CHexCtrl.cpp b/HexCtrl/src/CHexCtrl.cpp
@@ -105,8 +105,7 @@ auto CHexDlgAbout::OnCommand(const MSG& stMsg)->INT_PTR {
 
 auto CHexDlgAbout::OnCtlClrStatic(const MSG& stMsg)->INT_PTR
 {
-	const auto hWndFrom = reinterpret_cast<HWND>(stMsg.lParam);
-	if (hWndFrom == m_WndLink) {
+	if (const auto hWndFrom = reinterpret_cast<HWND>(stMsg.lParam); hWndFrom == m_WndLink) {
 		const auto hDC = reinterpret_cast<HDC>(stMsg.wParam);
 		::SetTextColor(hDC, RGB(0, 50, 250));
 		::SetBkColor(hDC, ::GetSysColor(COLOR_3DFACE));
@@ -980,10 +979,10 @@ auto CHexCtrl::GetWndHandle(EHexWnd eWnd, bool fCreate)const->HWND
 	case EHexWnd::WND_MAIN:
 		return m_hWnd;
 	case EHexWnd::DLG_BKMMGR:
-		if (!IsWindow(m_pDlgBkmMgr->m_hWnd) && fCreate) {
-			m_pDlgBkmMgr->Create(IDD_HEXCTRL_BKMMGR, CWnd::FromHandle(m_hWnd));
+		if (!IsWindow(m_pDlgBkmMgr->GetHWND()) && fCreate) {
+			m_pDlgBkmMgr->CreateDlg();
 		}
-		return m_pDlgBkmMgr->m_hWnd;
+		return m_pDlgBkmMgr->GetHWND();
 	case EHexWnd::DLG_DATAINTERP:
 		if (!IsWindow(m_pDlgDataInterp->m_hWnd) && fCreate) {
 			m_pDlgDataInterp->Create(IDD_HEXCTRL_DATAINTERP, CWnd::FromHandle(m_hWnd));

diff --git a/HexCtrl/src/CHexScroll.ixx b/HexCtrl/src/CHexScroll.ixx
@@ -993,8 +993,6 @@ auto CHexScroll::OnDestroy(const MSG& stMsg)->LRESULT
 	::DeleteObject(m_hBmpArrowLast);
 	m_hBmpArrowFirst = nullptr;
 	m_hBmpArrowLast = nullptr;
-	m_Wnd.Detach();
-	m_WndParent.Detach();
 	m_fCreated = false;
 
 	return wnd::DefMsgProc(stMsg);