diff options
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 7 | ||||
| -rw-r--r-- | cocoa/ScintillaView.mm | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 490953eef..45ce0cc86 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -449,7 +449,7 @@ void ScintillaCocoa::Finalise() //-------------------------------------------------------------------------------------------------- -void ScintillaCocoa::UpdateObserver(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info) { +void ScintillaCocoa::UpdateObserver(CFRunLoopObserverRef /* observer */, CFRunLoopActivity /* activity */, void *info) { ScintillaCocoa* sci = reinterpret_cast<ScintillaCocoa*>(info); sci->IdleWork(); } @@ -560,9 +560,6 @@ public: CFRelease(cfsVal); return lenMapped; } - // Something failed so return a single NUL byte - folded[0] = '\0'; - return 1; } }; @@ -1657,7 +1654,7 @@ void ScintillaCocoa::WillDraw(NSRect rect) /** * ScrollText is empty because scrolling is handled by the NSScrollView. */ -void ScintillaCocoa::ScrollText(int linesToMove) +void ScintillaCocoa::ScrollText(int) { } 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) } //-------------------------------------------------------------------------------------------------- |