diff options
-rw-r--r-- | toolkit/source/awt/vclxsystemdependentwindow.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtopwindow.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindow1.cxx | 2 | ||||
-rw-r--r-- | vcl/headless/svpframe.cxx | 6 | ||||
-rw-r--r-- | vcl/inc/vcl/sysdata.hxx | 13 | ||||
-rw-r--r-- | vcl/source/window/syschild.cxx | 4 |
7 files changed, 30 insertions, 5 deletions
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index e156879bae0a..b54cca2b8787 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -84,6 +84,9 @@ IMPL_XTYPEPROVIDER_END { aRet <<= (sal_IntPtr)pSysData->pView; } +#elif (defined IOS) + // Nothing + (void) SystemType; #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 31fdb3a87743..862014491cee 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -936,6 +936,8 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, aParentData.nSize = sizeof( aParentData ); #if defined MACOSX aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle); + #elif defined IOS + // Nothing #elif defined UNX aParentData.aWindow = nWindowHandle; aParentData.bXEmbedSupport = bXEmbed; @@ -1181,6 +1183,8 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( aParentData.nSize = sizeof( aParentData ); #if defined MACOSX aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle); + #elif defined IOS + // Nothing #elif defined UNX aParentData.aWindow = nWindowHandle; aParentData.bXEmbedSupport = bXEmbed; diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index a4758ac69844..0f61b49fa1c7 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -96,6 +96,9 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException) { aRet <<= (sal_IntPtr)pSysData->pView; } +#elif (defined IOS) + // Nothing + (void) SystemType; #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 029c3bccf25c..ce5efb1a40fc 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -85,6 +85,8 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) aSysParentData.hWnd = (HWND) nHandle; #elif defined( MACOSX ) aSysParentData.pView = reinterpret_cast<NSView*>(nHandle); +#elif defined( IOS ) + // Nothing #elif defined( UNX ) aSysParentData.aWindow = (long)nHandle; aSysParentData.bXEmbedSupport = bXEmbed; diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 8a234dfb1fdd..dfe96a004004 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -82,9 +82,11 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance, // fast and easy cross-platform wiping of the data memset( (void *)&m_aSystemChildData, 0, sizeof( SystemChildData ) ); m_aSystemChildData.nSize = sizeof( SystemChildData ); -#ifdef UNX +#ifdef IOS + // Nothing +#else m_aSystemChildData.pSalFrame = this; -#if defined(ANDROID) || defined(IOS) +#ifdef ANDROID // We want 32-bit RGBA bitmaps m_aSystemChildData.nDepth = 32; #else diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx index a1db4874876f..be17b959670d 100644 --- a/vcl/inc/vcl/sysdata.hxx +++ b/vcl/inc/vcl/sysdata.hxx @@ -64,6 +64,8 @@ struct SystemEnvData HWND hWnd; // the window hwnd #elif defined( MACOSX ) NSView* pView; // the cocoa (NSView *) implementing this object +#elif defined( IOS ) + // Nothing #elif defined( UNX ) void* pDisplay; // the relevant display connection long aWindow; // the window of the object @@ -92,6 +94,8 @@ struct SystemParentData HWND hWnd; // the window hwnd #elif defined( MACOSX ) NSView* pView; // the cocoa (NSView *) implementing this object +#elif defined( IOS ) + // Nothing #elif defined( UNX ) long aWindow; // the window of the object bool bXEmbedSupport:1; // decides whether the object in question @@ -109,7 +113,9 @@ struct SystemMenuData #if defined( WNT ) HMENU hMenu; // the menu handle of the menu bar #elif defined( MACOSX ) - //not defined + // Nothing +#elif defined( IOS ) + // Nothing #elif defined( UNX ) long aMenu; // ??? #endif @@ -127,6 +133,7 @@ struct SystemGraphicsData #elif defined( MACOSX ) CGContextRef rCGContext; // CoreGraphics graphic context #elif defined( IOS ) + // Nothing #elif defined( UNX ) void* pDisplay; // the relevant display connection long hDrawable; // a drawable @@ -141,7 +148,9 @@ struct SystemGraphicsData #if defined( WNT ) , hDC( 0 ) #elif defined( MACOSX ) + // Nothing #elif defined( IOS ) + // Nothing #elif defined( UNX ) , pDisplay( NULL ) , hDrawable( 0 ) @@ -164,7 +173,9 @@ struct SystemWindowData unsigned long nSize; // size in bytes of this structure #if defined( WNT ) // meaningless on Windows #elif defined( MACOSX ) // meaningless on Mac OS X + // Nothing #elif defined( IOS ) // and maybe on iOS, too, then + // Nothing #elif defined( UNX ) void* pVisual; // the visual to be used #endif diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 93086e950abb..7cca6792edb5 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -221,11 +221,11 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava ) (void)bUseJava; #if defined WNT nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd ); - (void)bUseJava; #elif defined MACOSX // FIXME: this is wrong nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView ); - (void)bUseJava; +#elif defined IOS + // Nothing #elif defined UNX if( !bUseJava ) { |