Fixed issue cocos2d#1066

Mac: EventDispatcher triggers flagsChanged correctly
psineur · Dec 20, 2010 · f911191 · f911191
1 parent 1279d20
commit f911191
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -328,6 +328,8 @@ People/companies who were/are contributing code to cocos2d for iPhone (alphabeti
 		Author of the scraper script used to parse games data in the cocos2d site
 	* Pieter van de Bruggen
 		Author of Gradient layer
+	* psi.pk.ru:
+		EventDispatcher: flagsChanged is triggered correctly. patch
 	* psionic81:
 		ActionManager doesn't purge running actions patch
 	* rac5372:

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+version 1.0-beta - XX-XXX-2011
+. [FIX-MAC]: EventDispatcher: flagsChanged is triggered correctly (issue #1066)
+
 version 0.99.5 - 16-Dec-2010
 . [NEW] All: small performance improvements in all the code
 . [NEW] Layer: Added gradient layer

diff --git a/cocos2d/Platforms/Mac/CCEventDispatcher.m b/cocos2d/Platforms/Mac/CCEventDispatcher.m
@@ -504,7 +504,7 @@ - (void)flagsChanged:(NSEvent *)event
 		tListEntry *entry, *tmp;
 
 		DL_FOREACH_SAFE( keyboardDelegates_, entry, tmp ) {
-			if ( entry->flags & kCCImplementsKeyUp ) {
+			if ( entry->flags & kCCImplementsFlagsChanged ) {
 				void *swallows = [entry->delegate performSelector:@selector(ccFlagsChanged:) withObject:event];
 				if( swallows )
 					break;

diff --git a/cocos2d/cocos2d.h b/cocos2d/cocos2d.h
@@ -38,8 +38,8 @@
  */
 
 // 0x00 HI ME LO
-// 00   00 99 05
-#define COCOS2D_VERSION 0x00009905
+// 00   01 00 00
+#define COCOS2D_VERSION 0x00010000
 
 #import <Availability.h>
 

diff --git a/cocos2d/cocos2d.m b/cocos2d/cocos2d.m
@@ -25,7 +25,7 @@
 
 #import <Foundation/Foundation.h>
 
-static NSString *version = @"cocos2d v0.99.5";
+static NSString *version = @"cocos2d v1.0.0-beta";
 
 NSString *cocos2dVersion()
 {	

diff --git a/doxygen.config b/doxygen.config
@@ -25,13 +25,13 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "cocos2d for iPhone 0.99.5"
+PROJECT_NAME           = "cocos2d for iPhone 1.0.0"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.99.5
+PROJECT_NUMBER         = 1.0.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/install-templates.sh b/install-templates.sh
@@ -2,7 +2,7 @@
 
 echo 'cocos2d-iphone template installer'
 
-COCOS2D_VER='cocos2d 0.99.5'
+COCOS2D_VER='cocos2d 1.0.0'
 BASE_TEMPLATE_DIR="/Library/Application Support/Developer/Shared/Xcode"
 BASE_TEMPLATE_USER_DIR="$HOME/Library/Application Support/Developer/Shared/Xcode"