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

issue #375: fix some compile error

This commit is contained in:
minggo 2011-03-09 10:21:29 +08:00
parent f1d13ca2e1
commit 1aafd4fc56
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos2dx/platform/win32/CCAccelerometer_win32.h
View File

@ -27,16 +27,16 @@ THE SOFTWARE.
namespace cocos2d {
class CC_DLL UIAccelerometer
class CC_DLL CCAccelerometer
{
public:
UIAccelerometer();
~UIAccelerometer();
CCAccelerometer();
~CCAccelerometer();
static UIAccelerometer* sharedAccelerometer() { return NULL; }
static CCAccelerometer* sharedAccelerometer() { return NULL; }
void removeDelegate(UIAccelerometerDelegate* pDelegate) {}
void addDelegate(UIAccelerometerDelegate* pDelegate) {}
void removeDelegate(CCAccelerometerDelegate* pDelegate) {}
void addDelegate(CCAccelerometerDelegate* pDelegate) {}
};
}//namespace cocos2d

14
cocos2dx/platform/win32/CCFileUtils_win32.cpp
View File

@ -52,9 +52,9 @@ typedef enum
class CCDictMaker
{
public:
NSDictionary<std::string, CCObject*> *m_pRootDict;
NSDictionary<std::string, CCObject*> *m_pCurDict;
std::stack<NSDictionary<std::string, CCObject*>*> m_tDictStack;
CCDictionary<std::string, CCObject*> *m_pRootDict;
CCDictionary<std::string, CCObject*> *m_pCurDict;
std::stack<CCDictionary<std::string, CCObject*>*> m_tDictStack;
std::string m_sCurKey;///< parsed key
CCSAXState m_tState;
public:
@ -67,7 +67,7 @@ public:
~CCDictMaker()
{
}
NSDictionary<std::string, CCObject*> *dictionaryWithContentsOfFile(const char *pFileName)
CCDictionary<std::string, CCObject*> *dictionaryWithContentsOfFile(const char *pFileName)
{
FILE *fp = NULL;
if( !(fp = fopen(pFileName, "r")) )
@ -117,7 +117,7 @@ void plist_startElement(void *ctx, const xmlChar *name, const xmlChar **atts)
std::string sName((char*)name);
if( sName == "dict" )
{
NSDictionary<std::string, CCObject*> *pNewDict = new NSDictionary<std::string, CCObject*>();
CCDictionary<std::string, CCObject*> *pNewDict = new CCDictionary<std::string, CCObject*>();
if(! pMaker->m_pRootDict)
{
pMaker->m_pRootDict = pNewDict;
@ -164,7 +164,7 @@ void plist_endElement(void *ctx, const xmlChar *name)
pMaker->m_tDictStack.pop();
if ( !pMaker->m_tDictStack.empty() )
{
pMaker->m_pCurDict = (NSDictionary<std::string, CCObject*>*)(pMaker->m_tDictStack.top());
pMaker->m_pCurDict = (CCDictionary<std::string, CCObject*>*)(pMaker->m_tDictStack.top());
}
}
pMaker->m_tState = SAX_NONE;
@ -285,7 +285,7 @@ const char *CCFileUtils::fullPathFromRelativeFile(const char *pszFilename, const
return pRet->m_sString.c_str();
}
NSDictionary<std::string, CCObject*> *CCFileUtils::dictionaryWithContentsOfFile(const char *pFileName)
CCDictionary<std::string, CCObject*> *CCFileUtils::dictionaryWithContentsOfFile(const char *pFileName)
{
CCDictMaker tMaker;
return tMaker.dictionaryWithContentsOfFile(pFileName);

6
cocos2dx/platform/win32/CCFileUtils_win32.h
View File

@ -51,11 +51,11 @@ public:
/// @endcond
/**
@brief Generate a NSDictionary pointer by file
@brief Generate a CCDictionary pointer by file
@param pFileName The file name of *.plist file
@return The NSDictionary pointer generated from the file
@return The CCDictionary pointer generated from the file
*/
static NSDictionary<std::string, CCObject*> *dictionaryWithContentsOfFile(const char *pFileName);
static CCDictionary<std::string, CCObject*> *dictionaryWithContentsOfFile(const char *pFileName);
/**
@brief Set the ResourcePath,we will find resource in this path

2
platform_support/src/win32/ccimage_win32.cpp
View File

@ -24,7 +24,7 @@ THE SOFTWARE.
NS_CC_BEGIN;
void ccxMessageBox(const ccxString& msg, const ccxString& title)
void CCMessageBox(const ccxString& msg, const ccxString& title)
{
MessageBoxA(NULL, msg.c_str(), title.c_str(), MB_OK);
}