diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2011-05-06 20:40:09 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-05-06 20:40:09 +0000 |
| commit | e71691bae890040b83cfd54a2d9a1097d5026866 (patch) | |
| tree | 96b2680dc6559ca0ab88fa0b6a533c13b7c9487e /cocoa/gui.m | |
| parent | e77b1a29550e4753f771848705975295a6ebe99e (diff) | |
| download | netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.gz netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.bz2 | |
Merge branches/jmb/content-factory to trunk
svn path=/trunk/netsurf/; revision=12283
Diffstat (limited to 'cocoa/gui.m')
| -rw-r--r-- | cocoa/gui.m | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/cocoa/gui.m b/cocoa/gui.m index f3a0b04a2..0ffc44543 100644 --- a/cocoa/gui.m +++ b/cocoa/gui.m @@ -258,11 +258,6 @@ void gui_window_stop_throbber(struct gui_window *g) void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon) { -#ifdef WITH_BMP - if (icon != NULL && content_get_type( icon ) == CONTENT_ICO) - nsico_set_bitmap_from_size( icon, 16, 16 ); -#endif - NSBitmapImageRep *bmp = icon != NULL ? (NSBitmapImageRep *)content_get_bitmap( icon ) : NULL; NSImage *image = nil; |