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

Merge pull request #14399 from xiaofeng11/v3_combine_mac32compatible 

Combine Studio change for compatible with 32 bit Mac System
This commit is contained in:
pandamicro 2015-11-17 10:44:40 +08:00
parent 367a502fd4 e3c120eef4
commit c77ea57fb1
3 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/network/HttpAsynConnection-apple.h
View File

@ -34,6 +34,18 @@
/// @cond /// @cond
@interface HttpAsynConnection : NSObject <NSURLConnectionDelegate, NSURLConnectionDataDelegate> @interface HttpAsynConnection : NSObject <NSURLConnectionDelegate, NSURLConnectionDataDelegate>
{ {
NSString *srcURL;
NSString *sslFile;
NSDictionary *responseHeader;
NSMutableData *responseData;
NSInteger getDataTime;
NSInteger responseCode;
NSString *statusString;
NSError *responseError;
NSError *connError;
NSURLConnection *conn;
bool finish;
NSRunLoop *runLoop;
} }
// The original URL to download. Due to redirects the actual content may come from another URL // The original URL to download. Due to redirects the actual content may come from another URL

24
cocos/network/HttpAsynConnection-apple.m
View File

@ -35,18 +35,18 @@
@implementation HttpAsynConnection @implementation HttpAsynConnection
@synthesize srcURL; @synthesize srcURL = srcURL;
@synthesize sslFile; @synthesize sslFile = sslFile;
@synthesize responseHeader; @synthesize responseHeader = responseHeader;
@synthesize responseData; @synthesize responseData = responseData;
@synthesize getDataTime; @synthesize getDataTime = getDataTime;
@synthesize responseCode; @synthesize responseCode = responseCode;
@synthesize statusString; @synthesize statusString = statusString;
@synthesize responseError; @synthesize responseError = responseError;
@synthesize connError; @synthesize connError = connError;
@synthesize conn; @synthesize conn = conn;
@synthesize finish; @synthesize finish = finish;
@synthesize runLoop; @synthesize runLoop = runLoop;
- (void)dealloc - (void)dealloc
{ {

21
cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm
View File

@ -41,12 +41,16 @@
/** TODO: Missing doc - What does "CustomTextFieldFormatter" do? /** TODO: Missing doc - What does "CustomTextFieldFormatter" do?
*/ */
@interface CustomTextFieldFormatter : NSFormatter @interface CustomTextFieldFormatter : NSFormatter
{
int _maximumLength;
}
@property (nonatomic, assign) int maximumLength; @property (nonatomic, assign) int maximumLength;
@end @end
@implementation CustomTextFieldFormatter @implementation CustomTextFieldFormatter
@synthesize maximumLength = _maximumLength;
- (instancetype)init - (instancetype)init
{ {
@ -88,6 +92,16 @@
#pragma mark - UIEditBox mac implementation #pragma mark - UIEditBox mac implementation
@interface UIEditBoxImplMac : NSObject <NSTextFieldDelegate> @interface UIEditBoxImplMac : NSObject <NSTextFieldDelegate>
{
NSTextField* _textField;
NSSecureTextField* _secureTextField;
NSMutableDictionary* _placeholderAttributes;
NSWindow* _window;
BOOL _editState;
BOOL _secure;
void* _editBox;
}
@property (nonatomic, retain) NSTextField* textField; @property (nonatomic, retain) NSTextField* textField;
@property (nonatomic, retain) NSSecureTextField *secureTextField; @property (nonatomic, retain) NSSecureTextField *secureTextField;
@ -110,6 +124,13 @@
@implementation UIEditBoxImplMac @implementation UIEditBoxImplMac
@synthesize textField = _textField;
@synthesize secureTextField = _secureTextField;
@synthesize placeholderAttributes = _placeholderAttributes;
@synthesize window = _window;
@synthesize editState = _editState;
@synthesize secure = _secure;
@synthesize editBox = _editBox;
- (instancetype)initWithFrame:(NSRect)frameRect editBox:(void *)editBox - (instancetype)initWithFrame:(NSRect)frameRect editBox:(void *)editBox
{ {