diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-19 14:00:55 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-19 16:51:47 +1000 |
| commit | 9ad131f3c9980a7135653f187170f9ffb0fb59d8 (patch) | |
| tree | 7166bb2a034ba0fec018cfbdbcc7abc450a16e30 /include | |
| parent | 1c0f94abb59296ec9e686dd3ea6b2cd963923631 (diff) | |
fdo#74702 Allow Window & OutputDevice to handle erasure
Window handles erasure of backgrounds for controls. Probably this
needs to be moved to a more specific class in the future, but for
now it should go into Windows.
I also removed an unnecessary temporary variable, and removed the
need to case the pointer to this from OutputDevice to Window. In
other words, this code has been vastly simplified :-)
Change-Id: I44b91cf68f29424ffbc1679b66fbeaeb024880e9
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 0af54185ee11..d0bd887ada50 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1436,8 +1436,8 @@ public: Size GetOutputSize() const { return PixelToLogic( GetOutputSizePixel() ); } - void Erase(); - void Erase( const Rectangle& rRect ) { DrawWallpaper( rRect, GetBackground() ); } + virtual void Erase(); + virtual void Erase( const Rectangle& rRect ) { DrawWallpaper( rRect, GetBackground() ); } bool AddTempDevFont( const OUString& rFileURL, const OUString& rFontName ); int GetDevFontCount() const; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index f71ae689c1a7..25063dc957d6 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -606,6 +606,8 @@ public: virtual void KeyUp( const KeyEvent& rKEvt ); virtual void PrePaint(); virtual void Paint( const Rectangle& rRect ); + virtual void Erase() SAL_OVERRIDE; + virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { OutputDevice::Erase( rRect ); } virtual void PostPaint(); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); |