Author: mlytwyn
Date: Wed Jul 1 00:01:18 2015
New Revision: 38725
URL: http://svn.gna.org/viewcvs/gnustep?rev=38725&view=rev
Log:
Merge Source/NSEvent.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSEvent.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSEvent.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSEvent.m?rev=38725&r1=38724&r2=38725&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSEvent.m (original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSEvent.m Wed Jul 1
00:01:18 2015
@@ -289,7 +289,7 @@
if ([dict objectForKey: timerKey])
[NSException raise: NSInternalInconsistencyException
format: @"Periodic events are already being generated for "
- @"this thread %x", GSCurrentThread()];
+ @"this thread %p", GSCurrentThread()];
/*
* Register a timer that will fire in delaySeconds.
@@ -609,25 +609,26 @@
case NSRightMouseDown:
case NSRightMouseUp:
return [NSString stringWithFormat:
- @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
- @" time = %f, window = %d, dpsContext = %p,"
- @" event number = %d, click = %d, pressure = %f",
+ @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
+ @" time = %f, window = %ld, dpsContext = %p,"
+ @" event number = %ld, click = %ld, pressure = %f",
eventTypes[event_type], location_point.x, location_point.y,
- modifier_flags, event_time, window_num, event_context,
- event_data.mouse.event_num, event_data.mouse.click,
+ (unsigned long) modifier_flags, event_time, (long) window_num,
+ event_context, (long int) event_data.mouse.event_num,
+ (long int) event_data.mouse.click,
event_data.mouse.pressure];
break;
case NSMouseEntered:
case NSMouseExited:
return [NSString stringWithFormat:
- @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
- @" time = %f, window = %d, dpsContext = %p, "
- @" event number = %d, tracking number = %d, user data = %p",
+ @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
+ @" time = %f, window = %ld, dpsContext = %p, "
+ @" event number = %ld, tracking number = %ld, user data = %p",
eventTypes[event_type], location_point.x, location_point.y,
- modifier_flags, event_time, window_num, event_context,
- event_data.tracking.event_num,
- event_data.tracking.tracking_num,
+ (unsigned long) modifier_flags, event_time, (long) window_num,
event_context,
+ (long) event_data.tracking.event_num,
+ (long) event_data.tracking.tracking_num,
event_data.tracking.user_data];
break;
@@ -635,11 +636,11 @@
case NSKeyUp:
case NSFlagsChanged:
return [NSString stringWithFormat:
- @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
- @" time = %f, window = %d, dpsContext = %p, "
+ @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
+ @" time = %f, window = %ld, dpsContext = %p, "
@" repeat = %s, keys = %@, ukeys = %@, keyCode = 0x%x",
eventTypes[event_type], location_point.x, location_point.y,
- modifier_flags, event_time, window_num, event_context,
+ (unsigned long) modifier_flags, event_time, (long) window_num,
event_context,
(event_data.key.repeat ? "YES" : "NO"),
event_data.key.char_keys, event_data.key.unmodified_keys,
event_data.key.key_code];
@@ -651,13 +652,13 @@
case NSSystemDefined:
case NSApplicationDefined:
return [NSString stringWithFormat:
- @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
- @" time = %f, window = %d, dpsContext = %p, "
- @" subtype = %d, data1 = %p, data2 = %p",
+ @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
+ @" time = %f, window = %ld, dpsContext = %p, "
+ @" subtype = %d, data1 = %lx, data2 = %lx",
eventTypes[event_type], location_point.x, location_point.y,
- modifier_flags, event_time, window_num, event_context,
- event_data.misc.sub_type, event_data.misc.data1,
- event_data.misc.data2];
+ (unsigned long) modifier_flags, event_time, (long) window_num,
event_context,
+ event_data.misc.sub_type, (long) event_data.misc.data1,
+ (long) event_data.misc.data2];
break;
case NSScrollWheel:
@@ -666,14 +667,14 @@
case NSOtherMouseDragged:
case NSRightMouseDragged:
return [NSString stringWithFormat:
- @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
- @" time = %f, window = %d, dpsContext = %p,"
- @" event number = %d, click = %d, pressure = %f"
- @" button = %d, deltaX = %f, deltaY = %f, deltaZ = %f",
+ @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
+ @" time = %f, window = %ld, dpsContext = %p,"
+ @" event number = %ld, click = %ld, pressure = %f"
+ @" button = %ld, deltaX = %f, deltaY = %f, deltaZ = %f",
eventTypes[event_type], location_point.x, location_point.y,
- modifier_flags, event_time, window_num, event_context,
- event_data.mouse.event_num, event_data.mouse.click,
- event_data.mouse.pressure, event_data.mouse.button,
+ (unsigned long) modifier_flags, event_time, (long) window_num,
event_context,
+ (long ) event_data.mouse.event_num, (long) event_data.mouse.click,
+ event_data.mouse.pressure, (long) event_data.mouse.button,
event_data.mouse.deltaX,
event_data.mouse.deltaY,
event_data.mouse.deltaZ];
@@ -686,10 +687,10 @@
default:
return [NSString stringWithFormat:
- @"NSEvent: eventType = UNKNOWN!, point = { %f, %f }, modifiers = %u,"
- @" time = %f, window = %d",
+ @"NSEvent: eventType = UNKNOWN!, point = { %f, %f }, modifiers =
%lu,"
+ @" time = %f, window = %ld",
location_point.x, location_point.y,
- modifier_flags, event_time, window_num];
+ (unsigned long) modifier_flags, event_time, (long) window_num];
break;
}
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
