Commit: 9d99e1c617b620c9599b53f699c97bd8f392edd3 - textmate (git)

TextMate is a graphical text editor for OS X 10.7+

Commit MetaInfo

• Revision: 9d99e1c617b620c9599b53f699c97bd8f392edd3 (tree)
• Time: 2012-08-19 05:27:06
• Author: Allan Odgaard <git@abet...>
• Commiter: Allan Odgaard

Log Message

fixup! Represent font size using a CGFloat

Change Summary

• modified: Frameworks/theme/src/theme.cc
• modified: Frameworks/theme/src/theme.h

Incremental Difference

--- a/Frameworks/theme/src/theme.cc
+++ b/Frameworks/theme/src/theme.cc
@@ -11,7 +11,7 @@ static void get_key_path (plist::dictionary_t const& plist, std::string const& s
 	color = read_color(temp_str);
 }
 
-static void get_key_path(plist::dictionary_t const& plist, std::string const& setting, CGFloat &font_size)
+static void get_key_path (plist::dictionary_t const& plist, std::string const& setting, CGFloat& font_size)
 {
 	std::string temp_str = NULL_STR;
 	plist::get_key_path(plist, setting, temp_str);

--- a/Frameworks/theme/src/theme.h
+++ b/Frameworks/theme/src/theme.h
@@ -55,7 +55,7 @@ private:
 
 	struct decomposed_style_t
 	{
-		decomposed_style_t (scope::selector_t const& scopeSelector = scope::selector_t(), std::string const& fontName = NULL_STR, CGFloat fontSize = 0) : scope_selector(scopeSelector), font_name(fontName), bold(bool_unset), italic(bool_unset), underlined(bool_unset), misspelled(bool_unset), absolute_font_size(fontSize) { }
+		decomposed_style_t (scope::selector_t const& scopeSelector = scope::selector_t(), std::string const& fontName = NULL_STR, CGFloat fontSize = -1) : scope_selector(scopeSelector), font_name(fontName), bold(bool_unset), italic(bool_unset), underlined(bool_unset), misspelled(bool_unset), absolute_font_size(fontSize) { }
 		decomposed_style_t& operator+= (decomposed_style_t const& rhs);
 
 		scope::selector_t scope_selector;