diff options
| author | Yuri Dario <ydario@apache.org> | 2012-07-03 19:13:43 +0000 |
|---|---|---|
| committer | Yuri Dario <ydario@apache.org> | 2012-07-03 19:13:43 +0000 |
| commit | 579251634aea1738768c4478b84df92d43b1a36e (patch) | |
| tree | 8f0100317b854d580343bdd56bf6197d657fdda0 /vcl | |
| parent | 9ea39749b5c319389acb9872aafbf5d090825ed5 (diff) | |
i118923 - OS/2 port: enable menu automatic hilite based on current WPS/XWP settings.
Notes
Notes:
ignore: OS/2
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/os2/salmenu.h | 41 | ||||
| -rw-r--r-- | vcl/source/window/menu.cxx | 5 |
2 files changed, 42 insertions, 4 deletions
diff --git a/vcl/inc/os2/salmenu.h b/vcl/inc/os2/salmenu.h index d0e9b333016d..7629323c8159 100644 --- a/vcl/inc/os2/salmenu.h +++ b/vcl/inc/os2/salmenu.h @@ -27,6 +27,47 @@ #include <vcl/bitmap.hxx> #include <salmenu.hxx> +#define INIAPP_XWPHOOK "XWorkplace:Hook" +#define INIKEY_HOOK_CONFIG "Config" + +typedef struct _HOOKCONFIG +{ + PM_BOOL __fSlidingFocus; + ULONG __ulSlidingFocusDelay; + PM_BOOL __fSlidingBring2Top; + PM_BOOL __fSlidingIgnoreDesktop; + PM_BOOL __fSlidingIgnoreSeamless; + HOBJECT ahobjDummy[4]; + PM_BYTE bMonitorDrives[30]; + PM_BOOL fChordWinList; + PM_BOOL fSysMenuMB2TitleBar; + PM_BOOL fMB3Scroll; + PM_BOOL fMB3ScrollReverse; + USHORT usScrollMode; + USHORT usMB3ScrollMin; + SHORT sAmplification; + PM_BOOL __fAutoHideMouse; + ULONG __ulAutoHideDelay; + PM_BOOL __fGlobalHotkeys; + PM_BOOL fRemoved1, fRemoved2; + PM_BOOL fSlidingMenus; + ULONG ulSubmenuDelay; + PM_BOOL fMenuImmediateHilite; + PM_BOOL fMB3Click2MB1DblClk; + HOBJECT ahobjHotCornerObjects[8]; + PM_BOOL fConditionalCascadeSensitive; + PM_BOOL fRemoved3; + ULONG ulCornerSensitivity; + PM_BOOL fMB3AutoScroll; + PM_BOOL fMB3Push2Bottom; + ULONG __ulAutoHideFlags; + PM_BOOL __fAutoMoveMouse; + ULONG __ulAutoMoveFlags; + ULONG __ulAutoMoveDelay; + ULONG __ulMouseMappingsCount; +} HOOKCONFIG, *PHOOKCONFIG; +#pragma pack() + class Os2SalMenu : public SalMenu { public: diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 746c85d54a7d..b6f60fd28f45 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -101,14 +101,12 @@ DBG_NAME( Menu ) #ifdef OS2 #include "svsys.h" +#include "os2/salmenu.h" // return sal_True if hilite should be executed: left mouse button down // or xwp mouse hook enabled static sal_Bool ImplHilite( const MouseEvent& rMEvt ) { -#if 1 // until hilite code reworked - return sal_True; -#else static sal_Bool init = sal_False; static HOOKCONFIG hc; @@ -126,7 +124,6 @@ static sal_Bool ImplHilite( const MouseEvent& rMEvt ) return sal_True; // return xwp flag return hc.fSlidingMenus; -#endif } #endif |