summaryrefslogtreecommitdiff
path: root/include/vcl/event.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /include/vcl/event.hxx
parent7cbbefae224ab85343accb42b03f9431ec693a83 (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 'include/vcl/event.hxx')
-rw-r--r--include/vcl/event.hxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 9f7ab05f8ecf..3cd5f8ac1708 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -28,7 +28,7 @@
class AllSettings;
class OutputDevice;
-class Window;
+namespace vcl { class Window; }
struct IDataObject;
namespace com { namespace sun { namespace star { namespace awt {
@@ -393,7 +393,7 @@ inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt,
class VCL_DLLPUBLIC NotifyEvent
{
private:
- Window* mpWindow;
+ vcl::Window* mpWindow;
void* mpData;
sal_uInt16 mnType;
long mnRetValue;
@@ -401,12 +401,12 @@ private:
public:
NotifyEvent();
NotifyEvent( sal_uInt16 nType,
- Window* pWindow,
+ vcl::Window* pWindow,
const void* pEvent = NULL,
long nRet = 0 );
sal_uInt16 GetType() const { return mnType; }
- Window* GetWindow() const { return mpWindow; }
+ vcl::Window* GetWindow() const { return mpWindow; }
void* GetData() const { return mpData; }
void SetReturnValue( long nRet ) { mnRetValue = nRet; }
@@ -425,7 +425,7 @@ inline NotifyEvent::NotifyEvent()
mnRetValue = 0;
}
-inline NotifyEvent::NotifyEvent( sal_uInt16 nType, Window* pWindow,
+inline NotifyEvent::NotifyEvent( sal_uInt16 nType, vcl::Window* pWindow,
const void* pEvent, long nRet )
{
mpWindow = pWindow;