github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use 64-bit: miscellaneous fixes

Browse Source 
- Property using superclass ivar
- Multiple methods matching selector
This commit is contained in:
Jacob Bandes-Storch
2012-08-27 16:20:56 -07:00
committed by Allan Odgaard
parent dfdde3283f
commit a79c9d0377
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Frameworks/HTMLOutput/src/OakHTMLOutputView.h
View File

@@ -10,5 +10,4 @@ PUBLIC @interface OakHTMLOutputView : HOBrowserView
BOOL runningCommand;
}
@property (nonatomic, readonly) BOOL runningCommand;
@property (nonatomic, readonly) WebView* webView;
@end

2
Frameworks/HTMLOutput/src/OakHTMLOutputView.mm
View File

@@ -11,7 +11,7 @@ extern NSString* const kCommandRunnerURLScheme; // from HTMLOutput.h
@end
@implementation OakHTMLOutputView
@synthesize runningCommand, webView;
@synthesize runningCommand;
- (id)initWithFrame:(NSRect)frame
{

4
Frameworks/OakFilterList/src/datasources/BundleItemChooser.mm
View File

@@ -476,7 +476,7 @@ static std::vector<bundles::item_ptr> relevant_items_in_scope (search::type sear
return items;
}
- (NSAttributedString*)displayStringForItem:(id)item
- (NSAttributedString*)displayStringForItem:(BundleItemChooserItem*)item
{
NSUInteger index = [item index];
std::string const& itemName = all_items[index]->full_name();
@@ -498,7 +498,7 @@ static std::vector<bundles::item_ptr> relevant_items_in_scope (search::type sear
}
}
- (void)willDisplayCell:(NSTextFieldCell*)aCell forItem:(id)anItem
- (void)willDisplayCell:(NSTextFieldCell*)aCell forItem:(BundleItemChooserItem*)anItem
{
NSUInteger index = [anItem index];
[(OakBundleItemCell*)aCell setKeyEquivalent:[NSString stringWithCxxString:all_items[index]->value_for_field(bundles::kFieldKeyEquivalent)]];