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

fixed for ABSOLUTE and RELATIVE winrt compiler reserved words

This commit is contained in:
Dale Stammen 2014-05-12 09:26:39 -07:00
parent 50336dca40
commit bad71e38d0
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/ui/UILayoutParameter.h
View File

@ -60,6 +60,13 @@ const Margin MarginZero = Margin();
* @js NA * @js NA
* @lua NA * @lua NA
*/ */
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
#ifdef RELATIVE
#undef RELATIVE
#endif
#endif
class LayoutParameter : public Ref class LayoutParameter : public Ref
{ {
public: public:

8
cocos/ui/UIWidget.h
View File

@ -49,6 +49,14 @@ CC_DEPRECATED_ATTRIBUTE typedef void (Ref::*SEL_TouchEvent)(Ref*,TouchEventType)
* @js NA * @js NA
* @lua NA * @lua NA
*/ */
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
#ifdef ABSOLUTE
#undef ABSOLUTE
#endif
#endif
class Widget : public ProtectedNode class Widget : public ProtectedNode
{ {
public: public: