From df42108d1f4c1628fe62874e48e87282fab6bc65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= Date: Wed, 20 Jul 2022 02:12:32 +0200 Subject: Fix bug in and rename throw_nil, warn_nil. In warn_nil, the return value was undefined on exception -- I think. While informative, the names throw_nil and warn_nil don't work very well in conditionals: if (warn_nil(...)) g(); sounds like g should be called if f returns nil and a warning is issued. But it is actually the other way around; g is called if f is successful. if (prefer(...)) g(); sounds less like that. --- c/listview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'c/listview.cpp') diff --git a/c/listview.cpp b/c/listview.cpp index fa99793..056a17b 100644 --- a/c/listview.cpp +++ b/c/listview.cpp @@ -13,7 +13,7 @@ ListView::ListView(const HWND hWndParent, const HMENU hMenu, const DWORD dwStyle { m_hWndParent = hWndParent; m_bHeader = !(dwStyle & LVS_NOCOLUMNHEADER); - hWnd = throw_nil( + hWnd = require( WS_EX_CLIENTEDGE, WC_LISTVIEW, TEXT(""), @@ -21,7 +21,7 @@ ListView::ListView(const HWND hWndParent, const HMENU hMenu, const DWORD dwStyle 0, 0, 0, 0, m_hWndParent, hMenu, GetModuleHandle(NULL), this); - if (throw_nil(hWnd, TEXT("this"), (HANDLE)this)) + if (require(hWnd, TEXT("this"), (HANDLE)this)) m_prevProc = (WNDPROC)SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)::WndProc); -- cgit v1.2.3