diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-24 12:07:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-25 07:03:08 +0000 |
| commit | 63a6de2cab00e949751fcb35f4814844fc4ec71e (patch) | |
| tree | c745e6d946e076f75ebaa31849ef2a77bd81b868 /vcl/inc | |
| parent | daf9156c76049873583f1f7c5de96524d7eba68a (diff) | |
convert MODKEY constants to o3tl::typed_flags
Change-Id: I53a6f6f6b12e0fb299e7d76e8e8f354ef3afbbb3
Reviewed-on: https://gerrit.libreoffice.org/31152
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/salwtype.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/salframe.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index b7f803eee86e..4b27a3e99c6b 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -33,6 +33,7 @@ enum class InputContextFlags; enum class WindowStateMask; enum class WindowStateState; enum class ExtTextInputAttr; +enum class ModKeyFlags; enum class SalEvent { NONE, @@ -123,7 +124,7 @@ struct SalKeyModEvent { sal_uInt64 mnTime; // Time in ms, when event is created sal_uInt16 mnCode; // SV-Modifiercode (KEY_SHIFT|KEY_MOD1|KEY_MOD2) - sal_uInt16 mnModKeyCode; // extended Modifier (MODKEY_LEFT,MODKEY_RIGHT,MODKEY_PRESS,MODKEY_RELEASE) + ModKeyFlags mnModKeyCode; // extended Modifier (MODKEY_LEFT,MODKEY_RIGHT,MODKEY_PRESS,MODKEY_RELEASE) }; struct SalPaintEvent diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 0f22d4661373..5d61c5a57b06 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -186,7 +186,7 @@ class GtkSalFrame : public SalFrame SystemEnvData m_aSystemData; GtkSalGraphics *m_pGraphics; bool m_bGraphics; - sal_uInt16 m_nKeyModifiers; + ModKeyFlags m_nKeyModifiers; GdkCursor *m_pCurrentCursor; GdkVisibilityState m_nVisibility; PointerStyle m_ePointerStyle; diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 2c0be07f4b82..16efb896e8cf 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -79,7 +79,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl sal_uInt16 nKeyCode_; // last key code sal_uInt16 nKeyState_; // last key state bool mbSendExtKeyModChange; - sal_uInt16 mnExtKeyMod; + ModKeyFlags mnExtKeyMod; int nShowState_; // show state int nWidth_; // client width |