summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-05-19 14:46:50 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-05-19 15:53:14 +0100
commitb030ba2e13a02c231783966b23ded76247bb9690 (patch)
tree82cfbea3c5ba32cbfb456f3564ef2dfc1e10d62d /include
parentab25d7cfec956b6c31551ee5c00bd6bcae4b0bb5 (diff)
Resolve: "TODO(Q1): Make GetSystemData method virtual"
and remove the casting silliness, allowing the removal of cairo_cairo.?xx If anything is to go wrong I'd guess it'll be the windows directx stuff. Change-Id: I3e22c07b9c26ade9b27a245fdd8408de540643f4
Diffstat (limited to 'include')
-rw-r--r--include/vcl/syschild.hxx2
-rw-r--r--include/vcl/window.hxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx
index 9ef3f2611cab..9566cba9de10 100644
--- a/include/vcl/syschild.hxx
+++ b/include/vcl/syschild.hxx
@@ -44,7 +44,7 @@ public:
virtual ~SystemChildWindow();
virtual void dispose() override;
- const SystemEnvData* GetSystemChildSystemData() const;
+ virtual const SystemEnvData* GetSystemData() const override;
// per default systemchildwindows erase their background for better plugin support
// however, this might not always be required
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 5557eff48de2..4b6a415f24e7 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1215,8 +1215,8 @@ public:
void SaveBackground( const Point& rPos, const Size& rSize,
const Point& rDestOff, VirtualDevice& rSaveDevice );
- const SystemEnvData* GetWindowSystemData() const;
- css::uno::Any GetWindowSystemDataAny() const;
+ virtual const SystemEnvData* GetSystemData() const;
+ css::uno::Any GetSystemDataAny() const;
// API to set/query the component interfaces
virtual css::uno::Reference< css::awt::XWindowPeer >