diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-11-06 01:07:22 -0500 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-11-06 01:12:36 -0500 |
| commit | b8b8a7127e3040582c5937fd2dff4c99e94a3b57 (patch) | |
| tree | 849c2d29b6fb90100f31de20340d5f0ef4238edf /platform/windows/native_menu_windows.cpp | |
| parent | d14f2a31558686f00c4f351ea659918576711a7a (diff) | |
| parent | 87318a2fb7fffeb72adca934e31915be077c3d1f (diff) | |
| download | redot-engine-b8b8a7127e3040582c5937fd2dff4c99e94a3b57.tar.gz | |
Merge commit godotengine/godot@87318a2fb7fffeb72adca934e31915be077c3d1f
Diffstat (limited to 'platform/windows/native_menu_windows.cpp')
| -rw-r--r-- | platform/windows/native_menu_windows.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/windows/native_menu_windows.cpp b/platform/windows/native_menu_windows.cpp index 10af1f5a33..92cbaec3fc 100644 --- a/platform/windows/native_menu_windows.cpp +++ b/platform/windows/native_menu_windows.cpp @@ -160,7 +160,7 @@ Size2 NativeMenuWindows::get_size(const RID &p_rid) const { int count = GetMenuItemCount(md->menu); for (int i = 0; i < count; i++) { RECT rect; - if (GetMenuItemRect(NULL, md->menu, i, &rect)) { + if (GetMenuItemRect(nullptr, md->menu, i, &rect)) { size.x = MAX(size.x, rect.right - rect.left); size.y += rect.bottom - rect.top; } @@ -994,7 +994,7 @@ void NativeMenuWindows::set_item_submenu(const RID &p_rid, int p_idx, const RID if (p_submenu_rid.is_valid()) { item.hSubMenu = md_sub->menu; } else { - item.hSubMenu = 0; + item.hSubMenu = nullptr; } SetMenuItemInfoW(md->menu, p_idx, true, &item); } @@ -1097,7 +1097,7 @@ void NativeMenuWindows::set_item_icon(const RID &p_rid, int p_idx, const Ref<Tex item_data->bmp = _make_bitmap(item_data->img); } else { item_data->img = Ref<Image>(); - item_data->bmp = 0; + item_data->bmp = nullptr; } item.hbmpItem = item_data->bmp; SetMenuItemInfoW(md->menu, p_idx, true, &item); |