Fixed a bug with objj_debug_typecheck incorrectly misidentifying empty string as not a CPString. Also fixed a number of type declarations after running with objj_msgSend_decorate(objj_typecheck_decorator); turned on.

Reviewed by me.
This commit is contained in:
Francisco Ryan Tolmasky I committed 2010-02-21 13:37:20 -08:00
1 parent 7ef59418dd
commit c33e2ee51f
7 files changed
+12 -11

No files matched your search

+2 -2
View File
@@ -1041,7 +1041,7 @@ var _CPAppBootstrapperActions = nil;
{
}
+ (void)actions
+ (CPArray)actions
{
return [@selector(bootstrapPlatform), @selector(loadDefaultTheme), @selector(loadMainCibFile)];
}
@@ -1076,7 +1076,7 @@ var _CPAppBootstrapperActions = nil;
return YES;
}
+ (void)blendDidFinishLoading:(CPBundle)aBundle
+ (void)blendDidFinishLoading:(CPThemeBlend)aThemeBlend
{
[CPTheme setDefaultTheme:[CPTheme themeNamed:[CPApplication defaultThemeName]]];
+1 -1
View File
@@ -2291,7 +2291,7 @@ setBoundsOrigin:
return [_themeAttributes[aName] value];
}
- (void)currentValueForThemeAttribute:(CPString)aName
- (id)currentValueForThemeAttribute:(CPString)aName
{
if (!_themeAttributes || !_themeAttributes[aName])
[CPException raise:CPInvalidArgumentException reason:[self className] + " does not contain theme attribute '" + aName + "'"];
+1 -1
View File
@@ -1504,7 +1504,7 @@ CPTexturedBackgroundWindowMask
[_inclusiveRegisteredDraggedTypes unionSet:pasteboardTypes];
}
- (void)_noteUnregisteredDraggedTypes:(CPArray)pasteboardTypes
- (void)_noteUnregisteredDraggedTypes:(CPSet)pasteboardTypes
{
if (!pasteboardTypes)
return;
+1 -1
View File
@@ -228,7 +228,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
}
}
- (CPImage)showsResizeIndicator
- (BOOL)showsResizeIndicator
{
return _resizeIndicator !== nil;
}
+1 -1
View File
@@ -137,7 +137,7 @@ var PrimaryPlatformWindow = NULL;
return frame;
}
- (void)usableContentFrame
- (CGRect)usableContentFrame
{
return [self visibleFrame];
}
+1 -1
View File
@@ -193,7 +193,7 @@ var _CPKeyedUnarchiverArrayClass = Ni
}
/* @ignore */
- (void)_decodeDictionaryOfObjectsForKey:(CPString)aKey
- (CPDictionary)_decodeDictionaryOfObjectsForKey:(CPString)aKey
{
var object = [_plistObject objectForKey:aKey];
+5 -4
View File
@@ -167,12 +167,13 @@ GLOBAL(objj_debug_typecheck) = function(expectedType, object)
{
return;
}
else if (object && object.isa)
else if (object !== undefined && object.isa)
{
var theClass = object.isa;
for (; theClass; theClass = theClass.super_class)
if (theClass === objjClass)
return;
if (theClass === objjClass)
return;
}
}
else
@@ -189,6 +190,6 @@ GLOBAL(objj_debug_typecheck) = function(expectedType, object)
actualType = GETMETA(object).name;
else
actualType = typeof object;
throw ("expected=" + expectedType + ", actual=" + actualType);
}