Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gles20' of https://github.com/donaldalanmorrison/cocos2d-x into gles20

This commit is contained in:
James Chen 2012-09-26 09:49:48 +08:00
parent effb4b3121 f6b51c0a5f
commit e8e55c600b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/GUI/CCEditBox/EditBoxImplIOS.mm
View File

@ -51,7 +51,7 @@
{ {
[textField_ resignFirstResponder]; [textField_ resignFirstResponder];
[textField_ removeFromSuperview]; [textField_ removeFromSuperview];
[textField_ release]; self.textField = NULL;
[super dealloc]; [super dealloc];
} }
@ -63,7 +63,7 @@
{ {
if (self == nil) break; if (self == nil) break;
editState_ = NO; editState_ = NO;
textField_ = [[CustomUITextField alloc] initWithFrame: frameRect]; self.textField = [[[CustomUITextField alloc] initWithFrame: frameRect] autorelease];
if (!textField_) break; if (!textField_) break;
[textField_ setTextColor:[UIColor whiteColor]]; [textField_ setTextColor:[UIColor whiteColor]];
textField_.font = [UIFont systemFontOfSize:frameRect.size.height*2/3]; //TODO need to delete hard code here. textField_.font = [UIFont systemFontOfSize:frameRect.size.height*2/3]; //TODO need to delete hard code here.
@ -79,9 +79,6 @@
return self; return self;
}while(0); }while(0);
[textField_ release];
return nil; return nil;
} }