include/vcl/sysdata.hxx | 42 ++++-------------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-)
New commits: commit 38b7c4f1b78044a4b127499743d24a2369fb445a Author: Tor Lillqvist <[email protected]> Date: Thu Dec 12 20:20:01 2013 +0200 Add CGContext field to SystemGraphicsData for iOS, too diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index cd1f26e..af65ce6 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -121,7 +121,7 @@ struct SystemGraphicsData #elif defined( ANDROID ) // Nothing #elif defined( IOS ) - // Nothing + CGContextRef rCGContext; // CoreGraphics graphic context #elif defined( UNX ) void* pDisplay; // the relevant display connection long hDrawable; // a drawable @@ -136,11 +136,11 @@ struct SystemGraphicsData #if defined( WNT ) , hDC( 0 ) #elif defined( MACOSX ) - // Nothing + , rCGContext( NULL ) #elif defined( ANDROID ) // Nothing #elif defined( IOS ) - // Nothing + , rCGContext( NULL ) #elif defined( UNX ) , pDisplay( NULL ) , hDrawable( 0 ) commit c275a2edf663431f43106ba7da11b9d2b9503981 Author: Tor Lillqvist <[email protected]> Date: Thu Dec 12 20:18:40 2013 +0200 Cosmetics diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index 100854b..cd1f26e 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -51,10 +51,6 @@ typedef struct CGContext *CGContextRef; #endif #endif -// ----------------- -// - SystemEnvData - -// ----------------- - struct SystemEnvData { unsigned long nSize; // size in bytes of this structure @@ -72,7 +68,7 @@ struct SystemEnvData void* pSalFrame; // contains a salframe, if object has one void* pWidget; // the corresponding widget void* pVisual; // the visual in use - int nScreen; // the current screen of the window + int nScreen; // the current screen of the window int nDepth; // depth of said visual long aColormap; // the colormap being used void* pAppContext; // the application context in use @@ -81,10 +77,6 @@ struct SystemEnvData #endif }; -// -------------------- -// - SystemParentData - -// -------------------- - struct SystemParentData { unsigned long nSize; // size in bytes of this structure @@ -103,10 +95,6 @@ struct SystemParentData #endif }; -// -------------------- -// - SystemMenuData - -// -------------------- - struct SystemMenuData { unsigned long nSize; // size in bytes of this structure @@ -123,10 +111,6 @@ struct SystemMenuData #endif }; -// -------------------- -// - SystemGraphicsData - -// -------------------- - struct SystemGraphicsData { unsigned long nSize; // size in bytes of this structure @@ -169,11 +153,6 @@ struct SystemGraphicsData { } }; - -// -------------------- -// - SystemWindowData - -// -------------------- - struct SystemWindowData { unsigned long nSize; // size in bytes of this structure @@ -189,11 +168,6 @@ struct SystemWindowData #endif }; - -// -------------------- -// - SystemGlyphData - -// -------------------- - struct SystemGlyphData { unsigned long index; @@ -202,10 +176,6 @@ struct SystemGlyphData int fallbacklevel; }; - -// -------------------- -// - SystemFontData - -// -------------------- struct SystemFontData { unsigned long nSize; // size in bytes of this structure @@ -238,10 +208,6 @@ struct SystemFontData } }; -// -------------------- -// - SystemTextLayoutData - -// -------------------- - typedef std::vector<SystemGlyphData> SystemGlyphDataVector; struct SystemTextLayoutData _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
