diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-24 08:51:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-24 08:51:32 +0300 |
| commit | d6bf76aa9cc67e18e07babc2c2798aa6bebd3a8f (patch) | |
| tree | 6f228693fd5187e19ef31e9f5e7feaca81eb1bb4 /vcl | |
| parent | c499b2ccdfaef475d6415d571353d51eddf1bef2 (diff) | |
vcl::KeyCode fixes
Change-Id: I3504e3152ee3969f35c639807ac2fb0753a8aa62
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/window/gtksalmenu.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index 09cd44f150d7..05563a139d36 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -72,7 +72,7 @@ static gchar* GetCommandForItem( GtkSalMenuItem* pSalMenuItem, gchar* aCurrentCo return aCommand; } -static void KeyCodeToGdkKey ( const KeyCode& rKeyCode, guint* pGdkKeyCode, GdkModifierType *pGdkModifiers ) +static void KeyCodeToGdkKey ( const vcl::KeyCode& rKeyCode, guint* pGdkKeyCode, GdkModifierType *pGdkModifiers ) { if ( pGdkKeyCode == NULL || pGdkModifiers == NULL ) return; @@ -304,7 +304,7 @@ void GtkSalMenu::ImplUpdate( gboolean bRecurse ) // Get internal menu item values. OUString aText = pVCLMenu->GetItemText( nId ); bool bEnabled = pVCLMenu->IsItemEnabled( nId ); - KeyCode nAccelKey = pVCLMenu->GetAccelKey( nId ); + vcl::KeyCode nAccelKey = pVCLMenu->GetAccelKey( nId ); bool bChecked = pVCLMenu->IsItemChecked( nId ); MenuItemBits itemBits = pVCLMenu->GetItemBits( nId ); @@ -609,7 +609,7 @@ void GtkSalMenu::NativeSetItemText( unsigned nSection, unsigned nItemPos, const g_free( aLabel ); } -void GtkSalMenu::NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const OUString& rKeyName ) +void GtkSalMenu::NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) { SolarMutexGuard aGuard; @@ -817,7 +817,7 @@ void GtkSalMenu::SetItemImage( unsigned, SalMenuItem*, const Image& ) { } -void GtkSalMenu::SetAccelerator( unsigned, SalMenuItem*, const KeyCode&, const OUString& ) +void GtkSalMenu::SetAccelerator( unsigned, SalMenuItem*, const vcl::KeyCode&, const OUString& ) { } |