diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-05-08 16:39:25 +0200 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-05-08 18:34:32 +0200 |
commit | 05c141bc3ab264c8e1f4fba57c4a82fa93e91261 (patch) | |
tree | 0e5dee5d9f261b675b79aa34e32ad32b20fbd61b /avmedia/source | |
parent | use 70 chars instead of 80 (diff) | |
download | core-05c141bc3ab264c8e1f4fba57c4a82fa93e91261.tar.gz core-05c141bc3ab264c8e1f4fba57c4a82fa93e91261.zip |
DX canvas: provide a OutputDevice pointer as a device handler instead of HDC
With it all canvas can be handled on the same way.
avmedia/source/win/window.cxx: always comes a HWND
Change-Id: Id6b8e6d52b8a136143f724daf8feff5c85cf5804
Diffstat (limited to 'avmedia/source')
-rw-r--r-- | avmedia/source/win/window.cxx | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index 3d5a7cc3e9a8..029ad40cfec0 100644 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -303,17 +303,6 @@ bool Window::create( const uno::Sequence< uno::Any >& rArguments ) aRect.X, aRect.Y, aRect.Width, aRect.Height, (HWND) mnParentWnd, NULL, mpWndClass->hInstance, 0 ); - // if the last CreateWindow failed... - if( mnFrameWnd == 0 ) - { - // try again and this time assume that mnParent is indeed a dc - mnParentWnd = reinterpret_cast<int>(::WindowFromDC( (HDC)mnParentWnd )); - mnFrameWnd = (int) ::CreateWindow( mpWndClass->lpszClassName, NULL, - WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - aRect.X, aRect.Y, aRect.Width, aRect.Height, - (HWND)mnParentWnd , NULL, mpWndClass->hInstance, 0 ); - } - if( mnFrameWnd ) { ::SetWindowLong( (HWND) mnFrameWnd, 0, (DWORD) this ); |