diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-03 19:46:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-03 22:48:44 +0100 |
| commit | 1bacc1771007a3b0a28454e371aaa28dafcc5eb3 (patch) | |
| tree | 03c3c4dc29ea6dd79028a632c7aecb9b18e658fc /vcl | |
| parent | 3253b8648d529a74f602e4d02387a1bc963c19d4 (diff) | |
move ImplWindowAutoMnemonic into DoInitialLayout
so Floating windows get automnemonics as well, e.g.
the Floating Sort floating window of reportdesign
Change-Id: I0805840f7b0b2329e210c77e32c5eabfdac387fb
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/syswin.cxx | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index ff6ab0c1b8c3..9ec2a2f7f582 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -618,9 +618,6 @@ void Dialog::StateChanged( StateChangedType nType ) { if (nType == STATE_CHANGE_INITSHOW) { - if ( GetSettings().GetStyleSettings().GetAutoMnemonic() ) - ImplWindowAutoMnemonic( this ); - DoInitialLayout(); if ( !HasChildPathFocus() || HasFocus() ) diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 6a21d22bc4bf..39cf665d478f 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -24,6 +24,7 @@ #include <tools/debug.hxx> #include <vcl/layout.hxx> +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/menu.hxx> #include <vcl/event.hxx> @@ -1089,8 +1090,13 @@ void SystemWindow::setOptimalLayoutSize() setPosSizeOnContainee(aSize, *pBox); } +extern void ImplWindowAutoMnemonic(Window* pWindow); + void SystemWindow::DoInitialLayout() { + if ( GetSettings().GetStyleSettings().GetAutoMnemonic() ) + ImplWindowAutoMnemonic( this ); + if (isLayoutEnabled()) { mbIsCalculatingInitialLayoutSize = true; |