diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-10-03 12:24:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-04 12:49:26 +0100 |
| commit | 7263bfec9a6511fc8f5c79135a7c853156560755 (patch) | |
| tree | 1f357cdf0ab849290952db0c600e2a6575eb635e /vcl | |
| parent | a06579a77a50de08b6e5b92a35939efc87492ed5 (diff) | |
be more tolerant of temporary frameless parents
Change-Id: I61a52d0f5a5e29d271c84fd7b85d80b7fac2e2ec
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/window.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index d874d811527b..44f1a584fc31 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1039,10 +1039,12 @@ void Window::ImplInsertWindow( Window* pParent ) mpWindowImpl->mpParent = pParent; mpWindowImpl->mpRealParent = pParent; - if ( pParent && !mpWindowImpl->mbFrame ) + Window* pFrameParent = NULL; + if (pParent && !mpWindowImpl->mbFrame) + pFrameParent = pParent->mpWindowImpl->mpFrameWindow; + if (pFrameParent) { // search frame window and set window frame data - Window* pFrameParent = pParent->mpWindowImpl->mpFrameWindow; mpWindowImpl->mpFrameData = pFrameParent->mpWindowImpl->mpFrameData; mpWindowImpl->mpFrame = pFrameParent->mpWindowImpl->mpFrame; mpWindowImpl->mpFrameWindow = pFrameParent; |