colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-11-14 02:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed type of _textSize.

Browse Source 
- Changed NULL to nil.
This commit is contained in:
Aparajita Fishman committed 2010-09-30 17:30:58 -04:00
1 parent e527c7e19f
commit a175e71906
1 file changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/_CPImageAndTextView.j
+7 -7
View File
@@ -66,7 +66,7 @@ var _CPimageAndTextViewFrameSizeChangedFlag = 1 << 0,
CPImage _image;
CPString _text;
CGRect _textSize;
CGSize _textSize;
unsigned _flags;
@@ -107,7 +107,7 @@ var _CPimageAndTextViewFrameSizeChangedFlag = 1 << 0,
[self setImageScaling:CPScaleNone];
}
_textSize = NULL;
_textSize = nil;
}
return self;
@@ -251,7 +251,7 @@ var _CPimageAndTextViewFrameSizeChangedFlag = 1 << 0,
_font = aFont;
_flags |= _CPImageAndTextViewFontChangedFlag;
_textSize = NULL;
_textSize = nil;
[self setNeedsLayout];
}
@@ -345,7 +345,7 @@ var _CPimageAndTextViewFrameSizeChangedFlag = 1 << 0,
_text = text;
_flags |= _CPImageAndTextViewTextChangedFlag;
_textSize = NULL;
_textSize = nil;
[self setNeedsLayout];
}
@@ -368,7 +368,7 @@ var _CPimageAndTextViewFrameSizeChangedFlag = 1 << 0,
{
_DOMElement.removeChild(_DOMTextElement);
_DOMTextElement = NULL;
_DOMTextElement = nil;
hasDOMTextElement = NO;
}
@@ -406,7 +406,7 @@ var _CPimageAndTextViewFrameSizeChangedFlag = 1 << 0,
{
_DOMElement.removeChild(_DOMTextShadowElement);
_DOMTextShadowElement = NULL;
_DOMTextShadowElement = nil;
hasDOMTextShadowElement = NO;
}
@@ -544,7 +544,7 @@ var _CPimageAndTextViewFrameSizeChangedFlag = 1 << 0,
{
_DOMElement.removeChild(_DOMImageElement);
_DOMImageElement = NULL;
_DOMImageElement = nil;
hasDOMImageElement = NO;
}