From cd5bf49fbac58149a3f6d8e041521997f9688919 Mon Sep 17 00:00:00 2001 From: Aditya Nrusimha Date: Sat, 22 Sep 2012 16:52:24 -0700 Subject: [PATCH] Added a private header for easy importing for TUITextRenderer. --- TwUI.xcodeproj/project.pbxproj | 14 +++++++++++--- lib/UIKit/TUITextRenderer+Event.m | 9 ++------- lib/UIKit/TUITextRenderer+KeyBindings.m | 5 +---- lib/UIKit/TUITextRenderer+Private.h | 10 ++++++++++ 4 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 lib/UIKit/TUITextRenderer+Private.h diff --git a/TwUI.xcodeproj/project.pbxproj b/TwUI.xcodeproj/project.pbxproj index 4b847eb..5582cf3 100644 --- a/TwUI.xcodeproj/project.pbxproj +++ b/TwUI.xcodeproj/project.pbxproj @@ -9,6 +9,9 @@ /* Begin PBXBuildFile section */ 30D399C9156D8ADD006ECDAE /* TUIProgressBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 30D399C7156D8ADD006ECDAE /* TUIProgressBar.m */; }; 30D39A0D156D8F71006ECDAE /* TUIProgressBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 30D399C6156D8ADD006ECDAE /* TUIProgressBar.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 48373D1B160E850000322CA7 /* TUITextRenderer+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 48373D1A160E84FF00322CA7 /* TUITextRenderer+Private.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 48373D1C160E850000322CA7 /* TUITextRenderer+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 48373D1A160E84FF00322CA7 /* TUITextRenderer+Private.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 48373D1D160E850000322CA7 /* TUITextRenderer+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 48373D1A160E84FF00322CA7 /* TUITextRenderer+Private.h */; settings = {ATTRIBUTES = (Private, ); }; }; 48A10E8115B7769A007F9EE3 /* TUILayoutConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A10E7D15B7769A007F9EE3 /* TUILayoutConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; }; 48A10E8215B7769A007F9EE3 /* TUILayoutConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 48A10E7E15B7769A007F9EE3 /* TUILayoutConstraint.m */; }; 48A10E8315B7769A007F9EE3 /* TUILayoutManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A10E7F15B7769A007F9EE3 /* TUILayoutManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -426,6 +429,7 @@ /* Begin PBXFileReference section */ 30D399C6156D8ADD006ECDAE /* TUIProgressBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIProgressBar.h; sourceTree = ""; }; 30D399C7156D8ADD006ECDAE /* TUIProgressBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIProgressBar.m; sourceTree = ""; }; + 48373D1A160E84FF00322CA7 /* TUITextRenderer+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TUITextRenderer+Private.h"; sourceTree = ""; }; 48A10E7D15B7769A007F9EE3 /* TUILayoutConstraint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUILayoutConstraint.h; sourceTree = ""; }; 48A10E7E15B7769A007F9EE3 /* TUILayoutConstraint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUILayoutConstraint.m; sourceTree = ""; }; 48A10E7F15B7769A007F9EE3 /* TUILayoutManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUILayoutManager.h; sourceTree = ""; }; @@ -841,13 +845,14 @@ CBB74C7613BE6E1900C85CB5 /* TUITextEditor.m */, CBB74C7713BE6E1900C85CB5 /* TUITextField.h */, CBB74C7813BE6E1900C85CB5 /* TUITextField.m */, + CBB74C7C13BE6E1900C85CB5 /* TUITextRenderer.h */, + 48373D1A160E84FF00322CA7 /* TUITextRenderer+Private.h */, 88A4AFDC145A16C90071CF22 /* TUITextRenderer+Accessibility.h */, - 88A4AFDD145A16C90071CF22 /* TUITextRenderer+Accessibility.m */, CBB74C7913BE6E1900C85CB5 /* TUITextRenderer+Event.h */, + CBB74C7D13BE6E1900C85CB5 /* TUITextRenderer.m */, + 88A4AFDD145A16C90071CF22 /* TUITextRenderer+Accessibility.m */, CBB74C7A13BE6E1900C85CB5 /* TUITextRenderer+Event.m */, CBB74C7B13BE6E1900C85CB5 /* TUITextRenderer+KeyBindings.m */, - CBB74C7C13BE6E1900C85CB5 /* TUITextRenderer.h */, - CBB74C7D13BE6E1900C85CB5 /* TUITextRenderer.m */, CBB74C7E13BE6E1900C85CB5 /* TUITextView.h */, CBB74C7F13BE6E1900C85CB5 /* TUITextView.m */, 88EFFB4F13F417E200CF91A9 /* TUITextViewEditor.h */, @@ -935,6 +940,7 @@ D05DEE8E15BF645D005D8769 /* TUIStretchableImage.h in Headers */, D05D23A215BF7239000ED14F /* NSImage+TUIExtensions.h in Headers */, D0EA12F315C34FEA00FAA603 /* NSColor+TUIExtensions.h in Headers */, + 48373D1D160E850000322CA7 /* TUITextRenderer+Private.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1007,6 +1013,7 @@ D05DEE8C15BF645D005D8769 /* TUIStretchableImage.h in Headers */, D05D23A015BF7239000ED14F /* NSImage+TUIExtensions.h in Headers */, D0EA12F115C34FEA00FAA603 /* NSColor+TUIExtensions.h in Headers */, + 48373D1B160E850000322CA7 /* TUITextRenderer+Private.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1040,6 +1047,7 @@ D05DEE8D15BF645D005D8769 /* TUIStretchableImage.h in Headers */, D05D23A115BF7239000ED14F /* NSImage+TUIExtensions.h in Headers */, D0EA12F215C34FEA00FAA603 /* NSColor+TUIExtensions.h in Headers */, + 48373D1C160E850000322CA7 /* TUITextRenderer+Private.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/lib/UIKit/TUITextRenderer+Event.m b/lib/UIKit/TUITextRenderer+Event.m index d2f5d99..c3d00f8 100644 --- a/lib/UIKit/TUITextRenderer+Event.m +++ b/lib/UIKit/TUITextRenderer+Event.m @@ -20,13 +20,7 @@ #import "TUINSView.h" #import "TUINSWindow.h" #import "TUITextEditor.h" - -@interface TUITextRenderer() -- (CTFramesetterRef)ctFramesetter; -- (CTFrameRef)ctFrame; -- (CGPathRef)ctPath; -- (CFRange)_selectedRange; -@end +#import "TUITextRenderer+Private.h" @implementation TUITextRenderer (Event) @@ -378,6 +372,7 @@ normal: NSString *googleString = [NSString stringWithFormat:@"http://www.google.com/search?q=%@", encodedString]; [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:googleString]]; + CFBridgingRelease((__bridge CFStringRef)encodedString); } // Services diff --git a/lib/UIKit/TUITextRenderer+KeyBindings.m b/lib/UIKit/TUITextRenderer+KeyBindings.m index 5b03f35..309342d 100644 --- a/lib/UIKit/TUITextRenderer+KeyBindings.m +++ b/lib/UIKit/TUITextRenderer+KeyBindings.m @@ -18,6 +18,7 @@ #import "TUITextEditor.h" #import "TUIView.h" #import "CoreText+Additions.h" +#import "TUITextRenderer+Private.h" @interface NSString (ABTokenizerAdditions) @end @@ -62,10 +63,6 @@ @end -@interface TUITextRenderer () -- (CTFrameRef)ctFrame; -@end - @implementation TUITextRenderer (KeyBindings) #define TEXT [attributedString string] diff --git a/lib/UIKit/TUITextRenderer+Private.h b/lib/UIKit/TUITextRenderer+Private.h new file mode 100644 index 0000000..a0a93e8 --- /dev/null +++ b/lib/UIKit/TUITextRenderer+Private.h @@ -0,0 +1,10 @@ +#import "TUITextRenderer.h" + +@interface TUITextRenderer () + +- (CTFramesetterRef)ctFramesetter; +- (CTFrameRef)ctFrame; +- (CGPathRef)ctPath; +- (CFRange)_selectedRange; + +@end