diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-17 20:50:23 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-17 20:50:23 +0200 |
| commit | 1715c2a33632b333f8e8e581ef23ea5fe0234edd (patch) | |
| tree | f2f9ddca0f4940edd845d71a5bfd74c8a09ba633 /libvo/w32_common.c | |
| parent | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (diff) | |
| parent | 409bb1c5daba69aac788ce5065d05b8ea8441cfd (diff) | |
| download | mpv-1715c2a33632b333f8e8e581ef23ea5fe0234edd.tar.bz2 mpv-1715c2a33632b333f8e8e581ef23ea5fe0234edd.tar.xz | |
Merge svn changes up to r27949
Conflicts:
common.mak
libvo/vo_xv.c
libvo/x11_common.c
libvo/x11_common.h
stream/cache2.c
Diffstat (limited to 'libvo/w32_common.c')
| -rw-r--r-- | libvo/w32_common.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/libvo/w32_common.c b/libvo/w32_common.c index 1346f50a7f..ff5312af6a 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -46,8 +46,6 @@ static BOOL (WINAPI* myEnumDisplayMonitors)(HDC, LPCRECT, MONITORENUMPROC, LPARA static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { RECT r; POINT p; - if (WinID < 0 || message == WM_PAINT || message == WM_ERASEBKGND || - message == WM_SIZE) { switch (message) { case WM_ERASEBKGND: // no need to erase background seperately return 1; @@ -150,19 +148,6 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l break; } } - } else switch (message) { - case WM_MOUSEMOVE: - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_LBUTTONDBLCLK: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_MBUTTONDBLCLK: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - case WM_RBUTTONDBLCLK: - SendNotifyMessage(WinID, message, wParam, lParam); - } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -397,6 +382,7 @@ int vo_w32_init(void) { vo_window = CreateWindowEx(WS_EX_NOPARENTNOTIFY, classname, classname, WS_CHILD | WS_VISIBLE, 0, 0, vo_dwidth, vo_dheight, WinID, 0, hInstance, 0); + EnableWindow(vo_window, 0); } else vo_window = CreateWindowEx(0, classname, classname, vo_border ? (WS_OVERLAPPEDWINDOW | WS_SIZEBOX) : WS_POPUP, |