summaryrefslogtreecommitdiff
path: root/vcl/source/window/window.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-05-23 13:17:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-09-28 08:48:21 +0100
commit8846ba52c5df9bcac77c3ba128d401d51ce81813 (patch)
treeb0d004efb38b111ddcd4c1de8fa0f69b1ff394b2 /vcl/source/window/window.cxx
parent8809036931363e3bdb2ed0ef627e1bffb1b19005 (diff)
blasted BorderWindows are a pain
Diffstat (limited to 'vcl/source/window/window.cxx')
-rw-r--r--vcl/source/window/window.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 70e7799b38f7..1321a4242d0d 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9776,6 +9776,14 @@ void Window::take_properties(Window &rOther)
mpWindowImpl->mbInterceptChildWindowKeyDown = pWindowImpl->mbInterceptChildWindowKeyDown;
std::swap(m_aWidgetProperties, rOther.m_aWidgetProperties);
+
+ bool bHasBorderWindow = mpWindowImpl->mpBorderWindow;
+ bool bOtherHasBorderWindow = pWindowImpl->mpBorderWindow;
+
+ assert(bHasBorderWindow == bOtherHasBorderWindow);
+
+ if (bHasBorderWindow && bOtherHasBorderWindow)
+ mpWindowImpl->mpBorderWindow->take_properties(*pWindowImpl->mpBorderWindow);
}
bool Window::set_property(const rtl::OString &rKey, const rtl::OString &rValue)