diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-06-05 14:00:34 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-06-05 14:00:34 +0200 |
| commit | d79fa4ee0fd5b6e9787838f74cc45c9c9b93a5b3 (patch) | |
| tree | 6ffe77e049063b10b2e58c04f6f28409f4089e7c /include/vcl/sysdata.hxx | |
| parent | 0394d49a70e14e176c047ced39e2e754fcc26f3d (diff) | |
Revert "Cleanup crossplatform cairo"
Unfortunately this breaks Android and iOS.
This reverts commit e4d55e8045c99af65a2cae57b26ec076825c9673.
Diffstat (limited to 'include/vcl/sysdata.hxx')
| -rw-r--r-- | include/vcl/sysdata.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index 57217df2fb57..a525f77fbbc8 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -23,8 +23,6 @@ #include <vector> #include <cstddef> -#include <config_cairo_canvas.h> - #ifdef MACOSX // predeclare the native classes to avoid header/include problems typedef struct CGContext *CGContextRef; @@ -202,12 +200,13 @@ struct SystemGlyphData int fallbacklevel; }; -#if ENABLE_CAIRO_CANVAS - struct SystemFontData { unsigned long nSize; // size in bytes of this structure -#if defined( UNX ) +#if defined( WNT ) + HFONT hFont; // native font object +#elif defined( MACOSX ) +#elif defined( UNX ) void* nFontId; // native font id int nFontFlags; // native font flags #endif @@ -218,7 +217,10 @@ struct SystemFontData SystemFontData() : nSize( sizeof( SystemFontData ) ) -#if defined( UNX ) +#if defined( WNT ) + , hFont( 0 ) +#elif defined( MACOSX ) +#elif defined( UNX ) , nFontId( NULL ) , nFontFlags( 0 ) #endif @@ -230,8 +232,6 @@ struct SystemFontData } }; -#endif // ENABLE_CAIRO_CANVAS - typedef std::vector<SystemGlyphData> SystemGlyphDataVector; struct SystemTextLayoutData |