summaryrefslogtreecommitdiff
path: root/vcl/headless/svpframe.cxx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2011-09-29 17:27:46 +0100
committerMichael Meeks <michael.meeks@suse.com>2011-10-25 13:41:49 +0100
commit987651a7fc5908fe39046e215bd7ffa2e43049df (patch)
tree26d1a36b329fa0c277a33d1f4fef1c687232591a /vcl/headless/svpframe.cxx
parentd6a013d804cc2cd75991ac680eb7b9cce98126e3 (diff)
misc cross-platform dependency / build issue redux
Diffstat (limited to 'vcl/headless/svpframe.cxx')
-rw-r--r--vcl/headless/svpframe.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 8ff0e5ecf377..864dd2ccee60 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -26,6 +26,7 @@
*
************************************************************************/
+#include <string.h>
#include "headless/svpframe.hxx"
#include "headless/svpinst.hxx"
#include "headless/svpgdi.hxx"
@@ -51,17 +52,13 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
m_nMaxWidth( 0 ),
m_nMaxHeight( 0 )
{
+ // fast and easy cross-platform wiping of the data
+ memset( (void *)&m_aSystemChildData, 0, sizeof( SystemChildData ) );
m_aSystemChildData.nSize = sizeof( SystemChildData );
- m_aSystemChildData.pDisplay = NULL;
- m_aSystemChildData.aWindow = 0;
+#if defined( UNX ) // FIXME: prolly redundant
m_aSystemChildData.pSalFrame = this;
- m_aSystemChildData.pWidget = NULL;
- m_aSystemChildData.pVisual = NULL;
m_aSystemChildData.nDepth = 24;
- m_aSystemChildData.aColormap = 0;
- m_aSystemChildData.pAppContext = NULL;
- m_aSystemChildData.aShellWindow = 0;
- m_aSystemChildData.pShellWidget = NULL;
+#endif
if( m_pParent )
m_pParent->m_aChildren.push_back( this );