diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-10-07 21:26:06 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-10-07 21:34:07 +0300 |
| commit | 99b935ff7dd069f2a0aad5054d07bc6f71411d84 (patch) | |
| tree | 4eda30de44078f9e68c2e4f153bf8af687d8e8a6 /vcl/inc | |
| parent | 3c9da1fbfae9c00a5eb9ddcb106a01b075703fcd (diff) | |
Make this compile for iOS again
Change-Id: Idd4a1e6d50652a879493d8411c59605ca1a53dfb
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/headless/svpframe.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/ios/iosinst.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/sft.hxx | 2 |
3 files changed, 3 insertions, 5 deletions
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. |