summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vcl/inc/vcl/layout.hxx5
-rw-r--r--vcl/source/control/button.cxx4
-rw-r--r--vcl/source/window/dlgctrl.cxx13
-rw-r--r--vcl/source/window/layout.cxx17
-rw-r--r--vcl/source/window/window.cxx3
5 files changed, 28 insertions, 14 deletions
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 1b007159965c..34c5696a0747 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -478,7 +478,10 @@ private:
Size getLegacyBestSizeForChildren(const Window &rWindow);
//Get first parent which is not a layout widget
-Window* getLegacyNonLayoutParent(Window *pParent);
+Window* getNonLayoutParent(Window *pParent);
+
+//Get first real parent which is not a layout widget
+Window* getNonLayoutRealParent(Window *pParent);
//Get next window after pChild of a pTopLevel window as
//if any intermediate layout widgets didn't exist
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 38bdee46455a..ae78dc0474e1 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1814,7 +1814,7 @@ void OKButton::Click()
// close parent if no link set
if ( !GetClickHdl() )
{
- Window* pParent = getLegacyNonLayoutParent(GetParent());
+ Window* pParent = getNonLayoutParent(this);
if ( pParent->IsSystemWindow() )
{
if ( pParent->IsDialog() )
@@ -1891,7 +1891,7 @@ void CancelButton::Click()
// close parent if link not set
if ( !GetClickHdl() )
{
- Window* pParent = getLegacyNonLayoutParent(GetParent());
+ Window* pParent = getNonLayoutParent(this);
if ( pParent->IsSystemWindow() )
{
if ( pParent->IsDialog() )
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 20027768eca1..8a47e5992cee 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -52,8 +52,9 @@ static sal_Bool ImplHasIndirectTabParent( Window* pWindow )
// The window has inderect tab parent if it is included in tab hierarchy
// of the indirect parent window
- return ( pWindow && pWindow->GetParent()
- && ( pWindow->GetParent()->ImplGetWindow()->GetStyle() & WB_CHILDDLGCTRL ) );
+ Window* pNonLayoutParent = getNonLayoutParent(pWindow);
+ return ( pNonLayoutParent
+ && ( pNonLayoutParent->ImplGetWindow()->GetStyle() & WB_CHILDDLGCTRL ) );
}
// -----------------------------------------------------------------------
@@ -68,8 +69,12 @@ static Window* ImplGetTopParentOfTabHierarchy( Window* pParent )
if ( pResult )
{
- while ( pResult->GetParent() && ( pResult->ImplGetWindow()->GetStyle() & WB_CHILDDLGCTRL ) )
- pResult = pResult->GetParent();
+ Window* pNonLayoutParent = getNonLayoutParent(pResult);
+ while ( pNonLayoutParent && ( pResult->ImplGetWindow()->GetStyle() & WB_CHILDDLGCTRL ) )
+ {
+ pResult = pNonLayoutParent;
+ pNonLayoutParent = getNonLayoutParent(pResult);
+ }
}
return pResult;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 9ab95793f706..8666ef5874b7 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1072,13 +1072,18 @@ Size getLegacyBestSizeForChildren(const Window &rWindow)
return aRet;
}
-Window* getLegacyNonLayoutParent(Window *pParent)
+Window* getNonLayoutParent(Window *pWindow)
{
- while (pParent && pParent->GetType() == WINDOW_CONTAINER)
- {
- pParent = pParent->GetParent();
- }
- return pParent;
+ while (pWindow && pWindow->GetType() == WINDOW_CONTAINER)
+ pWindow = pWindow->GetParent();
+ return pWindow;
+}
+
+Window* getNonLayoutRealParent(Window *pWindow)
+{
+ while (pWindow && pWindow->GetType() == WINDOW_CONTAINER)
+ pWindow = pWindow->ImplGetParent();
+ return pWindow;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d7e362d0c8aa..88df1b407c2a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -35,6 +35,7 @@
#include "unotools/fontcfg.hxx"
#include "unotools/confignode.hxx"
+#include "vcl/layout.hxx"
#include "vcl/unohelp.hxx"
#include "vcl/salgtype.hxx"
#include "vcl/event.hxx"
@@ -5218,7 +5219,7 @@ long Window::Notify( NotifyEvent& rNEvt )
if ( (rNEvt.GetType() == EVENT_KEYINPUT) || (rNEvt.GetType() == EVENT_KEYUP) )
{
if ( ImplIsOverlapWindow() ||
- ((ImplGetParent()->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) )
+ ((getNonLayoutRealParent(this)->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) )
{
nRet = ImplDlgCtrl( *rNEvt.GetKeyEvent(), rNEvt.GetType() == EVENT_KEYINPUT );
}