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 /slideshow/test | |
| 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 'slideshow/test')
| -rw-r--r-- | slideshow/test/demoshow.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index 7674970d107a..e3409e59e226 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -305,10 +305,10 @@ public: virtual sal_uInt16 Exception( sal_uInt16 nError ); }; -class ChildWindow : public Window +class ChildWindow : public vcl::Window { public: - ChildWindow( Window* pParent ); + ChildWindow( vcl::Window* pParent ); virtual ~ChildWindow(); virtual void Paint( const Rectangle& rRect ); virtual void Resize(); @@ -322,7 +322,7 @@ private: uno::Reference< presentation::XSlideShow > mxShow; }; -ChildWindow::ChildWindow( Window* pParent ) : +ChildWindow::ChildWindow( vcl::Window* pParent ) : Window(pParent, WB_CLIPCHILDREN | WB_BORDER| WB_3DLOOK ), mpView(), mxShow() @@ -402,7 +402,7 @@ private: }; DemoWindow::DemoWindow() : - Dialog((Window*)NULL), + Dialog((vcl::Window*)NULL), maLeftChild( this ), maRightTopChild( this ), maRightBottomChild( this ), |