diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-10 08:10:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-10 08:10:29 (GMT) |
| commit | 7b3b30d439640b2474a81ff1b97c8ae264811165 (patch) | |
| tree | 05e00c4d3ff33c3693eecf185af839c020854fc1 /macosx/tkMacOSXNotify.c | |
| parent | 3d9f5433b611ddba5d4c1f219d61bfcde319034f (diff) | |
| parent | 44cdf94725d440ad4b97077853722891d2d9cd7d (diff) | |
| download | tk-7b3b30d439640b2474a81ff1b97c8ae264811165.zip tk-7b3b30d439640b2474a81ff1b97c8ae264811165.tar.gz tk-7b3b30d439640b2474a81ff1b97c8ae264811165.tar.bz2 | |
Fix [9e31fd944934e269121fa78ff56b7b86f33e6db6|9e31fd9449]: X11/X.h and Windows.h have conflicting symbols.
*** POTENTIAL INCOMPATIBILITY *** on Windows only: gcc/clang/MSVC will generate new warnings in extensions when the "None" symbol is used incorrectly.
Those warnings are all fixed in the core, that's what most of this commit is doing.
Diffstat (limited to 'macosx/tkMacOSXNotify.c')
| -rw-r--r-- | macosx/tkMacOSXNotify.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c index 88e7c76..3a32527 100644 --- a/macosx/tkMacOSXNotify.c +++ b/macosx/tkMacOSXNotify.c @@ -84,7 +84,7 @@ InspectQueueRestrictProc( const char *name; long serial = ve->serial; long time = eventPtr->xkey.time; - + if (eventPtr->type == VirtualEvent) { name = ve->name; } else { @@ -137,14 +137,14 @@ void DebugPrintQueue(void) /* * Since the contentView is the first responder for a Tk Window, it is * responsible for sending events up the responder chain. We also check - * the pasteboard here. + * the pasteboard here. */ - (void) sendEvent: (NSEvent *) theEvent { [super sendEvent:theEvent]; [NSApp tkCheckPasteboard]; #ifdef TK_MAC_DEBUG_EVENTS - fprintf(stderr, "Sending event of type %d\n", (int)[theEvent type]); + fprintf(stderr, "Sending event of type %d\n", (int)[theEvent type]); DebugPrintQueue(); #endif } |