diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-11-25 16:09:42 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-30 00:47:31 +0100 |
commit | 9ec885872b151f56b631292ea4f61c58341bc1b9 (patch) | |
tree | 77f02cff278ea7f94fdf884ad4407f6259137f02 /vcl | |
parent | 1386c348f81738a9966d1217db89d1f603466317 (diff) |
windows opengl: We should actually use Init() from OpenGLSalGraphicsImpl.
Change-Id: I524883b0f0bbce9a8b6f893771f144feeee49934
Diffstat (limited to 'vcl')
-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 ebd139c08ed3..08159278f576 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 ? static_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(); } |