strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Nah, don't obscure the right type with void*

Browse source
This commit is contained in:
Tor Lillqvist 2012-04-15 08:32:29 +02:00
parent 4067e629f7
commit 5d369a2ca7
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
canvas/source/cairo/cairo_textlayout.cxx
View file

@ -511,7 +511,7 @@ namespace cairocanvas
// when CGFont (Mac OS X 10.5 API) is provided by the AQUA VCL backend.
font_face = cairo_quartz_font_face_create_for_atsu_font_id((ATSUFontID) rSysFontData.aATSUFontID);
# else // iOS
font_face = cairo_quartz_font_face_create_for_cgfont( CTFontCopyGraphicsFont( (CTFontRef) rSysFontData.rCTFont, NULL ) );
font_face = cairo_quartz_font_face_create_for_cgfont( CTFontCopyGraphicsFont( rSysFontData.rCTFont, NULL ) );
# endif
#elif defined CAIRO_HAS_WIN32_SURFACE

4
vcl/inc/vcl/sysdata.hxx
View file

@ -44,7 +44,7 @@ class NSView;
#endif
#ifdef IOS
typedef struct CGFont *CGFontRef;
typedef const struct __CTFont * CTFontRef;
typedef struct CGContext *CGContextRef;
typedef struct CGLayer *CGLayerRef;
#ifdef __OBJC__
@ -203,7 +203,7 @@ struct SystemFontData
#elif defined( QUARTZ )
void* aATSUFontID; // native font object
#elif defined( IOS )
void* rCTFont; // native font object
CTFontRef rCTFont; // native font object
#elif defined( UNX )
void* nFontId; // native font id
int nFontFlags; // native font flags

2
vcl/ios/source/gdi/salgdi.cxx
View file

@ -204,7 +204,7 @@ SystemFontData IosSalGraphics::GetSysFontData( int /* nFallbacklevel */ ) const
CTFontRef font = CTFontCreateUIFontForLanguage(kCTFontSystemFontType, 0.0, NULL);
font = (CTFontRef)CFRetain(font);
aSysFontData.rCTFont = (void*)font;
aSysFontData.rCTFont = font;
CTFontRef italic_font = CTFontCreateCopyWithSymbolicTraits( font,
0.0,