Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2019-11-15 18:34:46 +0300
committerJulian Eisel <eiseljulian@gmail.com>2019-11-15 18:34:46 +0300
commit97f3626533b42c08f8e8e85b66e412b315a39430 (patch)
treeb7831d2c650a14247a6fb805a6fd25fe1d0026a5 /intern
parentf8354d492d4ab3a7514cf5bfb28452f83cb662c1 (diff)
parentf641c60530fbd8b79575685cfbdf332e673951b0 (diff)
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'intern')
-rw-r--r--intern/ghost/intern/GHOST_WindowWin32.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index e1c6aa1109c..fd9e0240b1b 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -270,10 +270,8 @@ GHOST_WindowWin32::GHOST_WindowWin32(GHOST_SystemWin32 *system,
}
if (dialog && parentwindow) {
- ::SetWindowLongPtr(m_hWnd,
- GWL_STYLE,
- WS_VISIBLE | WS_CHILD | WS_POPUPWINDOW | WS_CAPTION | WS_MAXIMIZEBOX |
- WS_SIZEBOX);
+ ::SetWindowLongPtr(
+ m_hWnd, GWL_STYLE, WS_VISIBLE | WS_POPUPWINDOW | WS_CAPTION | WS_MAXIMIZEBOX | WS_SIZEBOX);
::SetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT, (LONG_PTR)m_parentWindowHwnd);
::SetWindowPos(
m_hWnd, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);