diff options
author | Vincent Sanders <vince@kyllikki.org> | 2016-02-09 00:34:47 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2016-02-09 00:34:47 +0000 |
commit | 2d2268f5dc2cc2c2be6ea24a08551cf8a38806b2 (patch) | |
tree | 10fb0ffee5e792405e6c1dd6d73b19ab5b8c1c32 /cocoa/Tree.m | |
parent | 36d1ae479ba27bd03f17c7b304e340757fb3101a (diff) | |
download | netsurf-2d2268f5dc2cc2c2be6ea24a08551cf8a38806b2.tar.gz netsurf-2d2268f5dc2cc2c2be6ea24a08551cf8a38806b2.tar.bz2 |
clean up cocoa warnings on os x yosemite sdk
Diffstat (limited to 'cocoa/Tree.m')
-rw-r--r-- | cocoa/Tree.m | 104 |
1 files changed, 54 insertions, 50 deletions
diff --git a/cocoa/Tree.m b/cocoa/Tree.m index 05a52c802..5cd796ceb 100644 --- a/cocoa/Tree.m +++ b/cocoa/Tree.m @@ -34,43 +34,43 @@ static void tree_scroll_visible( int y, int height, void *data ); static void tree_get_window_dimensions( int *width, int *height, void *data ); static const struct treeview_table cocoa_tree_callbacks = { - .redraw_request = tree_redraw_request, - .resized = tree_resized, - .scroll_visible = tree_scroll_visible, - .get_window_dimensions = tree_get_window_dimensions + .redraw_request = tree_redraw_request, + .resized = tree_resized, + .scroll_visible = tree_scroll_visible, + .get_window_dimensions = tree_get_window_dimensions }; -- initWithFlags: (unsigned int)flags; +- (id)initWithFlags: (unsigned int)flags { - if ((self = [super init]) == nil) return nil; - - tree = tree_create( flags, &cocoa_tree_callbacks, self ); - if (tree == NULL) { - [self release]; - return nil; - } - - return self; + if ((self = [super init]) == nil) return nil; + + tree = tree_create( flags, &cocoa_tree_callbacks, self ); + if (tree == NULL) { + [self release]; + return nil; + } + + return self; } -- (void) dealloc; +- (void) dealloc { - tree_delete( tree ); - [super dealloc]; + tree_delete( tree ); + [super dealloc]; } -- (struct tree *) tree; +- (struct tree *) tree { - return tree; + return tree; } -- (void) setRedrawing: (BOOL) newRedrawing; +- (void) setRedrawing: (BOOL) newRedrawing { } -+ (void) initialize; ++ (void) initialize { } @@ -79,65 +79,69 @@ static const struct treeview_table cocoa_tree_callbacks = { static void tree_redraw_request( int x, int y, int w, int h, void *data ) { - id <TreeDelegate> delegate = ((Tree *)data)->delegate; - [delegate tree: (Tree *)data requestedRedrawInRect: cocoa_rect_wh( x, y, w, h )]; + id <TreeDelegate> delegate = ((Tree *)data)->delegate; + [delegate tree: (Tree *)data requestedRedrawInRect: cocoa_rect_wh( x, y, w, h )]; } static void tree_resized( struct tree *tree, int w, int h, void *data ) { - id <TreeDelegate> delegate = ((Tree *)data)->delegate; - [delegate tree: (Tree *)data resized: cocoa_size( w, h )]; + id <TreeDelegate> delegate = ((Tree *)data)->delegate; + [delegate tree: (Tree *)data resized: cocoa_size( w, h )]; } static void tree_scroll_visible( int y, int height, void *data ) { - id <TreeDelegate> delegate = ((Tree *)data)->delegate; - [delegate tree: (Tree *)data scrollPoint: cocoa_point( 0, y )]; + id <TreeDelegate> delegate = ((Tree *)data)->delegate; + [delegate tree: (Tree *)data scrollPoint: cocoa_point( 0, y )]; } static void tree_get_window_dimensions( int *width, int *height, void *data ) { - id <TreeDelegate> delegate = ((Tree *)data)->delegate; - if (delegate == nil) return; - - NSSize size = [delegate treeWindowSize: (Tree *)data]; + id <TreeDelegate> delegate = ((Tree *)data)->delegate; + if (delegate == nil) return; - if (width != NULL) *width = cocoa_pt_to_px( size.width ); - if (height != NULL) *height = cocoa_pt_to_px( size.height ); + NSSize size = [delegate treeWindowSize: (Tree *)data]; + + if (width != NULL) *width = cocoa_pt_to_px( size.width ); + if (height != NULL) *height = cocoa_pt_to_px( size.height ); } @end @implementation Tree (ViewInterface) -- (void) drawRect: (NSRect) rect inView: (NSView *) view; +- (void) drawRect: (NSRect) rect inView: (NSView *) view { - struct redraw_context ctx = { - .interactive = true, - .background_images = true, - .plot = &cocoa_plotters - }; - - tree_draw( tree, 0, 0, cocoa_pt_to_px( NSMinX( rect ) ), cocoa_pt_to_px( NSMinY( rect )), - cocoa_pt_to_px( NSWidth( rect ) ), cocoa_pt_to_px( NSHeight( rect ) ), &ctx ); + struct redraw_context ctx = { + .interactive = true, + .background_images = true, + .plot = &cocoa_plotters + }; + + tree_draw(tree, 0, 0, + cocoa_pt_to_px(NSMinX( rect )), + cocoa_pt_to_px(NSMinY( rect )), + cocoa_pt_to_px(NSWidth( rect )), + cocoa_pt_to_px(NSHeight( rect )), + &ctx ); } -- (void) mouseAction: (browser_mouse_state)state atPoint: (NSPoint)point; +- (void) mouseAction: (browser_mouse_state)state atPoint: (NSPoint)point { - tree_mouse_action( tree, state, cocoa_pt_to_px( point.x ), cocoa_pt_to_px( point.y ) ); + tree_mouse_action(tree, state, + cocoa_pt_to_px( point.x ), cocoa_pt_to_px( point.y )); } -- (void) mouseDragEnd: (browser_mouse_state)state fromPoint: (NSPoint)p0 toPoint: (NSPoint) p1; +- (void) mouseDragEnd: (browser_mouse_state)state fromPoint: (NSPoint)p0 toPoint: (NSPoint) p1 { - tree_drag_end( tree, state, - cocoa_pt_to_px( p0.x ), cocoa_pt_to_px( p0.y ), - cocoa_pt_to_px( p1.x ), cocoa_pt_to_px( p1.y ) ); + tree_drag_end(tree, state, + cocoa_pt_to_px( p0.x ), cocoa_pt_to_px( p0.y ), + cocoa_pt_to_px( p1.x ), cocoa_pt_to_px( p1.y )); } - (void) keyPress: (uint32_t) key; { - tree_keypress( tree, key ); + tree_keypress( tree, key ); } @end - |