diff options
Diffstat (limited to 'frontends/cocoa/SearchWindowController.m')
-rw-r--r-- | frontends/cocoa/SearchWindowController.m | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/frontends/cocoa/SearchWindowController.m b/frontends/cocoa/SearchWindowController.m index 95372fc19..bbde827bf 100644 --- a/frontends/cocoa/SearchWindowController.m +++ b/frontends/cocoa/SearchWindowController.m @@ -43,7 +43,7 @@ struct gui_search_table *cocoa_search_table = &search_table; @synthesize searchString; @synthesize browser; -- init; +- (instancetype)init { if ((self = [super initWithWindowNibName: @"SearchWindow"]) == nil) return nil; @@ -53,33 +53,32 @@ struct gui_search_table *cocoa_search_table = &search_table; return self; } -- (void) dealloc; +- (void) dealloc { [self unbind: @"browser"]; - [super dealloc]; } -- (IBAction) searchNext: (id) sender; +- (IBAction) searchNext: (id) sender { [self search: SearchForward]; } -- (IBAction) searchPrevious: (id) sender; +- (IBAction) searchPrevious: (id) sender { [self search: SearchBackward]; } -- (void) search: (SearchDirection)direction; +- (void) search: (SearchDirection)direction { search_flags_t flags = (direction == SearchForward) ? SEARCH_FLAG_FORWARDS : 0; if (caseSensitive) flags |= SEARCH_FLAG_CASE_SENSITIVE; if (selectAll) flags |= SEARCH_FLAG_SHOWALL; struct browser_window *bw = [browser browser]; - browser_window_search( bw, self, flags, [searchString UTF8String] ); + browser_window_search( bw, (__bridge void *)self, flags, [searchString UTF8String] ); } -- (IBAction) searchStringDidChange: (id) sender; +- (IBAction) searchStringDidChange: (id) sender { struct browser_window *bw = [browser browser]; browser_window_search_clear( bw ); @@ -88,7 +87,7 @@ struct gui_search_table *cocoa_search_table = &search_table; [self setCanGoForward: YES]; } -- (void) setCaseSensitive: (BOOL) newValue; +- (void) setCaseSensitive: (BOOL) newValue { if (caseSensitive != newValue) { caseSensitive = newValue; @@ -97,7 +96,7 @@ struct gui_search_table *cocoa_search_table = &search_table; } } -- (void) setSelectAll: (BOOL) newValue; +- (void) setSelectAll: (BOOL) newValue { if (selectAll != newValue) { selectAll = newValue; @@ -108,12 +107,12 @@ struct gui_search_table *cocoa_search_table = &search_table; static void cocoa_search_set_back( bool active, void *p ) { - [(SearchWindowController *)p setCanGoBack: active]; + [(__bridge SearchWindowController *)p setCanGoBack: active]; } static void cocoa_search_set_forward( bool active, void *p ) { - [(SearchWindowController *)p setCanGoForward: active]; + [(__bridge SearchWindowController *)p setCanGoForward: active]; } @end |