diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-11-25 16:09:42 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-11-25 16:09:42 +0100 |
| commit | 29420563fce7a15def14b79965987d1c5c3f648c (patch) | |
| tree | 28c851a35ce0b7e1b630ddda41748704b3dc11ca | |
| parent | 328dbaf3f420896eceaa9a5d629d6e7dc7955946 (diff) | |
windows opengl: We should actually use Init() from OpenGLSalGraphicsImpl.
Change-Id: I524883b0f0bbce9a8b6f893771f144feeee49934
| -rw-r--r-- | vcl/inc/opengl/win/gdiimpl.hxx | 2 | ||||
| -rw-r--r-- | vcl/opengl/win/gdiimpl.cxx | 9 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx index 66a03332284c..de25d2325866 100644 --- a/vcl/inc/opengl/win/gdiimpl.hxx +++ b/vcl/inc/opengl/win/gdiimpl.hxx @@ -26,8 +26,6 @@ private: public: WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics); - virtual void Init() SAL_OVERRIDE; - protected: virtual GLfloat GetWidth() const SAL_OVERRIDE; virtual GLfloat GetHeight() const SAL_OVERRIDE; diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx index 7307e2be3a27..55b3c5a165ef 100644 --- a/vcl/opengl/win/gdiimpl.cxx +++ b/vcl/opengl/win/gdiimpl.cxx @@ -18,15 +18,6 @@ WinOpenGLSalGraphicsImpl::WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics): { } -void WinOpenGLSalGraphicsImpl::Init() -{ - // FIXME - is this still needed after the recent changes? - //if (mbVirDev) - // GetOpenGLContext().requestVirtualDevice(); - //GetOpenGLContext().requestSingleBufferedRendering(); - //GetOpenGLContext().init(mhLocalDC, mhWnd); -} - void WinOpenGLSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) { OpenGLSalGraphicsImpl *pImpl = pSrcGraphics ? dynamic_cast< OpenGLSalGraphicsImpl* >(pSrcGraphics->GetImpl()) : static_cast< OpenGLSalGraphicsImpl *>(mrParent.GetImpl()); diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 05279d10494c..7161dabbd293 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -482,6 +482,7 @@ void WinSalGraphics::InitGraphics() ::SetTextAlign( getHDC(), TA_BASELINE | TA_LEFT | TA_NOUPDATECP ); ::SetBkMode( getHDC(), WIN32_TRANSPARENT ); ::SetROP2( getHDC(), R2_COPYPEN ); + mpImpl->Init(); } |