strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make this compile for iOS

Browse source 
I said compile, not work.
This commit is contained in:
Tor Lillqvist 2011-07-15 01:40:22 +03:00
parent cba97d1d22
commit 7b2d0c9ad2
5 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
toolkit/Library_tk.mk
View file

@ -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 \

11
toolkit/source/awt/vclxsystemdependentwindow.cxx
View file

@ -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 )
{

11
toolkit/source/awt/vclxtoolkit.cxx
View file

@ -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;

11
toolkit/source/awt/vclxtopwindow.cxx
View file

@ -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 )
{

6
toolkit/source/awt/vclxwindow1.cxx
View file

@ -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;