diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-25 17:56:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-25 17:56:10 +0100 |
| commit | ba6115f56f066621a20fa545ddd67721afd35523 (patch) | |
| tree | 418b724d4f318d24dc8e5183e6b252922f85f149 /xorg-server/hw/xwin/winmultiwindowwndproc.c | |
| parent | eb71c0f23999d1cc156e1821d73634ec79621fc2 (diff) | |
| parent | e0927d908a12c9c140458c355b29b884a7705f2d (diff) | |
| download | vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.tar.gz vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.tar.bz2 vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitInput.c
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmsgwindow.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
Diffstat (limited to 'xorg-server/hw/xwin/winmultiwindowwndproc.c')
| -rw-r--r-- | xorg-server/hw/xwin/winmultiwindowwndproc.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c index 9ca27e5ff..624c96fca 100644 --- a/xorg-server/hw/xwin/winmultiwindowwndproc.c +++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c @@ -830,7 +830,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_CLOSE: - /* Removep AppUserModelID property */ + /* Remove AppUserModelID property */ winSetAppUserModelID(hwnd, NULL); /* Branch on if the window was killed in X already */ if (pWinPriv->fXKilled) { @@ -865,8 +865,9 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) case WM_MOVE: /* Adjust the X Window to the moved Windows window */ - if (!hasEnteredSizeMove) winAdjustXWindow (pWin, hwnd); - /* else: Wait for WM_EXITSIZEMOVE */ + if (!hasEnteredSizeMove) + winAdjustXWindow(pWin, hwnd); + /* else: Wait for WM_EXITSIZEMOVE */ return 0; case WM_SHOWWINDOW: @@ -1017,14 +1018,14 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_ENTERSIZEMOVE: - hasEnteredSizeMove = TRUE; - return 0; + hasEnteredSizeMove = TRUE; + return 0; case WM_EXITSIZEMOVE: - /* Adjust the X Window to the moved Windows window */ - hasEnteredSizeMove = FALSE; - winAdjustXWindow (pWin, hwnd); - return 0; + /* Adjust the X Window to the moved Windows window */ + hasEnteredSizeMove = FALSE; + winAdjustXWindow(pWin, hwnd); + return 0; case WM_SIZE: /* see dix/window.c */ |