Make this compile for iOS again

Change-Id: Idd4a1e6d50652a879493d8411c59605ca1a53dfb

6 files changed, 9 insertions, 46 deletions

diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 408e05d81d17..b4acde56ea53 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -77,11 +77,11 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
     m_pParent( static_cast<SvpSalFrame*>(pParent) ),
     m_nStyle( nSalFrameStyle ),
     m_bVisible( false ),
-    m_bTopDown( bTopDown ),
 #ifndef IOS
+    m_bTopDown( bTopDown ),
     m_bDamageTracking( false ),
-#endif
     m_nScanlineFormat( nScanlineFormat ),
+#endif
     m_nMinWidth( 0 ),
     m_nMinHeight( 0 ),
     m_nMaxWidth( 0 ),
@@ -92,7 +92,8 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
     memset( static_cast<void *>(&m_aSystemChildData), 0, sizeof( SystemEnvData ) );
     m_aSystemChildData.nSize        = sizeof( SystemEnvData );
 #ifdef IOS
-    // Nothing
+    (void) bTopDown;
+    (void) nScanlineFormat;
 #elif defined ANDROID
     // Nothing
 #else
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 16ff7e25445b..d7e9b0189156 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -43,12 +43,12 @@ class VCL_DLLPUBLIC SvpSalFrame : public SalFrame
     std::list< SvpSalFrame* >           m_aChildren;     // List of child frames
     SalFrameStyleFlags                  m_nStyle;
     bool                                m_bVisible;
-    bool                                m_bTopDown;
 #ifndef IOS
+    bool                                m_bTopDown;
     basebmp::BitmapDeviceSharedPtr      m_aFrame;
     bool                                m_bDamageTracking;
-#endif
     basebmp::Format                     m_nScanlineFormat;
+#endif
     long                                m_nMinWidth;
     long                                m_nMinHeight;
     long                                m_nMaxWidth;
diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx
index 1693986fbacd..fb987c18dc4f 100644
--- a/vcl/inc/ios/iosinst.hxx
+++ b/vcl/inc/ios/iosinst.hxx
@@ -42,8 +42,6 @@ public:
     void GetWorkArea( Rectangle& rRect );
     SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
     SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-
-    SalFrame *getFocusFrame() const;
 };
 
 #endif // INCLUDED_VCL_INC_IOS_IOSINST_HXX
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index f65cdc24a4c0..5d17e09ed8cc 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -474,7 +474,7 @@ namespace vcl
  */
     int VCL_DLLPUBLIC MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, bool bvertical);
 
-#if defined(WNT) || defined(MACOSX)
+#if defined(WNT) || defined(MACOSX) || defined(IOS)
 /**
  * Maps a Unicode (UCS-2) character to a glyph ID and returns it. Missing glyph has
  * a glyphID of 0 so this function can be used to test if a character is encoded in the font.
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 2b58ed7ab234..c94330c86f5a 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -47,28 +47,6 @@ void IosSalInstance::GetWorkArea( Rectangle& rRect )
                        Size( viewWidth, viewHeight ) );
 }
 
-/*
- * Try too hard to get a frame, in the absence of anything better to do
- */
-SalFrame *IosSalInstance::getFocusFrame() const
-{
-    SalFrame *pFocus = SvpSalFrame::GetFocusFrame();
-    if (!pFocus) {
-        const std::list< SalFrame* >& rFrames( getFrames() );
-        for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
-        {
-            SvpSalFrame *pFrame = const_cast<SvpSalFrame*>(static_cast<const SvpSalFrame*>(*it));
-            if( pFrame->IsVisible() )
-            {
-                pFrame->GetFocus();
-                pFocus = pFrame;
-                break;
-            }
-        }
-    }
-    return pFocus;
-}
-
 IosSalInstance *IosSalInstance::getInstance()
 {
     if (!ImplGetSVData())
@@ -88,20 +66,6 @@ IosSalInstance::~IosSalInstance()
 {
 }
 
-#if 0
-
-bool IosSalInstance::AnyInput( VclInputFlags nType )
-{
-    if( nType & VclInputFlags::TIMER )
-        return CheckTimeout( false );
-
-    // Unfortunately there is no way to check for a specific type of
-    // input being queued. That information is too hidden, sigh.
-    return SvpSalInstance::s_pDefaultInstance->PostedEventsInQueue();
-}
-
-#endif
-
 class IosSalSystem : public SvpSalSystem {
 public:
     IosSalSystem() : SvpSalSystem() {}
@@ -122,7 +86,7 @@ class IosSalFrame : public SvpSalFrame
 public:
     IosSalFrame( IosSalInstance *pInstance,
                      SalFrame           *pParent,
-                     sal_uLong           nSalFrameStyle,
+                     SalFrameStyleFlags  nSalFrameStyle,
                      SystemParentData   *pSysParent )
         : SvpSalFrame( pInstance, pParent, nSalFrameStyle,
                        true, basebmp::Format::ThirtyTwoBitTcMaskRGBA,
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index d901cc84b481..171d910ef76e 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2413,7 +2413,7 @@ int MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphA
     return nchars;
 }
 
-#if defined(WNT) || defined(MACOSX)
+#if defined(WNT) || defined(MACOSX) || defined(IOS)
 sal_uInt16 MapChar(TrueTypeFont *ttf, sal_uInt16 ch, bool bvertical)
 {
     switch (ttf->cmapType) {