From 7b2d0c9ad2d2d28b898136c3f6bd00cea4da283a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 15 Jul 2011 01:40:22 +0300 Subject: Make this compile for iOS I said compile, not work. --- toolkit/Library_tk.mk | 5 +++++ toolkit/source/awt/vclxsystemdependentwindow.cxx | 11 +++++++++++ toolkit/source/awt/vclxtoolkit.cxx | 11 +++++++++++ toolkit/source/awt/vclxtopwindow.cxx | 11 +++++++++++ toolkit/source/awt/vclxwindow1.cxx | 6 ++++++ 5 files changed, 44 insertions(+) (limited to 'toolkit') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 84c05eb752ab..e07878f1e90a 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -167,6 +167,11 @@ $(eval $(call gb_Library_set_cxxflags,tk,\ $$(CXXFLAGS) $(gb_OBJCXXFLAGS))) endif +ifeq ($(GUIBASE),cocoatouch) +$(eval $(call gb_Library_set_cxxflags,tk,\ + $$(CXXFLAGS) $(gb_OBJCXXFLAGS))) +endif + ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) $(eval $(call gb_Library_add_linked_libs,tk,\ X11 \ 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 +#include "postmac.h" +#endif + #include #include #include @@ -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 #include "postmac.h" #endif + +#ifdef IOS +#include "premac.h" +#include +#include "postmac.h" +#endif + #include #include @@ -982,6 +989,8 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, aParentData.nSize = sizeof( aParentData ); #if defined QUARTZ aParentData.pView = reinterpret_cast(nWindowHandle); + #elif defined IOS + aParentData.pView = reinterpret_cast(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(nWindowHandle); + #elif defined IOS + aParentData.pView = reinterpret_cast(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 +#include "postmac.h" +#endif + #include #include #include @@ -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 #include "postmac.h" +#elif defined ( IOS ) +#include "premac.h" +#include +#include "postmac.h" #endif #include @@ -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(nHandle); +#elif defined( IOS ) + aSysParentData.pView = reinterpret_cast(nHandle); #elif defined( UNX ) aSysParentData.aWindow = (long)nHandle; aSysParentData.bXEmbedSupport = bXEmbed; -- cgit