summaryrefslogtreecommitdiff
path: root/vcl/inc/win
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-11-20 18:49:03 +0100
committerJan Holesovsky <kendy@collabora.com>2014-11-20 18:52:03 +0100
commit57d6b92b69a31260dea0d84fcd1fc5866ada7adb (patch)
treefd2789496e46a88db4bd4a39a22a9c6020d66d65 /vcl/inc/win
parent3f94c9e9ddfd807b449f3bb9b232cf2041fa12d2 (diff)
windows opengl: Implement the native theming with OpenGL. libreoffice-4-4-branch-point
Change-Id: If8eb5cef228f4eb28e16de3e3135742282403cdc
Diffstat (limited to 'vcl/inc/win')
-rw-r--r--vcl/inc/win/salgdi.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 831a7032fa8e..8d88784c805f 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -39,6 +39,7 @@
class FontSelectPattern;
class ImplWinFontEntry;
class ImplFontAttrCache;
+class OpenGLTexture;
class PhysicalFontCollection;
class SalGraphicsImpl;
class WinOpenGLSalGraphicsImpl;
@@ -154,7 +155,7 @@ private:
HBITMAP mhBitmap;
/// DIBSection data.
- sal_uInt8 *mpData;
+ sal_uInt32 *mpData;
/// Mapping between the GDI position and OpenGL, to use for OpenGL drawing.
SalTwoRect maRects;
@@ -168,8 +169,13 @@ public:
HDC getCompatibleHDC() { return mhCompatibleDC; }
- /// Call the WinOpenGLSalGraphicsImpl's DrawMask().
- void DrawMask(SalColor color);
+ SalTwoRect getTwoRect() { return maRects; }
+
+ /// Reset the DC with the defined color.
+ void fill(sal_uInt32 color);
+
+ /// Obtain the texture; the caller must delete it after use.
+ OpenGLTexture* getTexture();
};
class WinSalGraphics : public SalGraphics
@@ -177,9 +183,12 @@ class WinSalGraphics : public SalGraphics
friend class WinSalGraphicsImpl;
friend class ScopedFont;
friend class OpenGLCompatibleDC;
-private:
+ friend class WinLayout;
+
+protected:
boost::scoped_ptr<SalGraphicsImpl> mpImpl;
+private:
HDC mhLocalDC; // HDC
bool mbPrinter : 1; // is Printer
bool mbVirDev : 1; // is VirDev