summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-12 14:15:34 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-12 14:16:30 +0000
commite5cb1989520baf321961dbb82437d1b00a2a499c (patch)
tree847ed522bc8632fa0c1d4ca510d61e106ba76ec3 /vcl
parentc15913b273c74bbfe7b24f99934e09a3249a81a9 (diff)
Resolves: fdo#75982 set mnemonics targets for hidden labels
the key piece though is that labels that have mnemonic targets are always candidates for getting mnemonics generated for them Change-Id: Ie4bcbc18e94467936f40875c749cd22793021d0c
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/dialog.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 55f985668a49..ab03297f744a 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -87,6 +87,11 @@ static bool ImplIsMnemonicCtrl( Window* pWindow )
if ( pWindow->GetType() == WINDOW_FIXEDTEXT )
{
+ FixedText *pText = static_cast<FixedText*>(pWindow);
+ if (pText->get_mnemonic_widget())
+ return true;
+ //This is the legacy pre-layout logic which we retain
+ //until we can be sure we can remove it
if ( pWindow->GetStyle() & (WB_INFO | WB_NOLABEL) )
return false;
Window* pNextWindow = pWindow->GetWindow( WINDOW_NEXT );