diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-07-14 11:02:21 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-07-14 23:58:01 +0300 |
| commit | 5a7834cd3e6e73ec9c19f3ff057aacba59e3f9a3 (patch) | |
| tree | c31868e985a0d17fbcc616575cb278cc8e4a88c6 /vcl/source | |
| parent | d08bf1ca63e51c950ed0bc84b6f1d5232ae97f38 (diff) | |
iOS hacking
Add some trivialish first attempts at iOS-specific headers and some
source files that surely are quite bogus and does nothing sane, but
must start with something. Mostly based on the MacOSX ("aqua") code.
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/salmain/salmain.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/syschild.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 10 |
3 files changed, 14 insertions, 1 deletions
diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx index 80e853b3b654..0c3adf887023 100644 --- a/vcl/source/salmain/salmain.cxx +++ b/vcl/source/salmain/salmain.cxx @@ -36,7 +36,7 @@ #include "salinst.hxx" -SAL_IMPLEMENT_MAIN() { +SAL_IMPLEMENT_MAIN_WITH_GUI() { tools::extendApplicationEnvironment(); return SVMain(); } diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index f72decce183e..1de33b56b15b 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -250,6 +250,9 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava ) // FIXME: this is wrong nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView ); (void)bUseJava; +#elif defined IOS + // FIXME: this is wrong + nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView ); #elif defined UNX if( !bUseJava ) { diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 1ab898011672..1e4157f5fcd3 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8428,6 +8428,16 @@ uno::Reference< XDragSource > Window::GetDragSource() aDropTargetSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDropTarget")); aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) ); aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) ); +#elif defined IOS + /* What does LibreOffice's use of DND concepts mean on + * iOS, huh, is this both inter-app DND (which clearly is + * meaningless), or intra-app? Anyway, use the same code + * as for MacOSX for now, even if meaningless... + */ + aDragSourceSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDragSource")); + aDropTargetSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDropTarget")); + aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) ); + aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) ); #elif defined UNX aDropTargetAL.realloc( 3 ); aDragSourceAL.realloc( 3 ); |