mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: replace remaining NULL with nullptr (#40053)

Browse source 
refactor: use nullptr everywhere
This commit is contained in:
Milan Burda 2023-10-03 21:26:35 +02:00 • committed by GitHub
parent 9d0e6d09f0
commit 04b2ba84cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 98 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shell/browser/ui/views/electron_views_delegate_win.cc
View file

@ -15,14 +15,14 @@
namespace {
bool MonitorHasAutohideTaskbarForEdge(UINT edge, HMONITOR monitor) {
APPBARDATA taskbar_data = {sizeof(APPBARDATA), NULL, 0, edge};
APPBARDATA taskbar_data = {sizeof(APPBARDATA), nullptr, 0, edge};
taskbar_data.hWnd = ::GetForegroundWindow();
// MSDN documents an ABM_GETAUTOHIDEBAREX, which supposedly takes a monitor
// rect and returns autohide bars on that monitor. This sounds like a good
// idea for multi-monitor systems. Unfortunately, it appears to not work at
// least some of the time (erroneously returning NULL) and there's almost no
// online documentation or other sample code using it that suggests ways to
// least some of the time (erroneously returning nullptr) and there's almost
// no online documentation or other sample code using it that suggests ways to
// address this problem. We do the following:-
// 1. Use the ABM_GETAUTOHIDEBAR message. If it works, i.e. returns a valid
// window we are done.
@ -40,7 +40,7 @@ bool MonitorHasAutohideTaskbarForEdge(UINT edge, HMONITOR monitor) {
if (!(taskbar_state & ABS_AUTOHIDE))
return false;
new_taskbar_data.hWnd = ::FindWindow(L"Shell_TrayWnd", NULL);
new_taskbar_data.hWnd = ::FindWindow(L"Shell_TrayWnd", nullptr);
if (!::IsWindow(new_taskbar_data.hWnd))
return false;
@ -103,7 +103,7 @@ namespace electron {
HICON ViewsDelegate::GetDefaultWindowIcon() const {
// Use current exe's icon as default window icon.
return LoadIcon(GetModuleHandle(NULL),
return LoadIcon(GetModuleHandle(nullptr),
MAKEINTRESOURCE(1 /* IDR_MAINFRAME */));
}