Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed bug 3874 - Compiler warnings SDL_Surface.c and SDL_cocoakeyboard.m
  • Loading branch information
slouken committed Oct 12, 2017
1 parent a7c79c5 commit f4f9e39
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/test/SDL_test_common.c
Expand Up @@ -939,7 +939,7 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
}

/* Add resize/drag areas for windows that are borderless and resizable */
if ((state->window_flags & SDL_WINDOW_RESIZABLE|SDL_WINDOW_BORDERLESS) ==
if ((state->window_flags & (SDL_WINDOW_RESIZABLE|SDL_WINDOW_BORDERLESS)) ==
(SDL_WINDOW_RESIZABLE|SDL_WINDOW_BORDERLESS)) {
SDL_SetWindowHitTest(state->windows[i], SDLTest_ExampleHitTestCallback, NULL);
}
Expand Down
6 changes: 3 additions & 3 deletions src/video/cocoa/SDL_cocoakeyboard.m
Expand Up @@ -93,7 +93,7 @@ - (NSRange)selectedRange
return _selectedRange;
}

- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange;
- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
{
if ([aString isKindOfClass:[NSAttributedString class]]) {
aString = [aString string];
Expand Down Expand Up @@ -127,7 +127,7 @@ - (void)unmarkText
SDL_SendEditingText("", 0, 0);
}

- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
{
NSWindow *window = [self window];
NSRect contentRect = [window contentRectForFrameRect:[window frame]];
Expand Down Expand Up @@ -155,7 +155,7 @@ - (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer
return rect;
}

- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
{
DEBUG_IME(@"attributedSubstringFromRange: (%d, %d)", aRange.location, aRange.length);
return nil;
Expand Down

0 comments on commit f4f9e39

Please sign in to comment.