From a4d7b25e7a006c3105a226343bfb52d9e1bc356a Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Mon, 3 Oct 2011 12:21:34 +0100
Subject: generic: create shared display class and re-factor to use it

---
 vcl/unx/generic/window/salframe.cxx | 14 +++++++-------
 vcl/unx/generic/window/salobj.cxx   | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'vcl/unx/generic/window')

diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 305d01566210..6d821bdee88a 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -650,7 +650,7 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, int nScreen, SystemParentData*
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong nSalFrameStyle, SystemParentData* pSystemParent )
 {
-    X11SalData* pSalData = GetX11SalData();
+    SalGenericData *pData = GetGenericData();
 
     // initialize frame geometry
     memset( &maGeometry, 0, sizeof(maGeometry) );
@@ -659,7 +659,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong nSalFrameStyle, SystemPar
 
     mbTransientForRoot          = false;
 
-    pDisplay_                   = pSalData->GetDisplay();
+    pDisplay_                   = pData->GetSalDisplay();
     // insert frame in framelist
     pDisplay_->registerFrame( this );
 
@@ -2796,13 +2796,13 @@ SalFrame::SalPointerState X11SalFrame::GetPointerState()
 SalFrame::SalIndicatorState X11SalFrame::GetIndicatorState()
 {
     SalIndicatorState aState;
-    aState.mnState = GetX11SalData()->GetDisplay()->GetIndicatorState();
+    aState.mnState = GetGenericData()->GetSalDisplay()->GetIndicatorState();
     return aState;
 }
 
 void X11SalFrame::SimulateKeyPress( sal_uInt16 nKeyCode )
 {
-    GetX11SalData()->GetDisplay()->SimulateKeyPress(nKeyCode);
+    GetGenericData()->GetSalDisplay()->SimulateKeyPress(nKeyCode);
 }
 
 long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
@@ -3099,7 +3099,7 @@ GetAlternateKeyCode( const sal_uInt16 nKeyCode )
 
 void X11SalFrame::beginUnicodeSequence()
 {
-    rtl::OUString& rSeq( GetX11SalData()->GetUnicodeAccumulator() );
+    rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
     DeletionListener aDeleteWatch( this );
 
     if( rSeq.getLength() )
@@ -3126,7 +3126,7 @@ void X11SalFrame::beginUnicodeSequence()
 bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
 {
     bool bRet = false;
-    rtl::OUString& rSeq( GetX11SalData()->GetUnicodeAccumulator() );
+    rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
     if( rSeq.getLength() > 0 )
     {
         // range check
@@ -3162,7 +3162,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
 
 bool X11SalFrame::endUnicodeSequence()
 {
-    rtl::OUString& rSeq( GetX11SalData()->GetUnicodeAccumulator() );
+    rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
 
     DeletionListener aDeleteWatch( this );
     if( rSeq.getLength() > 1 && rSeq.getLength() < 6 )
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index 0164d27ba185..cc9487fda4be 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -75,7 +75,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
 
     pObject->mpParent = pParent;
 
-    SalDisplay* pSalDisp        = GetX11SalData()->GetDisplay();
+    SalDisplay* pSalDisp        = GetGenericData()->GetSalDisplay();
     const SystemEnvData* pEnv   = pParent->GetSystemData();
     Display* pDisp              = pSalDisp->GetDisplay();
     XLIB_Window aObjectParent   = (XLIB_Window)pEnv->aWindow;
@@ -254,7 +254,7 @@ SalClipRegion::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
 X11SalObject::X11SalObject()
 {
     maSystemChildData.nSize     = sizeof( SystemChildData );
-    maSystemChildData.pDisplay  = GetX11SalData()->GetDisplay()->GetDisplay();
+    maSystemChildData.pDisplay  = GetGenericData()->GetSalDisplay()->GetDisplay();
     maSystemChildData.aWindow       = None;
     maSystemChildData.pSalFrame = 0;
     maSystemChildData.pWidget       = 0;
@@ -268,16 +268,16 @@ X11SalObject::X11SalObject()
     maSecondary                     = 0;
     maColormap                      = 0;
 
-    std::list< SalObject* >& rObjects = GetX11SalData()->GetDisplay()->getSalObjects();
+    std::list< SalObject* >& rObjects = GetGenericData()->GetSalDisplay()->getSalObjects();
     rObjects.push_back( this );
 }
 
 
 X11SalObject::~X11SalObject()
 {
-    std::list< SalObject* >& rObjects = GetX11SalData()->GetDisplay()->getSalObjects();
+    std::list< SalObject* >& rObjects = GetGenericData()->GetSalDisplay()->getSalObjects();
     rObjects.remove( this );
-    SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
+    SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
     pSalDisp->GetXLib()->PushXErrorLevel( true );
     if ( maSecondary )
         XDestroyWindow( (Display*)maSystemChildData.pDisplay, maSecondary );
@@ -479,7 +479,7 @@ static sal_uInt16 sal_GetCode( int state )
 
 long X11SalObject::Dispatch( XEvent* pEvent )
 {
-    std::list< SalObject* >& rObjects = GetX11SalData()->GetDisplay()->getSalObjects();
+    std::list< SalObject* >& rObjects = GetGenericData()->GetSalDisplay()->getSalObjects();
 
     for( std::list< SalObject* >::iterator it = rObjects.begin(); it != rObjects.end(); ++it )
     {
-- 
cgit