From 69d5b486af41475e3f86eb7cdef718ddb17b77ac Mon Sep 17 00:00:00 2001
From: andyque <guanghui8827@126.com>
Date: Mon, 26 May 2014 18:19:23 +0800
Subject: [PATCH] Revert "issue #5176, fix compile error on other platforms"

This reverts commit 9118d7a98a15dbf84515dfc62e83e906f63af1d0.

Conflicts:
	cocos/ui/UIFocusManager.h
---
 cocos/ui/Android.mk                        | 3 +--
 cocos/ui/CMakeLists.txt                    | 1 -
 cocos/ui/proj.win32/libGUI.vcxproj         | 2 --
 cocos/ui/proj.win32/libGUI.vcxproj.filters | 6 ------
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/cocos/ui/Android.mk b/cocos/ui/Android.mk
index e486177a16..868b2a9dd1 100644
--- a/cocos/ui/Android.mk
+++ b/cocos/ui/Android.mk
@@ -29,8 +29,7 @@ CCProtectedNode.cpp \
 UIHBox.cpp \
 UIVBox.cpp \
 UIRelativeBox.cpp \
-UIVideoPlayerAndroid.cpp \
-UIFocusManager.cpp
+UIVideoPlayerAndroid.cpp
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
 $(LOCAL_PATH)/../editor-support
diff --git a/cocos/ui/CMakeLists.txt b/cocos/ui/CMakeLists.txt
index 73078a4b50..fd92084a94 100644
--- a/cocos/ui/CMakeLists.txt
+++ b/cocos/ui/CMakeLists.txt
@@ -22,6 +22,5 @@ set(COCOS_UI_SRC
   ui/UITextField.cpp
   ui/UIVBox.cpp
   ui/UIWidget.cpp
-  ui/UIFocusManager.cpp
 )
 
diff --git a/cocos/ui/proj.win32/libGUI.vcxproj b/cocos/ui/proj.win32/libGUI.vcxproj
index 8791070dc3..ee4ba81fb8 100644
--- a/cocos/ui/proj.win32/libGUI.vcxproj
+++ b/cocos/ui/proj.win32/libGUI.vcxproj
@@ -15,7 +15,6 @@
     <ClInclude Include="..\CocosGUI.h" />
     <ClInclude Include="..\UIButton.h" />
     <ClInclude Include="..\UICheckBox.h" />
-    <ClInclude Include="..\UIFocusManager.h" />
     <ClInclude Include="..\UIHBox.h" />
     <ClInclude Include="..\UIHelper.h" />
     <ClInclude Include="..\UIImageView.h" />
@@ -42,7 +41,6 @@
     <ClCompile Include="..\CocosGUI.cpp" />
     <ClCompile Include="..\UIButton.cpp" />
     <ClCompile Include="..\UICheckBox.cpp" />
-    <ClCompile Include="..\UIFocusManager.cpp" />
     <ClCompile Include="..\UIHBox.cpp" />
     <ClCompile Include="..\UIHelper.cpp" />
     <ClCompile Include="..\UIImageView.cpp" />
diff --git a/cocos/ui/proj.win32/libGUI.vcxproj.filters b/cocos/ui/proj.win32/libGUI.vcxproj.filters
index 9ab9ce55bb..28a105b739 100644
--- a/cocos/ui/proj.win32/libGUI.vcxproj.filters
+++ b/cocos/ui/proj.win32/libGUI.vcxproj.filters
@@ -90,9 +90,6 @@
     <ClInclude Include="..\UILayoutExecutant.h">
       <Filter>Layouts</Filter>
     </ClInclude>
-    <ClInclude Include="..\UIFocusManager.h">
-      <Filter>BaseClasses</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\UIScrollView.cpp">
@@ -164,8 +161,5 @@
     <ClCompile Include="..\UILayoutExecutant.cpp">
       <Filter>Layouts</Filter>
     </ClCompile>
-    <ClCompile Include="..\UIFocusManager.cpp">
-      <Filter>BaseClasses</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file