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 f2a7c59e9918e4393ffdcb9db60ba03e24cd15fe..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
 
+#include <CoreText/CTFont.h>
+#include <CoreText/CTStringAttributes.h>
+#include <CoreText/CTLine.h>
+
+
 #if wxUSE_GUI
 
 OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
@@ -31,7 +36,7 @@ wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxSt
 class WXDLLIMPEXP_CORE wxWidgetIPhoneImpl : public wxWidgetImpl
 {
 public :
-    wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
+    wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ;
     wxWidgetIPhoneImpl() ;
     ~wxWidgetIPhoneImpl();
 
@@ -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 float       GetContentScaleFactor() const ;
+    virtual double      GetContentScaleFactor() const ;
     
     virtual void        SetNeedsDisplay( const wxRect* where = NULL );
     virtual bool        GetNeedsDisplay() const;