Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / osx / iphone / private.h

diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h
index a65f3ee2bf93269acd3129c9451ab4b6e8f4f954..070637b234678951b70c8824054c9397d83c365c 100644 (file)
--- a/include/wx/osx/iphone/private.h
+++ b/include/wx/osx/iphone/private.h
@@ -18,6 +18,11 @@
     #import <UIKit/UIKit.h>
 #endif
 
     #import <UIKit/UIKit.h>
 #endif
 

+#include <CoreText/CTFont.h>
+#include <CoreText/CTStringAttributes.h>
+#include <CoreText/CTLine.h>
+
+

 #if wxUSE_GUI
 
 OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
 #if wxUSE_GUI
 
 OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(


@@ -56,7 +61,7 @@ public :
     virtual void        GetPosition( int &x, int &y ) const;
     virtual void        GetSize( int &width, int &height ) const;
     virtual void        SetControlSize( wxWindowVariant variant );
     virtual void        GetPosition( int &x, int &y ) const;
     virtual void        GetSize( int &width, int &height ) const;
     virtual void        SetControlSize( wxWindowVariant variant );

-    virtual float       GetContentScaleFactor() const ;
+    virtual double      GetContentScaleFactor() const ;

     
     virtual void        SetNeedsDisplay( const wxRect* where = NULL );
     virtual bool        GetNeedsDisplay() const;
     
     virtual void        SetNeedsDisplay( const wxRect* where = NULL );
     virtual bool        GetNeedsDisplay() const;