diff options
author | Neil Hodgson <nyamatongwe@gmail.com> | 2015-02-14 14:26:18 +1100 |
---|---|---|
committer | Neil Hodgson <nyamatongwe@gmail.com> | 2015-02-14 14:26:18 +1100 |
commit | b9b6b07c87654789f80a4d54997fb927b1609ccf (patch) | |
tree | 8e616ed9d8be7722cb0dce187d9eba99e345de80 /cocoa/ScintillaView.mm | |
parent | 9b01cf93e9d08be90bdce08a12be77ef4f6332fc (diff) | |
download | scintilla-mirror-b9b6b07c87654789f80a4d54997fb927b1609ccf.tar.gz |
Fix unused parameter warnings. Remove code that is never executed.
Diffstat (limited to 'cocoa/ScintillaView.mm')
-rw-r--r-- | cocoa/ScintillaView.mm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm index a7430f181..a474a6cba 100644 --- a/cocoa/ScintillaView.mm +++ b/cocoa/ScintillaView.mm @@ -744,8 +744,10 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) /** * Returns operations we allow as drag source. */ -- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL) flag +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL) isLocal { +// Scintilla does not choose different operations for other applications +#pragma unused(isLocal) return NSDragOperationCopy | NSDragOperationMove | NSDragOperationDelete; } @@ -932,6 +934,8 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) - (void) beginGestureWithEvent: (NSEvent *) event { +// Scintilla is only interested in this event as the starft of a zoom +#pragma unused(event) zoomDelta = 0.0; } @@ -959,6 +963,9 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) - (void) notify: (NotificationType) type message: (NSString*) message location: (NSPoint) location value: (float) value { +// These parameters are just to conform to the protocol +#pragma unused(message) +#pragma unused(location) switch (type) { case IBNZoomChanged: @@ -978,7 +985,8 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) - (void) setCallback: (id <InfoBarCommunicator>) callback { - // Not used. Only here to satisfy protocol. +// Not used. Only here to satisfy protocol. +#pragma unused(callback) } //-------------------------------------------------------------------------------------------------- |