diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-20 09:07:52 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-21 13:28:32 +0200 |
| commit | 63dcca42cebd3cb6f020ec75c0d225e1d7232e1c (patch) | |
| tree | f1b1442af9d7f6f4736ca9621389f6fcc78179e8 /toolkit/source/awt/vclxtoolkit.cxx | |
| parent | 27388c9483b5e00b593ac126092c5bbb131492b0 (diff) | |
Re-work the vcl aspects of the iOS port
Don't try to use similar code as for OS X to manage windows, events
etc. I.e. don't use UIKit in vcl to do that. Instead, just do as in
the Android port, use the "headless" vcl backend. Do keep using
CoreText, though, not FreeType & fontconfig.
Start changing the iOS "Viewer" app to correspond to the Android
"desktop" app (so it should be renamed).
Work in progress since a long time, several crucial details still
missing, but committing for now.
Change-Id: Iac5fbf8def415e4d0d21e5200450a373420ad7ee
Diffstat (limited to 'toolkit/source/awt/vclxtoolkit.cxx')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index e0e62b0f8ae9..31fdb3a87743 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -59,12 +59,6 @@ using org::libreoffice::touch::ByteBufferWrapper; #endif -#ifdef IOS -#include "premac.h" -#include <UIKit/UIKit.h> -#include "postmac.h" -#endif - #include <vcl/sysdata.hxx> #include <toolkit/awt/vclxwindows.hxx> @@ -942,8 +936,6 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, aParentData.nSize = sizeof( aParentData ); #if defined MACOSX aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle); - #elif defined IOS - aParentData.pView = reinterpret_cast<UIView*>(nWindowHandle); #elif defined UNX aParentData.aWindow = nWindowHandle; aParentData.bXEmbedSupport = bXEmbed; @@ -1189,8 +1181,6 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( aParentData.nSize = sizeof( aParentData ); #if defined MACOSX aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle); - #elif defined IOS - aParentData.pView = reinterpret_cast<UIView*>(nWindowHandle); #elif defined UNX aParentData.aWindow = nWindowHandle; aParentData.bXEmbedSupport = bXEmbed; |