Revision: 18049
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18049&view=rev
Author: hofman
Date: 2011-08-07 16:43:31 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
Was changing the search menu template in the wrong way, fix that. Also add an
empty search menu template, because NSSearchField does not properly update its
search button when the menu is added/removed.
Modified Paths:
--------------
trunk/bibdesk/BDSKFileContentSearchController.m
Modified: trunk/bibdesk/BDSKFileContentSearchController.m
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.m 2011-08-07 16:32:06 UTC
(rev 18048)
+++ trunk/bibdesk/BDSKFileContentSearchController.m 2011-08-07 16:43:31 UTC
(rev 18049)
@@ -209,26 +209,26 @@
if (nil != searchField) {
// disconnect the current searchfield
- [savedSearchMenuTemplate release];
- savedSearchMenuTemplate = [[[searchField cell] searchMenuTemplate]
retain];
- [savedRecentSearches release];
- savedRecentSearches = [[[searchField cell] recentSearches] retain];
[searchField setTarget:nil];
[searchField setDelegate:nil];
- [[searchField cell] setSearchMenuTemplate:nil];
- [[searchField cell] setRecentSearches:nil];
+ [[searchField cell] setSearchMenuTemplate:savedSearchMenuTemplate];
+ [[searchField cell] setRecentSearches:savedRecentSearches];
+ BDSKDESTROY(savedSearchMenuTemplate);
+ BDSKDESTROY(savedRecentSearches);
}
[searchField release];
searchField = [aSearchField retain];
if (nil != searchField) {
+ [savedSearchMenuTemplate release];
+ savedSearchMenuTemplate = [[[searchField cell] searchMenuTemplate]
retain];
+ [savedRecentSearches release];
+ savedRecentSearches = [[[searchField cell] recentSearches] retain];
[searchField setTarget:self];
[searchField setDelegate:self];
- [[searchField cell] setSearchMenuTemplate:savedSearchMenuTemplate];
- [[searchField cell] setRecentSearches:savedRecentSearches];
- BDSKDESTROY(savedSearchMenuTemplate);
- BDSKDESTROY(savedRecentSearches);
+ [[searchField cell] setSearchMenuTemplate:[[[NSMenu alloc] init]
autorelease]];
+ [[searchField cell] setRecentSearches:nil];
[self search:searchField];
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
