incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1356909 - in /incubator/ooo/trunk/main/vcl: inc/os2/salmenu.h source/window/menu.cxx
Date Tue, 03 Jul 2012 20:13:44 GMT
Author: ydario
Date: Tue Jul  3 20:13:43 2012
New Revision: 1356909

URL: http://svn.apache.org/viewvc?rev=1356909&view=rev
Log:
i118923 - OS/2 port: enable menu automatic hilite based on current WPS/XWP settings.

Modified:
    incubator/ooo/trunk/main/vcl/inc/os2/salmenu.h
    incubator/ooo/trunk/main/vcl/source/window/menu.cxx

Modified: incubator/ooo/trunk/main/vcl/inc/os2/salmenu.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/salmenu.h?rev=1356909&r1=1356908&r2=1356909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/salmenu.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/salmenu.h Tue Jul  3 20:13:43 2012
@@ -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:

Modified: incubator/ooo/trunk/main/vcl/source/window/menu.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/window/menu.cxx?rev=1356909&r1=1356908&r2=1356909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/window/menu.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/window/menu.cxx Tue Jul  3 20:13:43 2012
@@ -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 MouseE
 		return sal_True;
 	// return xwp flag
 	return hc.fSlidingMenus;
-#endif
 }
 
 #endif



Mime
View raw message