Kaydet (Commit) 7b2d0c9a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Make this compile for iOS

I said compile, not work.
üst cba97d1d
......@@ -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 \
......
......@@ -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 )
{
......
......@@ -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;
......
......@@ -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 )
{
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment