From e6bc8d7c98b4db64f35c00a117c28f91eb849c38 Mon Sep 17 00:00:00 2001
From: natural-law <bin@cocos2d-x.org>
Date: Tue, 12 Jul 2011 17:46:57 +0800
Subject: [PATCH] fixed #599, Resolve the wrong orientation when exit the
 TouchesTest.

---
 tests/tests/controller.cpp |  2 ++
 tests/tests/testBasic.cpp  | 11 -----------
 tests/tests/testBasic.h    |  1 -
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/tests/tests/controller.cpp b/tests/tests/controller.cpp
index ec0ac6944a..5b80d238b6 100644
--- a/tests/tests/controller.cpp
+++ b/tests/tests/controller.cpp
@@ -113,6 +113,8 @@ static TestScene* CreateTestScene(int nIdx)
 TestController::TestController()
 : m_tBeginPos(CCPointZero)
 {
+    CCDirector::sharedDirector()->setDeviceOrientation(CCDeviceOrientationPortrait);
+
     // add close menu
     CCMenuItemImage *pCloseItem = CCMenuItemImage::itemFromNormalImage(s_pPathClose, s_pPathClose, this, menu_selector(TestController::closeCallback) );
     CCMenu* pMenu =CCMenu::menuWithItems(pCloseItem, NULL);
diff --git a/tests/tests/testBasic.cpp b/tests/tests/testBasic.cpp
index 990ef79393..a0847d6539 100644
--- a/tests/tests/testBasic.cpp
+++ b/tests/tests/testBasic.cpp
@@ -44,14 +44,3 @@ TestScene::TestScene(bool bPortrait)
     // 54321 is the tag of BackToMainMenuLayer
     addChild(pLayer, 1000, 54321);
 }
-
-void TestScene::onExit()
-{
-    if (m_bPortrait)
-    {
-        // turn back to the default orientation
-        CCDirector::sharedDirector()->setDeviceOrientation(CCDeviceOrientationPortrait);
-    }
-    
-    CCScene::onExit();
-}
diff --git a/tests/tests/testBasic.h b/tests/tests/testBasic.h
index 51c5cc7196..42fad5f01e 100644
--- a/tests/tests/testBasic.h
+++ b/tests/tests/testBasic.h
@@ -20,7 +20,6 @@ public:
     TestScene(bool bPortrait = false);
 
     virtual void runThisTest() = 0;
-    virtual void onExit();
 
 protected:
     bool m_bPortrait; // indicate if this test case requires portrait mode