Author: richard
Date: Mon Feb 9 08:58:27 2009
New Revision: 4109
URL: http://svn.slimdevices.com?rev=4109&root=Jive&view=rev
Log:
r4...@harrypotter (orig r4108): richard | 2009-02-09 16:56:24 +0000
Bug: N/A
Description:
Fix mouse defines, some event types were missing.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive.h
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Feb 9 08:58:27 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3993
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4104
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4108
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive.h
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive.h?rev=4109&root=Jive&r1=4108&r2=4109&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive.h (original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive.h Mon Feb 9
08:58:27 2009
@@ -111,7 +111,7 @@
JIVE_EVENT_CHAR_ALL = ( JIVE_EVENT_CHAR_PRESS),
JIVE_EVENT_KEY_ALL = ( JIVE_EVENT_KEY_DOWN |
JIVE_EVENT_KEY_UP | JIVE_EVENT_KEY_PRESS | JIVE_EVENT_KEY_HOLD ),
- JIVE_EVENT_MOUSE_ALL = ( JIVE_EVENT_MOUSE_DOWN |
JIVE_EVENT_MOUSE_PRESS | JIVE_EVENT_MOUSE_HOLD | JIVE_EVENT_MOUSE_MOVE |
JIVE_EVENT_MOUSE_DRAG ),
+ JIVE_EVENT_MOUSE_ALL = ( JIVE_EVENT_MOUSE_DOWN |
JIVE_EVENT_MOUSE_UP | JIVE_EVENT_MOUSE_PRESS | JIVE_EVENT_MOUSE_HOLD |
JIVE_EVENT_MOUSE_MOVE | JIVE_EVENT_MOUSE_DRAG ),
JIVE_EVENT_ALL_INPUT = ( JIVE_EVENT_KEY_ALL |
JIVE_EVENT_MOUSE_ALL | JIVE_EVENT_SCROLL | JIVE_EVENT_CHAR_ALL | JIVE_ACTION),
JIVE_EVENT_VISIBLE_ALL = ( JIVE_EVENT_SHOW | JIVE_EVENT_HIDE ),
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c?rev=4109&root=Jive&r1=4108&r2=4109&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c Mon Feb
9 08:58:27 2009
@@ -2302,3 +2302,4 @@
};
#endif
+
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg?rev=4109&root=Jive&r1=4108&r2=4109&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg Mon
Feb 9 08:58:27 2009
@@ -109,8 +109,8 @@
JIVE_EVENT_MOTION @ EVENT_MOTION = 0x00800000,
JIVE_EVENT_KEY_ALL @ EVENT_KEY_ALL = ( JIVE_EVENT_KEY_DOWN
| JIVE_EVENT_KEY_UP | JIVE_EVENT_KEY_PRESS | JIVE_EVENT_KEY_HOLD ),
- JIVE_EVENT_MOUSE_ALL @ EVENT_MOUSE_ALL = (
JIVE_EVENT_MOUSE_DOWN | JIVE_EVENT_MOUSE_PRESS | JIVE_EVENT_MOUSE_HOLD ),
- JIVE_EVENT_ALL_INPUT @ EVENT_ALL_INPUT = ( JIVE_EVENT_KEY_ALL
| JIVE_EVENT_MOUSE_ALL | JIVE_EVENT_SCROLL),
+ JIVE_EVENT_MOUSE_ALL @ EVENT_MOUSE_ALL = (
JIVE_EVENT_MOUSE_DOWN | JIVE_EVENT_MOUSE_UP | JIVE_EVENT_MOUSE_PRESS |
JIVE_EVENT_MOUSE_HOLD | JIVE_EVENT_MOUSE_MOVE | JIVE_EVENT_MOUSE_DRAG ),
+ JIVE_EVENT_ALL_INPUT @ EVENT_ALL_INPUT = ( JIVE_EVENT_KEY_ALL
| JIVE_EVENT_MOUSE_ALL | JIVE_EVENT_SCROLL | JIVE_EVENT_CHAR_ALL | JIVE_ACTION),
JIVE_EVENT_VISIBLE_ALL @ EVENT_VISIBLE_ALL = (
JIVE_EVENT_SHOW | JIVE_EVENT_HIDE ),
JIVE_EVENT_ALL @ EVENT_ALL = 0xFFFFFFFF,
} EventType;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
