Conversion to Apache 2.0 license

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / dummy-control.cpp

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
index df988c0..8e1473e 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
@@ -1,21 +1,24 @@
-//
-// 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.
-//
+/*
+ * 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.
+ *
+ */

 
 #include "dummy-control.h"
 
 
 #include "dummy-control.h"
 

+#include <dali-toolkit/public-api/styling/style-manager.h>
+

 namespace Dali
 {
 
 namespace Dali
 {
 


@@ -65,7 +68,7 @@ DummyControl DummyControlImpl::New()
 }
 
 DummyControlImpl::DummyControlImpl()
 }
 
 DummyControlImpl::DummyControlImpl()

-: ControlImpl(true)
+: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) )

 {
 }
 
 {
 }
 


@@ -85,7 +88,8 @@ DummyControl DummyControlImplOverride::New()
 DummyControlImplOverride::DummyControlImplOverride()
 : DummyControlImpl(),
   initializeCalled(false),
 DummyControlImplOverride::DummyControlImplOverride()
 : DummyControlImpl(),
   initializeCalled(false),

-  styleChangeCalled(false),
+  themeChangeCalled( false ),
+  fontChangeCalled( false ),

   pinchCalled(false),
   panCalled(false),
   tapCalled(false),
   pinchCalled(false),
   panCalled(false),
   tapCalled(false),


@@ -108,7 +112,8 @@ DummyControlImplOverride::~DummyControlImplOverride() { }
 
 
 void DummyControlImplOverride::OnInitialize() { initializeCalled = true; }
 
 
 void DummyControlImplOverride::OnInitialize() { initializeCalled = true; }

-void DummyControlImplOverride::OnStyleChange(StyleChange change) { styleChangeCalled = true;}
+void DummyControlImplOverride::OnThemeChange(StyleManager change) { themeChangeCalled = true;}
+void DummyControlImplOverride::OnFontChange(bool defaultFontChange, bool defaultFontSizeChange) { fontChangeCalled = true; }

 void DummyControlImplOverride::OnPinch(PinchGesture pinch) { pinchCalled = true; }
 void DummyControlImplOverride::OnPan(PanGesture pan) { panCalled = true; }
 void DummyControlImplOverride::OnTap(TapGesture tap) { tapCalled = true; }
 void DummyControlImplOverride::OnPinch(PinchGesture pinch) { pinchCalled = true; }
 void DummyControlImplOverride::OnPan(PanGesture pan) { panCalled = true; }
 void DummyControlImplOverride::OnTap(TapGesture tap) { tapCalled = true; }