diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /vcl/unx/kde/salnativewidgets-kde.cxx | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'vcl/unx/kde/salnativewidgets-kde.cxx')
| -rw-r--r-- | vcl/unx/kde/salnativewidgets-kde.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 816292668aa6..c4e16c3c8a89 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -272,7 +272,7 @@ class WidgetPainter */ bool drawStyledWidget( QWidget *pWidget, ControlState nState, const ImplControlValue& aValue, - Display *dpy, XLIB_Window drawable, SalX11Screen nXScreen, + Display *dpy, ::Window drawable, SalX11Screen nXScreen, int nDepth, GC gc, ControlPart nPart = PART_ENTIRE_CONTROL ); @@ -465,7 +465,7 @@ WidgetPainter::~WidgetPainter( void ) bool WidgetPainter::drawStyledWidget( QWidget *pWidget, ControlState nState, const ImplControlValue& aValue, - Display *dpy, XLIB_Window drawable, SalX11Screen nXScreen, + Display *dpy, ::Window drawable, SalX11Screen nXScreen, int nDepth, GC gc, ControlPart nPart ) { if ( !pWidget ) @@ -1383,7 +1383,7 @@ bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, bool bReturn = false; Display *dpy = GetXDisplay(); - XLIB_Window drawable = GetDrawable(); + ::Window drawable = GetDrawable(); GC gc = SelectPen(); //SelectFont(); // GC with current clipping region set if ( (nType == CTRL_PUSHBUTTON) && (nPart == PART_ENTIRE_CONTROL) ) |