diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-11-11 21:19:02 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-11-11 21:46:45 +0100 |
| commit | d9fbaf248ea907428c3a5d0422d0c9a9ce50b907 (patch) | |
| tree | 4130c203760745597856af352ebd9ad92ff6cc2f /vcl/win | |
| parent | a237e0838196774cceeffe984d614198dbabd21e (diff) | |
windows opengl: Instantiate OpenGLSalBitmap even on Windows.
Change-Id: I2229141cc12ad7bc9fccfd6e2c7fec44ac4f6284
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index b1d33e498792..a601ff543539 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -26,9 +26,11 @@ #include <tools/solarmutex.hxx> -#include <vcl/timer.hxx> #include <vcl/apptypes.hxx> +#include <vcl/opengl/OpenGLHelper.hxx> +#include <vcl/timer.hxx> +#include <opengl/salbmp.hxx> #include <win/wincomp.hxx> #include <win/salids.hrc> #include <win/saldata.hxx> @@ -1007,7 +1009,10 @@ SalTimer* WinSalInstance::CreateSalTimer() SalBitmap* WinSalInstance::CreateSalBitmap() { - return new WinSalBitmap(); + if (OpenGLHelper::isVCLOpenGLEnabled()) + return new OpenGLSalBitmap(); + else + return new WinSalBitmap(); } class WinImeStatus : public SalI18NImeStatus |