diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-02 21:22:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 21:22:45 +0200 |
| commit | 312bbb9600377548535424dd059f26d8934f2bb2 (patch) | |
| tree | f936e0a7ead3e12d9564d7903e6ac5aff61db6fc /platform | |
| parent | b50387c8bf2737e7f100c6c32350d97301a6f2a3 (diff) | |
| parent | 6324f578bdc18ac0fd86eccecc19d3ba9acdadfd (diff) | |
Merge pull request #37525 from lupoDharkael/replace-0L
Replace 0L with a casted nullptr
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/windows/display_server_windows.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index c637d3588a..ebe9a7d27a 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -734,7 +734,7 @@ void DisplayServerWindows::window_set_transient(WindowID p_window, WindowID p_pa wd_window.transient_parent = INVALID_WINDOW_ID; wd_parent.transient_children.erase(p_window); - SetWindowLongPtr(wd_window.hWnd, GWLP_HWNDPARENT, 0L); + SetWindowLongPtr(wd_window.hWnd, GWLP_HWNDPARENT, (LONG_PTR) nullptr); } else { ERR_FAIL_COND(!windows.has(p_parent)); ERR_FAIL_COND_MSG(wd_window.transient_parent != INVALID_WINDOW_ID, "Window already has a transient parent"); |