diff options
Diffstat (limited to 'vcl')
44 files changed, 136 insertions, 136 deletions
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 932abba105b3..d803f722096b 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -430,7 +430,7 @@ OUString SvpSalFrame::GetKeyName( sal_uInt16 ) return OUString(); } -bool SvpSalFrame::MapUnicodeToKeyCode( sal_Unicode, LanguageType, KeyCode& ) +bool SvpSalFrame::MapUnicodeToKeyCode( sal_Unicode, LanguageType, vcl::KeyCode& ) { return false; } diff --git a/vcl/inc/accel.h b/vcl/inc/accel.h index e3e92c78a8a5..b1a07b8abd47 100644 --- a/vcl/inc/accel.h +++ b/vcl/inc/accel.h @@ -27,8 +27,8 @@ class Accelerator; class ImplAccelEntry { public: - sal_uInt16 mnId; - KeyCode maKeyCode; + sal_uInt16 mnId; + vcl::KeyCode maKeyCode; Accelerator* mpAccel; Accelerator* mpAutoAccel; bool mbEnabled; diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx index 4645cb27abc2..671c34715ff9 100644 --- a/vcl/inc/accmgr.hxx +++ b/vcl/inc/accmgr.hxx @@ -22,8 +22,9 @@ #include <vector> +#include <vcl/keycod.hxx> + class Accelerator; -class KeyCode; typedef ::std::vector< Accelerator* > ImplAccelList; @@ -47,7 +48,7 @@ public: void EndSequence( bool bCancel = false ); void FlushAccel() { EndSequence( true ); } - bool IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ); + bool IsAccelKey( const vcl::KeyCode& rKeyCode, sal_uInt16 nRepeat ); }; #endif // INCLUDED_VCL_INC_ACCMGR_HXX diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 1aec3aafae1f..56f8c5fbf11e 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -112,7 +112,7 @@ public: virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE; virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE; virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) SAL_OVERRIDE; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE; virtual LanguageType GetInputLanguage() SAL_OVERRIDE; virtual void UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE; virtual void Beep() SAL_OVERRIDE; diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 24fb17f2a3db..be06137a3543 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -141,7 +141,7 @@ public: virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE; virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE; virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) SAL_OVERRIDE; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE; virtual LanguageType GetInputLanguage() SAL_OVERRIDE; virtual void UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE; virtual void Beep() SAL_OVERRIDE; diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h index 6997495c11e0..cac87f023b23 100644 --- a/vcl/inc/osx/salmenu.h +++ b/vcl/inc/osx/salmenu.h @@ -68,7 +68,7 @@ public: virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE; virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) SAL_OVERRIDE; virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) SAL_OVERRIDE; - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE; + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE; virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE; virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags) SAL_OVERRIDE; virtual bool AddMenuBarButton( const SalMenuButtonItem& ) SAL_OVERRIDE; diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 87ee9419f6eb..e4882ff5d827 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -173,7 +173,7 @@ public: // returns in 'rKeyCode' the single keycode that translates to the given unicode when using a keyboard layout of language 'aLangType' // returns false if no mapping exists or function not supported // this is required for advanced menu support - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) = 0; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) = 0; // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index 5711534cfd99..ee9bdb76a6f5 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -75,7 +75,7 @@ public: virtual void EnableItem( unsigned nPos, bool bEnable ) = 0; virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText )= 0; virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) = 0; - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ) = 0; + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) = 0; virtual void GetSystemMenuData( SystemMenuData* pData ) = 0; virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags); virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index b8df3e711ca8..44b229bf2727 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -29,12 +29,12 @@ #include "tools/fldunit.hxx" #include "tools/color.hxx" #include "tools/debug.hxx" - -#include "vcl/vclevent.hxx" -#include "vcl/bitmapex.hxx" #include "tools/solar.h" -#include "vcl/svapp.hxx" +#include "vcl/bitmapex.hxx" #include "vcl/dllapi.h" +#include "vcl/keycod.hxx" +#include "vcl/svapp.hxx" +#include "vcl/vclevent.hxx" #include "unotools/options.hxx" @@ -62,7 +62,6 @@ class ImplTBDragMgr; class ImplIdleMgr; class FloatingWindow; class AllSettings; -class KeyCode; class NotifyEvent; class Timer; class AutoTimer; @@ -353,7 +352,7 @@ void ImplWindowAutoMnemonic( Window* pWindow ); void ImplUpdateSystemProcessWindow(); Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); -bool ImplCallHotKey( const KeyCode& rKeyCode ); +bool ImplCallHotKey( const vcl::KeyCode& rKeyCode ); void ImplFreeHotKeyData(); void ImplFreeEventHookData(); diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index becc2b3031aa..fe998348defe 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -403,7 +403,7 @@ public: virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE; virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) SAL_OVERRIDE; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE; // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index c9df33c7bb76..8a3d77e963af 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -71,7 +71,7 @@ public: virtual void ShowItem( unsigned nPos, bool bShow ) SAL_OVERRIDE; virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) SAL_OVERRIDE; virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) SAL_OVERRIDE; - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE; + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE; virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE; virtual void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } @@ -95,7 +95,7 @@ public: gboolean bIsSubmenu ); void NativeSetEnableItem( gchar* aCommand, gboolean bEnable ); void NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItemBits bits, gboolean bCheck ); - void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const OUString& rKeyName ); + void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ); void DispatchCommand( gint itemId, const gchar* aCommand ); void Activate(); diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 0350f1659974..000ffba6826e 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -247,7 +247,7 @@ public: virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE; virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE; virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) SAL_OVERRIDE; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE; virtual LanguageType GetInputLanguage() SAL_OVERRIDE; virtual void UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE; virtual void Beep() SAL_OVERRIDE; diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h index 566c8e0f78af..a2e600e8461e 100644 --- a/vcl/inc/unx/salmenu.h +++ b/vcl/inc/unx/salmenu.h @@ -40,7 +40,7 @@ public: virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE; virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) SAL_OVERRIDE; virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) SAL_OVERRIDE; - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE; + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE; virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE; }; diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index 6a13b80dca7f..7389f67e81f5 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -118,7 +118,7 @@ public: virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); virtual OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); virtual void Beep(); diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h index bd82312f06ee..4a45f911cb15 100644 --- a/vcl/inc/win/salmenu.h +++ b/vcl/inc/win/salmenu.h @@ -39,7 +39,7 @@ public: virtual void EnableItem( unsigned nPos, bool bEnable ); virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ); - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ); virtual void GetSystemMenuData( SystemMenuData* pData ); HMENU mhMenu; // the menu handle diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index d2422ca69d12..96d20a9330dc 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1491,7 +1491,7 @@ bool AquaSalFrame::SetPluginParent( SystemParentData* ) return false; } -bool AquaSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) +bool AquaSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , vcl::KeyCode& ) { // not supported yet return FALSE; diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index 4f3920ed65bf..cc5cc06cd385 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -692,7 +692,7 @@ void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, } } -void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& /*rKeyName*/ ) +void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& /*rKeyName*/ ) { sal_uInt16 nModifier; sal_Unicode nCommandKey = 0; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 80ca354e790c..e2dc111ae65c 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -77,11 +77,11 @@ using namespace ::com::sun::star::uno; class ImplReservedKey { public: - ImplReservedKey( KeyCode aKeyCode, sal_uInt16 nResId ) : + ImplReservedKey( vcl::KeyCode aKeyCode, sal_uInt16 nResId ) : mKeyCode(aKeyCode), mnResId( nResId) {} - KeyCode mKeyCode; + vcl::KeyCode mKeyCode; sal_uInt16 mnResId; }; @@ -94,31 +94,31 @@ namespace { static ImplReservedKey ImplReservedKeys[] = { - ImplReservedKey(KeyCode(KEY_F1,0), SV_SHORTCUT_HELP), - ImplReservedKey(KeyCode(KEY_F1,KEY_SHIFT), SV_SHORTCUT_ACTIVEHELP), - ImplReservedKey(KeyCode(KEY_F1,KEY_MOD1), SV_SHORTCUT_CONTEXTHELP), - ImplReservedKey(KeyCode(KEY_F2,KEY_SHIFT), SV_SHORTCUT_CONTEXTHELP), - ImplReservedKey(KeyCode(KEY_F4,KEY_MOD1), SV_SHORTCUT_DOCKUNDOCK), - ImplReservedKey(KeyCode(KEY_F4,KEY_MOD2), SV_SHORTCUT_DOCKUNDOCK), - ImplReservedKey(KeyCode(KEY_F4,KEY_MOD1|KEY_MOD2), SV_SHORTCUT_DOCKUNDOCK), - ImplReservedKey(KeyCode(KEY_F6,0), SV_SHORTCUT_NEXTSUBWINDOW), - ImplReservedKey(KeyCode(KEY_F6,KEY_MOD1), SV_SHORTCUT_TODOCUMENT), - ImplReservedKey(KeyCode(KEY_F6,KEY_SHIFT), SV_SHORTCUT_PREVSUBWINDOW), - ImplReservedKey(KeyCode(KEY_F6,KEY_MOD1|KEY_SHIFT), SV_SHORTCUT_SPLITTER), - ImplReservedKey(KeyCode(KEY_F10,0), SV_SHORTCUT_MENUBAR) + ImplReservedKey(vcl::KeyCode(KEY_F1,0), SV_SHORTCUT_HELP), + ImplReservedKey(vcl::KeyCode(KEY_F1,KEY_SHIFT), SV_SHORTCUT_ACTIVEHELP), + ImplReservedKey(vcl::KeyCode(KEY_F1,KEY_MOD1), SV_SHORTCUT_CONTEXTHELP), + ImplReservedKey(vcl::KeyCode(KEY_F2,KEY_SHIFT), SV_SHORTCUT_CONTEXTHELP), + ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD1), SV_SHORTCUT_DOCKUNDOCK), + ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD2), SV_SHORTCUT_DOCKUNDOCK), + ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD1|KEY_MOD2), SV_SHORTCUT_DOCKUNDOCK), + ImplReservedKey(vcl::KeyCode(KEY_F6,0), SV_SHORTCUT_NEXTSUBWINDOW), + ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_MOD1), SV_SHORTCUT_TODOCUMENT), + ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_SHIFT), SV_SHORTCUT_PREVSUBWINDOW), + ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_MOD1|KEY_SHIFT), SV_SHORTCUT_SPLITTER), + ImplReservedKey(vcl::KeyCode(KEY_F10,0), SV_SHORTCUT_MENUBAR) #ifdef UNX , - ImplReservedKey(KeyCode(KEY_1,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(KeyCode(KEY_2,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(KeyCode(KEY_3,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(KeyCode(KEY_4,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(KeyCode(KEY_5,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(KeyCode(KEY_6,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(KeyCode(KEY_7,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(KeyCode(KEY_8,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(KeyCode(KEY_9,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(KeyCode(KEY_0,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(KeyCode(KEY_ADD,KEY_SHIFT|KEY_MOD1), 0) + ImplReservedKey(vcl::KeyCode(KEY_1,KEY_SHIFT|KEY_MOD1), 0), + ImplReservedKey(vcl::KeyCode(KEY_2,KEY_SHIFT|KEY_MOD1), 0), + ImplReservedKey(vcl::KeyCode(KEY_3,KEY_SHIFT|KEY_MOD1), 0), + ImplReservedKey(vcl::KeyCode(KEY_4,KEY_SHIFT|KEY_MOD1), 0), + ImplReservedKey(vcl::KeyCode(KEY_5,KEY_SHIFT|KEY_MOD1), 0), + ImplReservedKey(vcl::KeyCode(KEY_6,KEY_SHIFT|KEY_MOD1), 0), + ImplReservedKey(vcl::KeyCode(KEY_7,KEY_SHIFT|KEY_MOD1), 0), + ImplReservedKey(vcl::KeyCode(KEY_8,KEY_SHIFT|KEY_MOD1), 0), + ImplReservedKey(vcl::KeyCode(KEY_9,KEY_SHIFT|KEY_MOD1), 0), + ImplReservedKey(vcl::KeyCode(KEY_0,KEY_SHIFT|KEY_MOD1), 0), + ImplReservedKey(vcl::KeyCode(KEY_ADD,KEY_SHIFT|KEY_MOD1), 0) #endif }; static ReservedKeys aKeys @@ -142,7 +142,7 @@ struct ImplHotKey { ImplHotKey* mpNext; void* mpUserData; - KeyCode maKeyCode; + vcl::KeyCode maKeyCode; Link maLink; }; @@ -324,7 +324,7 @@ sal_uLong Application::GetReservedKeyCodeCount() return ImplReservedKeys::get()->second; } -const KeyCode* Application::GetReservedKeyCode( sal_uLong i ) +const vcl::KeyCode* Application::GetReservedKeyCode( sal_uLong i ) { if( i >= GetReservedKeyCodeCount() ) return NULL; @@ -1449,7 +1449,7 @@ void Application::SetFilterHdl( const Link& rLink ) ImplGetSVData()->maGDIData.mpGrfConverter->SetFilterHdl( rLink ); } -bool ImplCallHotKey( const KeyCode& rKeyCode ) +bool ImplCallHotKey( const vcl::KeyCode& rKeyCode ) { ImplSVData* pSVData = ImplGetSVData(); ImplHotKey* pHotKeyData = pSVData->maAppData.mpFirstHotKey; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 60cff9b384b3..a43b09b45755 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1249,7 +1249,7 @@ void PushButton::Tracking( const TrackingEvent& rTEvt ) void PushButton::KeyInput( const KeyEvent& rKEvt ) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); if ( !aKeyCode.GetModifier() && ((aKeyCode.GetCode() == KEY_RETURN) || (aKeyCode.GetCode() == KEY_SPACE)) ) @@ -1275,7 +1275,7 @@ void PushButton::KeyInput( const KeyEvent& rKEvt ) void PushButton::KeyUp( const KeyEvent& rKEvt ) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); if ( (ImplGetButtonState() & BUTTON_DRAW_PRESSED) && ((aKeyCode.GetCode() == KEY_RETURN) || (aKeyCode.GetCode() == KEY_SPACE)) ) @@ -2389,7 +2389,7 @@ void RadioButton::Tracking( const TrackingEvent& rTEvt ) void RadioButton::KeyInput( const KeyEvent& rKEvt ) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); if ( !aKeyCode.GetModifier() && (aKeyCode.GetCode() == KEY_SPACE) ) { @@ -2410,7 +2410,7 @@ void RadioButton::KeyInput( const KeyEvent& rKEvt ) void RadioButton::KeyUp( const KeyEvent& rKEvt ) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); if ( (ImplGetButtonState() & BUTTON_DRAW_PRESSED) && (aKeyCode.GetCode() == KEY_SPACE) ) { @@ -3271,7 +3271,7 @@ void CheckBox::Tracking( const TrackingEvent& rTEvt ) void CheckBox::KeyInput( const KeyEvent& rKEvt ) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); if ( !aKeyCode.GetModifier() && (aKeyCode.GetCode() == KEY_SPACE) ) { @@ -3292,7 +3292,7 @@ void CheckBox::KeyInput( const KeyEvent& rKEvt ) void CheckBox::KeyUp( const KeyEvent& rKEvt ) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); if ( (ImplGetButtonState() & BUTTON_DRAW_PRESSED) && (aKeyCode.GetCode() == KEY_SPACE) ) { @@ -3869,7 +3869,7 @@ void DisclosureButton::ImplDrawCheckBoxState() void DisclosureButton::KeyInput( const KeyEvent& rKEvt ) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); if( !aKeyCode.GetModifier() && ( ( aKeyCode.GetCode() == KEY_ADD ) || diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index e886e0f6dbfc..ac5c57b7bdd2 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2833,13 +2833,13 @@ PopupMenu* Edit::CreatePopupMenu() pPopup->SetMenuFlags ( MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES ); if ( rStyleSettings.GetAcceleratorsInContextMenus() ) { - pPopup->SetAccelKey( SV_MENU_EDIT_UNDO, KeyCode( KEYFUNC_UNDO ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_CUT, KeyCode( KEYFUNC_CUT ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_COPY, KeyCode( KEYFUNC_COPY ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_PASTE, KeyCode( KEYFUNC_PASTE ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_DELETE, KeyCode( KEYFUNC_DELETE ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_SELECTALL, KeyCode( KEY_A, false, true, false, false ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_INSERTSYMBOL, KeyCode( KEY_S, true, true, false, false ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_UNDO, vcl::KeyCode( KEYFUNC_UNDO ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_CUT, vcl::KeyCode( KEYFUNC_CUT ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_COPY, vcl::KeyCode( KEYFUNC_COPY ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_PASTE, vcl::KeyCode( KEYFUNC_PASTE ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_DELETE, vcl::KeyCode( KEYFUNC_DELETE ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_SELECTALL, vcl::KeyCode( KEY_A, false, true, false, false ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_INSERTSYMBOL, vcl::KeyCode( KEY_S, true, true, false, false ) ); } return pPopup; } diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 2287164554f6..9800030d3b99 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -458,7 +458,7 @@ static bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, return false; Selection aOldSel = pEdit->GetSelection(); - KeyCode aCode = rKEvt.GetKeyCode(); + vcl::KeyCode aCode = rKEvt.GetKeyCode(); sal_Unicode cChar = rKEvt.GetCharCode(); sal_uInt16 nKeyCode = aCode.GetCode(); bool bShift = aCode.IsShift(); diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 194c7c3556ce..b1f02fca1f5a 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -1350,7 +1350,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) sal_Int32 nSelect = LISTBOX_ENTRY_NOTFOUND; LB_EVENT_TYPE eLET = LET_KEYMOVE; - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); bool bShift = aKeyCode.IsShift(); bool bCtrl = aKeyCode.IsMod1() || aKeyCode.IsMod3(); @@ -2522,7 +2522,7 @@ bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt ) if( !pData->GetModifier() && ( pData->GetMode() == COMMAND_WHEEL_SCROLL ) ) { sal_uInt16 nKey = ( pData->GetDelta() < 0 ) ? KEY_DOWN : KEY_UP; - KeyEvent aKeyEvent( 0, KeyCode( nKey ) ); + KeyEvent aKeyEvent( 0, vcl::KeyCode( nKey ) ); bDone = ProcessKeyInput( aKeyEvent ); } } diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 8e11b3812169..d543c291ac95 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -134,7 +134,7 @@ void MenuButton::MouseButtonDown( const MouseEvent& rMEvt ) void MenuButton::KeyInput( const KeyEvent& rKEvt ) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); sal_uInt16 nCode = aKeyCode.GetCode(); if ( (nCode == KEY_DOWN) && aKeyCode.IsMod2() ) ImplExecuteMenu(); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index dd0c5c9b1fcd..223705e714c3 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -962,8 +962,8 @@ bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) if ( GetPageCount() > 1 ) { - KeyCode aKeyCode = rKeyEvent.GetKeyCode(); - sal_uInt16 nKeyCode = aKeyCode.GetCode(); + vcl::KeyCode aKeyCode = rKeyEvent.GetKeyCode(); + sal_uInt16 nKeyCode = aKeyCode.GetCode(); if ( aKeyCode.IsMod1() ) { @@ -1030,7 +1030,7 @@ void TabControl::KeyInput( const KeyEvent& rKEvt ) mpTabCtrlData->mpListBox->KeyInput( rKEvt ); else if ( GetPageCount() > 1 ) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); sal_uInt16 nKeyCode = aKeyCode.GetCode(); if ( (nKeyCode == KEY_LEFT) || (nKeyCode == KEY_RIGHT) ) diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index f331d80b3068..97bacbf3bb3b 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -149,7 +149,7 @@ void Accelerator::ImplInit() mpDel = NULL; } -ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode& rKeyCode ) const +ImplAccelEntry* Accelerator::ImplGetAccelData( const vcl::KeyCode& rKeyCode ) const { ImplAccelMap::iterator it = mpData->maKeyMap.find( rKeyCode.GetFullCode() ); if( it != mpData->maKeyMap.end() ) @@ -192,7 +192,7 @@ void Accelerator::ImplDeleteData() mpData->maIdList.clear(); } -void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, +void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode, bool bEnable, Accelerator* pAutoAccel ) { DBG_ASSERT( nItemId, "Accelerator::InsertItem(): ItemId == 0" ); @@ -205,17 +205,17 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, sal_uInt16 nCode4; ImplGetKeyCode( rKeyCode.GetFunction(), nCode1, nCode2, nCode3, nCode4 ); if ( nCode1 ) - ImplInsertAccel( nItemId, KeyCode( nCode1, nCode1 ), bEnable, pAutoAccel ); + ImplInsertAccel( nItemId, vcl::KeyCode( nCode1, nCode1 ), bEnable, pAutoAccel ); if ( nCode2 ) { if ( pAutoAccel ) pAutoAccel = new Accelerator( *pAutoAccel ); - ImplInsertAccel( nItemId, KeyCode( nCode2, nCode2 ), bEnable, pAutoAccel ); + ImplInsertAccel( nItemId, vcl::KeyCode( nCode2, nCode2 ), bEnable, pAutoAccel ); if ( nCode3 ) { if ( pAutoAccel ) pAutoAccel = new Accelerator( *pAutoAccel ); - ImplInsertAccel( nItemId, KeyCode( nCode3, nCode3 ), bEnable, pAutoAccel ); + ImplInsertAccel( nItemId, vcl::KeyCode( nCode3, nCode3 ), bEnable, pAutoAccel ); } } return; @@ -312,7 +312,7 @@ void Accelerator::Select() maSelectHdl.Call( this ); } -void Accelerator::InsertItem( sal_uInt16 nItemId, const KeyCode& rKeyCode ) +void Accelerator::InsertItem( sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode ) { ImplInsertAccel( nItemId, rKeyCode, true, NULL ); } @@ -323,7 +323,7 @@ void Accelerator::InsertItem( const ResId& rResId ) sal_uLong nObjMask; sal_uInt16 nAccelKeyId; sal_uInt16 bDisable; - KeyCode aKeyCode; + vcl::KeyCode aKeyCode; Accelerator* pAutoAccel = NULL; GetRes( rResId.SetRT( RSC_ACCELITEM ) ); @@ -336,7 +336,7 @@ void Accelerator::InsertItem( const ResId& rResId ) // new context was created RSHEADER_TYPE * pKeyCodeRes = (RSHEADER_TYPE *)GetClassRes(); ResId aResId( pKeyCodeRes, *rResId.GetResMgr()); - aKeyCode = KeyCode( aResId ); + aKeyCode = vcl::KeyCode( aResId ); IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) ); } @@ -355,14 +355,14 @@ sal_uInt16 Accelerator::GetItemCount() const return (sal_uInt16)mpData->maIdList.size(); } -KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const +vcl::KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const { sal_uInt16 nIndex = ImplAccelEntryGetFirstPos( &(mpData->maIdList), nItemId ); if ( nIndex != ACCELENTRY_NOTFOUND ) return mpData->maIdList[ nIndex ]->maKeyCode; else - return KeyCode(); + return vcl::KeyCode(); } sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const @@ -390,7 +390,7 @@ Accelerator& Accelerator::operator=( const Accelerator& rAccel ) // assign new data maHelpStr = rAccel.maHelpStr; - maCurKeyCode = KeyCode(); + maCurKeyCode = vcl::KeyCode(); mnCurId = 0; mnCurRepeat = 0; mbIsCancel = false; diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index a5dfaba99e5b..3ce6099355e9 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -106,7 +106,7 @@ void ImplAccelManager::EndSequence( bool bCancel ) mpSequenceList = NULL; } -bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ) +bool ImplAccelManager::IsAccelKey( const vcl::KeyCode& rKeyCode, sal_uInt16 nRepeat ) { Accelerator* pAccel; @@ -165,7 +165,7 @@ bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ) // did the accelerator survive the call if ( !bDel ) { - pAccel->maCurKeyCode = KeyCode(); + pAccel->maCurKeyCode = vcl::KeyCode(); pAccel->mnCurId = 0; pAccel->mnCurRepeat = 0; pAccel->mpDel = NULL; @@ -236,7 +236,7 @@ bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ) // if the accelerator did survive the call if ( !bDel ) { - pAccel->maCurKeyCode = KeyCode(); + pAccel->maCurKeyCode = vcl::KeyCode(); pAccel->mnCurId = 0; pAccel->mnCurRepeat = 0; pAccel->mpDel = NULL; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index ff88496af8a7..9ef687b08df5 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -2481,24 +2481,24 @@ OString VclBuilder::convertMnemonicMarkup(const OString &rIn) namespace { - KeyCode makeKeyCode(const OString &rKey) + vcl::KeyCode makeKeyCode(const OString &rKey) { if (rKey == "Insert") - return KeyCode(KEY_INSERT); + return vcl::KeyCode(KEY_INSERT); else if (rKey == "Delete") - return KeyCode(KEY_DELETE); + return vcl::KeyCode(KEY_DELETE); assert (rKey.getLength() == 1); sal_Char cChar = rKey.toChar(); if (cChar >= 'a' && cChar <= 'z') - return KeyCode(KEY_A + (cChar - 'a')); + return vcl::KeyCode(KEY_A + (cChar - 'a')); else if (cChar >= 'A' && cChar <= 'Z') - return KeyCode(KEY_A + (cChar - 'A')); + return vcl::KeyCode(KEY_A + (cChar - 'A')); else if (cChar >= '0' && cChar <= '9') - return KeyCode(KEY_0 + (cChar - 'A')); + return vcl::KeyCode(KEY_0 + (cChar - 'A')); - return KeyCode(cChar); + return vcl::KeyCode(cChar); } } diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index a686c7844280..4909b9560c1a 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -565,8 +565,8 @@ bool Dialog::Notify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - KeyCode aKeyCode = pKEvt->GetKeyCode(); - sal_uInt16 nKeyCode = aKeyCode.GetCode(); + vcl::KeyCode aKeyCode = pKEvt->GetKeyCode(); + sal_uInt16 nKeyCode = aKeyCode.GetCode(); if ( (nKeyCode == KEY_ESCAPE) && ((GetStyle() & WB_CLOSEABLE) || ImplGetCancelButton( this ) || ImplGetOKButton( this )) ) diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 7b4ca2a6f5a7..a11888854bca 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -574,7 +574,7 @@ namespace bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); sal_uInt16 nKeyCode = aKeyCode.GetCode(); Window* pSWindow; Window* pTempWindow; @@ -1116,7 +1116,7 @@ KeyEvent Window::GetActivationKey() const nCode = KEY_POINT; else if( nAccel == '-' ) nCode = KEY_SUBTRACT; - KeyCode aKeyCode( nCode, false, false, true, false ); + vcl::KeyCode aKeyCode( nCode, false, false, true, false ); aKeyEvent = KeyEvent( nAccel, aKeyCode ); } return aKeyEvent; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index dec90ea09b08..2bd4c53e80a7 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -1176,7 +1176,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLon if( pParentToolBox->IsKeyEvent() ) { // send HOME key to subtoolbar in order to select first item - KeyEvent aEvent( 0, KeyCode( KEY_HOME ) ); + KeyEvent aEvent( 0, vcl::KeyCode( KEY_HOME ) ); mpFloatWin->GetPreferredKeyInputWindow()->KeyInput( aEvent ); } } diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index e1276fcb9af3..3c2a7d443dc6 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -593,7 +593,7 @@ bool DockingWindow::Notify( NotifyEvent& rNEvt ) } else if( rNEvt.GetType() == EVENT_KEYINPUT ) { - const KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode(); + const vcl::KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode(); if( rKey.GetCode() == KEY_F10 && rKey.GetModifier() && rKey.IsShift() && rKey.IsMod1() ) { diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index b7176cbf9af4..2333af21fe46 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -142,7 +142,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) } else if( rNEvt.GetType() == EVENT_KEYINPUT ) { - const KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode(); + const vcl::KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode(); if( rKey.GetCode() == KEY_F10 && rKey.GetModifier() && rKey.IsShift() && rKey.IsMod1() ) { diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index a77c38f56a49..cb5cb788442d 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -533,8 +533,8 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - KeyCode aKeyCode = pKEvt->GetKeyCode(); - sal_uInt16 nKeyCode = aKeyCode.GetCode(); + vcl::KeyCode aKeyCode = pKEvt->GetKeyCode(); + sal_uInt16 nKeyCode = aKeyCode.GetCode(); if ( (nKeyCode == KEY_ESCAPE) && (GetStyle() & WB_CLOSEABLE) ) { diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index 78f9b863ca10..8cb9909d6a59 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -59,14 +59,14 @@ void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, rCode4 = aImplKeyFuncTab[nIndex+3]; } -KeyCode::KeyCode( KeyFuncType eFunction ) +vcl::KeyCode::KeyCode( KeyFuncType eFunction ) { sal_uInt16 nDummy; ImplGetKeyCode( eFunction, nCode, nDummy, nDummy, nDummy ); eFunc = eFunction; } -KeyCode::KeyCode( const ResId& rResId ) +vcl::KeyCode::KeyCode( const ResId& rResId ) : nCode(0) , eFunc(KEYFUNC_DONTKNOW) { @@ -92,14 +92,14 @@ KeyCode::KeyCode( const ResId& rResId ) } } -OUString KeyCode::GetName( Window* pWindow ) const +OUString vcl::KeyCode::GetName( Window* pWindow ) const { if ( !pWindow ) pWindow = ImplGetDefaultWindow(); return pWindow ? pWindow->ImplGetFrame()->GetKeyName( GetFullCode() ) : ""; } -KeyFuncType KeyCode::GetFunction() const +KeyFuncType vcl::KeyCode::GetFunction() const { if ( eFunc != KEYFUNC_DONTKNOW ) return eFunc; diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx index ed8cd828c757..6fcae4a58830 100644 --- a/vcl/source/window/keyevent.cxx +++ b/vcl/source/window/keyevent.cxx @@ -40,18 +40,18 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const case TextDirectionality_RightToLeft_TopToBottom: switch (nCode) { - case KEY_LEFT: aClone.maKeyCode = KeyCode(KEY_RIGHT, nMod); break; - case KEY_RIGHT: aClone.maKeyCode = KeyCode(KEY_LEFT, nMod); break; + case KEY_LEFT: aClone.maKeyCode = vcl::KeyCode(KEY_RIGHT, nMod); break; + case KEY_RIGHT: aClone.maKeyCode = vcl::KeyCode(KEY_LEFT, nMod); break; } break; case TextDirectionality_TopToBottom_RightToLeft: switch (nCode) { - case KEY_DOWN: aClone.maKeyCode = KeyCode(KEY_RIGHT, nMod); break; - case KEY_UP: aClone.maKeyCode = KeyCode(KEY_LEFT, nMod); break; - case KEY_LEFT: aClone.maKeyCode = KeyCode(KEY_DOWN, nMod); break; - case KEY_RIGHT: aClone.maKeyCode = KeyCode(KEY_UP, nMod); break; + case KEY_DOWN: aClone.maKeyCode = vcl::KeyCode(KEY_RIGHT, nMod); break; + case KEY_UP: aClone.maKeyCode = vcl::KeyCode(KEY_LEFT, nMod); break; + case KEY_LEFT: aClone.maKeyCode = vcl::KeyCode(KEY_DOWN, nMod); break; + case KEY_RIGHT: aClone.maKeyCode = vcl::KeyCode(KEY_UP, nMod); break; } break; diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 1fa4e6ee37e1..3442e02a30dd 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -328,7 +328,7 @@ void Splitter::Tracking( const TrackingEvent& rTEvt ) } } -void Splitter::ImplKbdTracking( KeyCode aKeyCode ) +void Splitter::ImplKbdTracking( vcl::KeyCode aKeyCode ) { sal_uInt16 nCode = aKeyCode.GetCode(); if ( nCode == KEY_ESCAPE || nCode == KEY_RETURN ) @@ -570,7 +570,7 @@ void Splitter::LoseFocus() { if( mbKbdSplitting ) { - KeyCode aReturnKey( KEY_RETURN ); + vcl::KeyCode aReturnKey( KEY_RETURN ); ImplKbdTracking( aReturnKey ); mbKbdSplitting = false; } @@ -585,7 +585,7 @@ void Splitter::KeyInput( const KeyEvent& rKEvt ) mbInKeyEvent = 1; Splitter *pSibling = ImplFindSibling(); - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); sal_uInt16 nCode = aKeyCode.GetCode(); switch ( nCode ) { @@ -627,7 +627,7 @@ void Splitter::KeyInput( const KeyEvent& rKEvt ) { if( mbKbdSplitting ) { - KeyCode aKey( KEY_ESCAPE ); + vcl::KeyCode aKey( KEY_ESCAPE ); ImplKbdTracking( aKey ); } diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index c70056d7e221..29e70809bec6 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -164,7 +164,7 @@ bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) // and the shortcut conflicts with tab-control shortcut ), it is no more supported bool bSplitterOnly = false; bool bFocusInList = false; - KeyCode aKeyCode = aKeyEvent.GetKeyCode(); + vcl::KeyCode aKeyCode = aKeyEvent.GetKeyCode(); bool bForward = !aKeyCode.IsShift(); if( aKeyCode.GetCode() == KEY_F6 && ! aKeyCode.IsMod2() ) // F6 { diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 1517c1579114..a477e304ae16 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1130,8 +1130,8 @@ ImplTBDragMgr::ImplTBDragMgr() , mbResizeMode(false) , mbShowDragRect(false) { - maAccel.InsertItem( KEY_RETURN, KeyCode( KEY_RETURN ) ); - maAccel.InsertItem( KEY_ESCAPE, KeyCode( KEY_ESCAPE ) ); + maAccel.InsertItem( KEY_RETURN, vcl::KeyCode( KEY_RETURN ) ); + maAccel.InsertItem( KEY_ESCAPE, vcl::KeyCode( KEY_ESCAPE ) ); maAccel.SetSelectHdl( LINK( this, ImplTBDragMgr, SelectHdl ) ); } @@ -4267,7 +4267,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_KEYINPUT ) { KeyEvent aKEvt = *rNEvt.GetKeyEvent(); - KeyCode aKeyCode = aKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = aKEvt.GetKeyCode(); sal_uInt16 nKeyCode = aKeyCode.GetCode(); switch( nKeyCode ) { @@ -4892,13 +4892,13 @@ void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl ) nModifier |= KEY_SHIFT; if( bCtrl ) nModifier |= KEY_MOD1; - KeyCode aKeyCode( 0, nModifier ); + vcl::KeyCode aKeyCode( 0, nModifier ); ImplActivateItem( aKeyCode ); } // calls the button's action handler // returns true if action was called -bool ToolBox::ImplActivateItem( KeyCode aKeyCode ) +bool ToolBox::ImplActivateItem( vcl::KeyCode aKeyCode ) { bool bRet = true; if( mnHighItemId ) @@ -4978,7 +4978,7 @@ bool ImplCloseLastPopup( Window *pParent ) // opens a drop down toolbox item // returns true if item was opened -bool ToolBox::ImplOpenItem( KeyCode aKeyCode ) +bool ToolBox::ImplOpenItem( vcl::KeyCode aKeyCode ) { sal_uInt16 nCode = aKeyCode.GetCode(); bool bRet = true; @@ -5025,7 +5025,7 @@ bool ToolBox::ImplOpenItem( KeyCode aKeyCode ) void ToolBox::KeyInput( const KeyEvent& rKEvt ) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); mnKeyModifier = aKeyCode.GetModifier(); sal_uInt16 nCode = aKeyCode.GetCode(); diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 492b7a8f4b97..c4dac5371934 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -882,8 +882,8 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, sal_uInt16 nKeyCode, sal_uInt16 nCharCode, sal_uInt16 nRepeat, bool bForward ) { ImplSVData* pSVData = ImplGetSVData(); - KeyCode aKeyCode( nKeyCode, nKeyCode ); - sal_uInt16 nEvCode = aKeyCode.GetCode(); + vcl::KeyCode aKeyCode( nKeyCode, nKeyCode ); + sal_uInt16 nEvCode = aKeyCode.GetCode(); // allow application key listeners to remove the key event // but make sure we're not forwarding external KeyEvents, (ie where bForward is false) @@ -1015,7 +1015,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, const OutputDevice *pChildOutDev = pChild->GetOutDev(); if( (aKeyCode.GetCode() == KEY_LEFT || aKeyCode.GetCode() == KEY_RIGHT) && pChildOutDev->HasMirroredGraphics() && pChild->IsRTLEnabled() ) - aKeyCode = KeyCode( aKeyCode.GetCode() == KEY_LEFT ? KEY_RIGHT : KEY_LEFT, aKeyCode.GetModifier() ); + aKeyCode = vcl::KeyCode( aKeyCode.GetCode() == KEY_LEFT ? KEY_RIGHT : KEY_LEFT, aKeyCode.GetModifier() ); // call handler ImplDelData aDelData; diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index dc195371d033..5de927c52c15 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -691,7 +691,7 @@ OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const // return an empty string for keysyms that are not bound to // any key code - XLIB_KeyCode aKeyCode = XKeysymToKeycode( GetDisplay(), nKeySym ); + KeyCode aKeyCode = XKeysymToKeycode( GetDisplay(), nKeySym ); if( aKeyCode != 0 && aKeyCode != NoSymbol ) { if( !nKeySym ) @@ -733,7 +733,7 @@ void SalDisplay::ModifierMapping() // on Sun and SCO servers XLookupString does not account for NumLock if( GetServerVendor() == vendor_sun ) { - XLIB_KeyCode aNumLock = XKeysymToKeycode( pDisp_, XK_Num_Lock ); + KeyCode aNumLock = XKeysymToKeycode( pDisp_, XK_Num_Lock ); if( aNumLock ) for( int i = ShiftMapIndex; i <= Mod5MapIndex; i++ ) { diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index f1ebc2ffc656..dcfae9d95a04 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2513,7 +2513,7 @@ OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode ) return GetDisplay()->GetKeyName( nKeyCode ); } -bool X11SalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) +bool X11SalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , vcl::KeyCode& ) { // not supported yet return false; diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 5f4fa94131fd..004c5a8b09c7 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -2870,7 +2870,7 @@ void GtkSalFrame::EndExtTextInput( sal_uInt16 nFlags ) m_pIMHandler->endExtTextInput( nFlags ); } -bool GtkSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) +bool GtkSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , vcl::KeyCode& ) { // not supported yet return false; diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index e2620aafd806..3be752be87ce 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -3344,7 +3344,7 @@ LanguageType WinSalFrame::GetInputLanguage() return (LanguageType) mnInputLang; } -bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) +bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) { bool bRet = FALSE; sal_IntPtr nLangType = aLangType; @@ -3368,7 +3368,7 @@ bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangT // Windows menu (applies to both left/right key) // Menu key - this key is used to display context menu // AltGr key - probably it has no sense - rKeyCode = KeyCode( ImplSalGetKeyCode( vkeycode ), + rKeyCode = vcl::KeyCode( ImplSalGetKeyCode( vkeycode ), (shiftstate & 0x01) ? TRUE : FALSE, // shift (shiftstate & 0x02) ? TRUE : FALSE, // ctrl (shiftstate & 0x04) ? TRUE : FALSE, // alt diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index 075860413b1a..7deb54b04b76 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -331,7 +331,7 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OU } } -void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode&, const OUString& rKeyName ) +void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode&, const OUString& rKeyName ) { if( pSalMenuItem ) { |