diff options
| author | Sven Weidauer <sven.weidauer@gmail.com> | 2011-01-26 13:58:35 +0000 |
|---|---|---|
| committer | Sven Weidauer <sven.weidauer@gmail.com> | 2011-01-26 13:58:35 +0000 |
| commit | 241510c0e236dc3479a0987ca2f166ba8a3d15bd (patch) | |
| tree | 7be39ff3f3208d51947a9d9c26185639358e9fc3 | |
| parent | 56fb20de83ef74934183ca2dc45a81626dae4e64 (diff) | |
| download | netsurf-241510c0e236dc3479a0987ca2f166ba8a3d15bd.tar.gz netsurf-241510c0e236dc3479a0987ca2f166ba8a3d15bd.tar.bz2 | |
Some random fixes.
svn path=/trunk/netsurf/; revision=11496
| -rw-r--r-- | cocoa/TreeView.m | 2 | ||||
| -rw-r--r-- | cocoa/gui.m | 5 | ||||
| -rw-r--r-- | cocoa/res/BrowserWindow.xib | 19 |
3 files changed, 13 insertions, 13 deletions
diff --git a/cocoa/TreeView.m b/cocoa/TreeView.m index 467668313..e67e89db4 100644 --- a/cocoa/TreeView.m +++ b/cocoa/TreeView.m @@ -44,7 +44,7 @@ static const struct treeview_table cocoa_tree_callbacks = { treeHandle = tree_create( history_global_get_tree_flags(), &cocoa_tree_callbacks, self ); if (NULL == treeHandle) { [self release]; - self = nil; + return nil; } history_global_initialise( treeHandle, "" ); return self; diff --git a/cocoa/gui.m b/cocoa/gui.m index 6f2ce5d74..57b7cc479 100644 --- a/cocoa/gui.m +++ b/cocoa/gui.m @@ -252,9 +252,10 @@ void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon) image = [[NSImage alloc] initWithSize: NSMakeSize( 32, 32 )]; [image addRepresentation: bmp]; } else { - image = [[NSApp applicationIconImage] retain]; + image = [[NSImage imageNamed: @"NetSurf"] copy]; } - + [image setFlipped: YES]; + [(BrowserViewController *)g setFavicon: image]; [image release]; } diff --git a/cocoa/res/BrowserWindow.xib b/cocoa/res/BrowserWindow.xib index 7ed0124cb..4ccce303a 100644 --- a/cocoa/res/BrowserWindow.xib +++ b/cocoa/res/BrowserWindow.xib @@ -12,7 +12,6 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="73"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -82,6 +81,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{8, 14}, {30, 25}}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="296571644"> <int key="NSCellFlags">67239424</int> @@ -128,6 +128,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{5, 14}, {71, 25}}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSSegmentedCell" key="NSCell" id="845979064"> <int key="NSCellFlags">67239424</int> @@ -190,6 +191,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{0, 14}, {96, 22}}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1053649244"> <int key="NSCellFlags">-1804468671</int> @@ -371,6 +373,7 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{0, 532}, {774, 22}}</string> <reference key="NSSuperview" ref="1006"/> + <reference key="NSWindow"/> <string key="NSClassName">PSMTabBarControl</string> </object> <object class="NSTextField" id="795357547"> @@ -378,6 +381,7 @@ <int key="NSvFlags">290</int> <string key="NSFrame">{{25, 3}, {732, 14}}</string> <reference key="NSSuperview" ref="1006"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="717772067"> <int key="NSCellFlags">68288064</int> @@ -412,6 +416,7 @@ <object class="NSPSMatrix" key="NSDrawMatrix"/> <string key="NSFrame">{{4, 2}, {16, 16}}</string> <reference key="NSSuperview" ref="1006"/> + <reference key="NSWindow"/> <int key="NSpiFlags">28938</int> <double key="NSMaxValue">100</double> </object> @@ -420,6 +425,7 @@ <int key="NSvFlags">18</int> <string key="NSFrame">{{0, 20}, {774, 512}}</string> <reference key="NSSuperview" ref="1006"/> + <reference key="NSWindow"/> <object class="NSMutableArray" key="NSTabViewItems"> <bool key="EncodedWithXMLCoder">YES</bool> </object> @@ -431,6 +437,7 @@ </object> <string key="NSFrameSize">{774, 554}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSMinSize">{273, 97}</string> @@ -618,14 +625,6 @@ <int key="connectionID">74</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">showHistory:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="229385913"/> - </object> - <int key="connectionID">78</int> - </object> - <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">value: selection.browserView.historyVisible</string> <reference key="source" ref="296571644"/> @@ -917,7 +916,7 @@ <object class="NSAffineTransform"> <bytes key="NSTransformStruct">P4AAAL+AAABDiwAAxAVAAA</bytes> </object> - <string>{{355, 703}, {616, 169}}</string> + <string>{{355, 872}, {616, 0}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> |