From baeccb02dabe525217593f9f575d36882c36be76 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 27 Mar 2013 00:38:36 +0200
Subject: Bypass fields that are meaningless for iOS

Change-Id: I66acafc1f7302242a2a43271b909bba331062bce
---
 vcl/headless/svpframe.cxx      |  6 ++++--
 vcl/inc/vcl/sysdata.hxx        | 13 ++++++++++++-
 vcl/source/window/syschild.cxx |  4 ++--
 3 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'vcl')

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