diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-27 02:11:39 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-27 02:12:30 +0200 |
| commit | 2b520e7d8a0cf12c71b8fc09d6d83dda8a3b6c32 (patch) | |
| tree | dc492c46e496ab424b0e378bc0fa5ee99d30241a /vcl | |
| parent | 839a61c48c191ba9b9455bc9a64b1cd3f232d2f8 (diff) | |
Bypass X11-specific fields for Android
Change-Id: Ic8bfd4467b2fbcdcfa2caeb04d4ebe95f13863a2
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/headless/svpframe.cxx | 7 | ||||
| -rw-r--r-- | vcl/inc/vcl/sysdata.hxx | 14 | ||||
| -rw-r--r-- | vcl/source/window/syschild.cxx | 2 |
3 files changed, 17 insertions, 6 deletions
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index dfe96a004004..bf679d9bc5d3 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -84,15 +84,12 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance, m_aSystemChildData.nSize = sizeof( SystemChildData ); #ifdef IOS // Nothing +#elif defined ANDROID + // Nothing #else m_aSystemChildData.pSalFrame = this; -#ifdef ANDROID - // We want 32-bit RGBA bitmaps - m_aSystemChildData.nDepth = 32; -#else m_aSystemChildData.nDepth = 24; #endif -#endif if( m_pParent ) m_pParent->m_aChildren.push_back( this ); diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx index be17b959670d..d06e72aee22f 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( ANDROID ) + // Nothing #elif defined( IOS ) // Nothing #elif defined( UNX ) @@ -94,6 +96,8 @@ struct SystemParentData HWND hWnd; // the window hwnd #elif defined( MACOSX ) NSView* pView; // the cocoa (NSView *) implementing this object +#elif defined( ANDROID ) + // Nothing #elif defined( IOS ) // Nothing #elif defined( UNX ) @@ -114,6 +118,8 @@ struct SystemMenuData HMENU hMenu; // the menu handle of the menu bar #elif defined( MACOSX ) // Nothing +#elif defined( ANDROID ) + // Nothing #elif defined( IOS ) // Nothing #elif defined( UNX ) @@ -132,6 +138,8 @@ struct SystemGraphicsData HDC hDC; // handle to a device context #elif defined( MACOSX ) CGContextRef rCGContext; // CoreGraphics graphic context +#elif defined( ANDROID ) + // Nothing #elif defined( IOS ) // Nothing #elif defined( UNX ) @@ -149,6 +157,8 @@ struct SystemGraphicsData , hDC( 0 ) #elif defined( MACOSX ) // Nothing +#elif defined( ANDROID ) + // Nothing #elif defined( IOS ) // Nothing #elif defined( UNX ) @@ -174,7 +184,9 @@ struct SystemWindowData #if defined( WNT ) // meaningless on Windows #elif defined( MACOSX ) // meaningless on Mac OS X // Nothing -#elif defined( IOS ) // and maybe on iOS, too, then +#elif defined( ANDROID ) + // Nothing +#elif defined( IOS ) // Nothing #elif defined( UNX ) void* pVisual; // the visual to be used diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 7cca6792edb5..c2f2f13a6f64 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -224,6 +224,8 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava ) #elif defined MACOSX // FIXME: this is wrong nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView ); +#elif defined ANDROID + // Nothing #elif defined IOS // Nothing #elif defined UNX |