summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/accel.h4
-rw-r--r--vcl/inc/accmgr.hxx5
-rw-r--r--vcl/inc/headless/svpframe.hxx2
-rw-r--r--vcl/inc/osx/salframe.h2
-rw-r--r--vcl/inc/osx/salmenu.h2
-rw-r--r--vcl/inc/salframe.hxx2
-rw-r--r--vcl/inc/salmenu.hxx2
-rw-r--r--vcl/inc/svdata.hxx11
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx4
-rw-r--r--vcl/inc/unx/salframe.h2
-rw-r--r--vcl/inc/unx/salmenu.h2
-rw-r--r--vcl/inc/win/salframe.h2
-rw-r--r--vcl/inc/win/salmenu.h2
14 files changed, 22 insertions, 22 deletions
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
generated by cgit (git 2.34.1) at 2024-12-28 10:46:40 +0000