X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Fdummy-control.h;h=40dcf4fc8952ffa246d9e3a42e77c8e29d90ea72;hp=49214f9a3446d21cea293f0a24e5e6479305fe87;hb=f4d5b3ffc194fc1b1c14f4a79e3efa435a31bc32;hpb=a881757839b7abb008873a68c67e17b3ba39669b

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
index 49214f9..40dcf4f 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
@@ -1,22 +1,21 @@
 #ifndef __DALI_TOOLKIT_TEST_DUMMY_CONTROL_H__
 #define __DALI_TOOLKIT_TEST_DUMMY_CONTROL_H__
 
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+// Copyright (c) 2014 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
@@ -62,22 +61,22 @@ public: // Not intended for application developers
 };
 
 /**
- * Cannot create an instance of ControlImpl, so use this dummy class for the implementation.
- * This class does not override any of ControlImpl's behaviour.
+ * Cannot create an instance of Internal::Control, so use this dummy class for the implementation.
+ * This class does not override any of Internal::Control's behaviour.
  */
-class DummyControlImpl : public ControlImpl
+class DummyControlImpl : public Internal::Control
 {
 public:
 
   static DummyControl New();
 
 public:
-  inline void EnableGestureDetection(Gesture::Type type) { ControlImpl::EnableGestureDetection(type); }
-  inline void DisableGestureDetection(Gesture::Type type) { ControlImpl::DisableGestureDetection(type); }
-  inline PinchGestureDetector GetPinchGestureDetector() const { return ControlImpl::GetPinchGestureDetector(); }
-  inline PanGestureDetector GetPanGestureDetector() const { return ControlImpl::GetPanGestureDetector(); }
-  inline TapGestureDetector GetTapGestureDetector() const { return ControlImpl::GetTapGestureDetector(); }
-  inline LongPressGestureDetector GetLongPressGestureDetector() const { return ControlImpl::GetLongPressGestureDetector(); }
+  inline void EnableGestureDetection(Gesture::Type type) { Internal::Control::EnableGestureDetection(type); }
+  inline void DisableGestureDetection(Gesture::Type type) { Internal::Control::DisableGestureDetection(type); }
+  inline PinchGestureDetector GetPinchGestureDetector() const { return Internal::Control::GetPinchGestureDetector(); }
+  inline PanGestureDetector GetPanGestureDetector() const { return Internal::Control::GetPanGestureDetector(); }
+  inline TapGestureDetector GetTapGestureDetector() const { return Internal::Control::GetTapGestureDetector(); }
+  inline LongPressGestureDetector GetLongPressGestureDetector() const { return Internal::Control::GetLongPressGestureDetector(); }
 
 protected:
 
@@ -87,8 +86,8 @@ protected:
 };
 
 /**
- * Cannot create an instance of ControlImpl, so use this dummy class for the implementation.
- * This class DOES override ControlImpl's behaviour.
+ * Cannot create an instance of Internal::Control, so use this dummy class for the implementation.
+ * This class DOES override Internal::Control's behaviour.
  */
 class DummyControlImplOverride : public DummyControlImpl
 {
@@ -102,10 +101,11 @@ private:
 
   virtual ~DummyControlImplOverride();
 
-private: // From ControlImpl
+private: // From Internal::Control
 
   virtual void OnInitialize();
-  virtual void OnStyleChange(StyleChange change);
+  virtual void OnThemeChange( StyleManager styleManager );
+  virtual void OnFontChange(bool defaultFontChange, bool defaultFontSizeChange);
   virtual void OnPinch(PinchGesture pinch);
   virtual void OnPan(PanGesture pan);
   virtual void OnTap(TapGesture tap);
@@ -128,7 +128,8 @@ private: // From CustomActorImpl
 public:
 
   bool initializeCalled;
-  bool styleChangeCalled;
+  bool themeChangeCalled;
+  bool fontChangeCalled;
   bool pinchCalled;
   bool panCalled;
   bool tapCalled;