diff --git a/build/tizen/.gitignore b/build/tizen/.gitignore index 6c2a095509..2af6ac8393 100644 --- a/build/tizen/.gitignore +++ b/build/tizen/.gitignore @@ -1,3 +1,6 @@ /SA_Report /Emulator /res +/Debug +/Debug +/Debug diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-tizen.h b/cocos/ui/UIEditBox/UIEditBoxImpl-tizen.h index b4ca623ff0..46fa5d7f7d 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-tizen.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-tizen.h @@ -64,6 +64,7 @@ public: virtual void setInputMode(EditBox::InputMode inputMode); virtual void setInputFlag(EditBox::InputFlag inputFlag); virtual void setMaxLength(int maxLength); + virtual void setTextHorizontalAlignment(cocos2d::TextHAlignment alignment) { }; virtual int getMaxLength(); virtual void setReturnType(EditBox::KeyboardReturnType returnType); virtual bool isEditing(); diff --git a/tests/cpp-tests/Classes/WindowTest/WindowTest.cpp b/tests/cpp-tests/Classes/WindowTest/WindowTest.cpp index b84b35278f..bdf7773672 100644 --- a/tests/cpp-tests/Classes/WindowTest/WindowTest.cpp +++ b/tests/cpp-tests/Classes/WindowTest/WindowTest.cpp @@ -1,5 +1,6 @@ #include "WindowTest.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) USING_NS_CC; WindowTests::WindowTests() { @@ -52,3 +53,5 @@ void WindowTestFullscreen2::onEnter() { std::string WindowTestFullscreen2::subtitle() const { return "Fullscreen Monitor 2 (if present)"; } + +#endif diff --git a/tests/cpp-tests/Classes/WindowTest/WindowTest.h b/tests/cpp-tests/Classes/WindowTest/WindowTest.h index 7de2802e8e..007150e6e0 100644 --- a/tests/cpp-tests/Classes/WindowTest/WindowTest.h +++ b/tests/cpp-tests/Classes/WindowTest/WindowTest.h @@ -1,6 +1,7 @@ #ifndef __WINDOWTEST_H__ #define __WINDOWTEST_H__ +#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) #include "../BaseTest.h" DEFINE_TEST_SUITE(WindowTests); @@ -44,3 +45,5 @@ public: }; #endif /* __WINDOWTEST_H__ */ + +#endif