diff options
author | Tor Lillqvist <tml@iki.fi> | 2011-07-15 01:40:22 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2011-07-21 14:09:32 +0300 |
commit | 7b2d0c9ad2d2d28b898136c3f6bd00cea4da283a (patch) | |
tree | 99d8659c4b1c644eaedabc2126793367678b1260 /toolkit/source | |
parent | cba97d1d22d8cd24ab7fd762832ca42d17b330a7 (diff) |
Make this compile for iOS
I said compile, not work.
Diffstat (limited to 'toolkit/source')
-rw-r--r-- | toolkit/source/awt/vclxsystemdependentwindow.cxx | 11 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 11 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtopwindow.cxx | 11 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindow1.cxx | 6 |
4 files changed, 39 insertions, 0 deletions
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 7cb667b18528..646462521af6 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -46,6 +46,12 @@ #include "postmac.h" #endif +#ifdef IOS +#include "premac.h" +#include <UIKit/UIKit.h> +#include "postmac.h" +#endif + #include <vcl/svapp.hxx> #include <vcl/syschild.hxx> #include <vcl/sysdata.hxx> @@ -97,6 +103,11 @@ IMPL_XTYPEPROVIDER_END { aRet <<= (sal_IntPtr)pSysData->pView; } +#elif (defined IOS) + if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_IOS ) + { + aRet <<= (sal_IntPtr)pSysData->pView; + } #elif (defined UNX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW ) { diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index b6655ab56d98..19a76c9052c8 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -64,6 +64,13 @@ #include <Cocoa/Cocoa.h> #include "postmac.h" #endif + +#ifdef IOS +#include "premac.h" +#include <UIKit/UIKit.h> +#include "postmac.h" +#endif + #include <vcl/sysdata.hxx> #include <toolkit/awt/vclxwindows.hxx> @@ -982,6 +989,8 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, aParentData.nSize = sizeof( aParentData ); #if defined QUARTZ aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle); + #elif defined IOS + aParentData.pView = reinterpret_cast<UIView*>(nWindowHandle); #elif defined UNX aParentData.aWindow = nWindowHandle; aParentData.bXEmbedSupport = bXEmbed; @@ -1206,6 +1215,8 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( aParentData.nSize = sizeof( aParentData ); #if defined QUARTZ aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle); + #elif defined IOS + aParentData.pView = reinterpret_cast<UIView*>(nWindowHandle); #elif defined UNX aParentData.aWindow = nWindowHandle; aParentData.bXEmbedSupport = bXEmbed; diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index 8bf3c861c01d..44f8f94cb50c 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -37,6 +37,12 @@ #include "postmac.h" #endif +#if defined ( IOS ) +#include "premac.h" +#include <UIKit/UIKit.h> +#include "postmac.h" +#endif + #include <vcl/syschild.hxx> #include <vcl/sysdata.hxx> #include <cppuhelper/typeprovider.hxx> @@ -109,6 +115,11 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException) { aRet <<= (sal_IntPtr)pSysData->pView; } +#elif (defined IOS) + if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_IOS ) + { + aRet <<= (sal_IntPtr)pSysData->pView; + } #elif (defined UNX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW ) { diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index 6a9c64ba3c95..28d97fcb826d 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -43,6 +43,10 @@ #include "premac.h" #include <Cocoa/Cocoa.h> #include "postmac.h" +#elif defined ( IOS ) +#include "premac.h" +#include <UIKit/UIKit.h> +#include "postmac.h" #endif #include <vcl/sysdata.hxx> @@ -96,6 +100,8 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) aSysParentData.hWnd = (HWND) nHandle; #elif defined( QUARTZ ) aSysParentData.pView = reinterpret_cast<NSView*>(nHandle); +#elif defined( IOS ) + aSysParentData.pView = reinterpret_cast<UIView*>(nHandle); #elif defined( UNX ) aSysParentData.aWindow = (long)nHandle; aSysParentData.bXEmbedSupport = bXEmbed; |