summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-30 21:53:56 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-07-31 21:32:39 +0100
commit76be678e7478e4863a8360e26425a39afa5af4fb (patch)
treef74aa71e9af81d33ccd54b229cae7ef2f541f435 /vcl
parentff4217e9e4f90a8dd09e635a35665a64846b4505 (diff)
rename ImplWindowAutoMnemonic and expose
Change-Id: Iddb0d84b6dbfeb263a68ddc3b8b5c39bbdcf46f6
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/svdata.hxx1
-rw-r--r--vcl/source/window/dialog.cxx2
-rw-r--r--vcl/source/window/dockwin.cxx4
-rw-r--r--vcl/source/window/syswin.cxx4
-rw-r--r--vcl/source/window/tabpage.cxx4
5 files changed, 7 insertions, 8 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 4ef13cada984..b538d48e64a4 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -349,7 +349,6 @@ VCL_PLUGIN_PUBLIC ResMgr* ImplGetResMgr();
VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr
DockingManager* ImplGetDockingManager();
BlendFrameCache* ImplGetBlendFrameCache();
-void ImplWindowAutoMnemonic( vcl::Window* pWindow );
bool ImplCallHotKey( const vcl::KeyCode& rKeyCode );
void ImplFreeHotKeyData();
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 63657f5c1557..ec4a3be527ef 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -189,7 +189,7 @@ vcl::Window * firstLogicalChildOfParent(vcl::Window *pTopLevel)
return pChild;
}
-void ImplWindowAutoMnemonic( vcl::Window* pWindow )
+void Accelerator::GenerateAutoMnemonicsOnHierarchy(vcl::Window* pWindow)
{
MnemonicGenerator aMnemonicGenerator;
vcl::Window* pGetChild;
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index da9ffc596c5e..56c968c733c7 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -697,8 +697,8 @@ void DockingWindow::Resizing( Size& )
void DockingWindow::DoInitialLayout()
{
- if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
- ImplWindowAutoMnemonic( this );
+ if (GetSettings().GetStyleSettings().GetAutoMnemonic())
+ Accelerator::GenerateAutoMnemonicsOnHierarchy(this);
if (isLayoutEnabled())
{
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 836bca900efe..d482cbd5ba0a 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -1152,8 +1152,8 @@ void SystemWindow::setOptimalLayoutSize()
void SystemWindow::DoInitialLayout()
{
- if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
- ImplWindowAutoMnemonic( this );
+ if (GetSettings().GetStyleSettings().GetAutoMnemonic())
+ Accelerator::GenerateAutoMnemonicsOnHierarchy(this);
if (isLayoutEnabled())
{
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 36c950658c86..e09f18fe193f 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -104,8 +104,8 @@ void TabPage::StateChanged( StateChangedType nType )
if ( nType == StateChangedType::InitShow )
{
- if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
- ImplWindowAutoMnemonic( this );
+ if (GetSettings().GetStyleSettings().GetAutoMnemonic())
+ Accelerator::GenerateAutoMnemonicsOnHierarchy(this);
// FIXME: no layouting, workaround some clipping issues
ImplAdjustNWFSizes();
}