summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/window/salobj.cxx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2011-10-03 12:21:34 +0100
committerMichael Meeks <michael.meeks@suse.com>2011-10-25 13:41:51 +0100
commita4d7b25e7a006c3105a226343bfb52d9e1bc356a (patch)
treed84cd975f087ca9fbb24fa0de2e5ae168b9eff72 /vcl/unx/generic/window/salobj.cxx
parent9b51808742ae4236b582b2693578e8db8e126a13 (diff)
generic: create shared display class and re-factor to use it
Diffstat (limited to 'vcl/unx/generic/window/salobj.cxx')
-rw-r--r--vcl/unx/generic/window/salobj.cxx12
1 files changed, 6 insertions, 6 deletions
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 )
{