X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol.cpp;h=0721ff9eaf3b08bd7272e73f9bc26cc903cf1923;hp=8652f1a0ec90110642ea4eea0c1905f7add99c5c;hb=e6b7228703163899cf4bf4648a12ac5dbf73807d;hpb=d57dd5d306bcfaee778dcb6c00e24465f0f4f5de

diff --git a/dali-toolkit/public-api/controls/control.cpp b/dali-toolkit/public-api/controls/control.cpp
index 8652f1a..0721ff9 100644
--- a/dali-toolkit/public-api/controls/control.cpp
+++ b/dali-toolkit/public-api/controls/control.cpp
@@ -1,20 +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.
+ *
+ */
 
+// CLASS HEADER
 #include <dali-toolkit/public-api/controls/control.h>
+
+// INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 namespace Dali
@@ -23,22 +27,9 @@ namespace Dali
 namespace Toolkit
 {
 
-const char* const Control::ACTION_CONTROL_ACTIVATED = "control-activated";
-const char* const Control::SIGNAL_KEY_EVENT = "key-event";
-
 Control Control::New()
 {
-  // Use TypeRegistry to create instance of control so that the type-info matches Control rather than ControlImpl
-  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( typeid(Control) );
-  DALI_ASSERT_ALWAYS( typeInfo && "TypeRegistry returning Invalid TypeInfo" );
-
-  BaseHandle handle = typeInfo.CreateInstance();
-  DALI_ASSERT_ALWAYS( handle && "Unable to Create Control" );
-
-  Control control = DownCast( handle );
-  DALI_ASSERT_ALWAYS( handle && "TypeRegistry did not create a Control" );
-
-  return control;
+  return Internal::Control::New();
 }
 
 Control::Control()
@@ -46,7 +37,7 @@ Control::Control()
 }
 
 Control::Control(const Control& uiControl)
-: CustomActor( uiControl ? static_cast<const ControlImpl&>( uiControl.GetImplementation() ).GetOwner() : NULL)
+: CustomActor( uiControl ? static_cast< const Internal::Control& >( uiControl.GetImplementation() ).GetOwner() : NULL)
 {
 }
 
@@ -65,17 +56,17 @@ Control& Control::operator=( const Control& handle )
 
 Control Control::DownCast( BaseHandle handle )
 {
-  return DownCast<Control, ControlImpl>(handle);
+  return DownCast< Control, Internal::Control >(handle);
 }
 
-ControlImpl& Control::GetImplementation()
+Internal::Control& Control::GetImplementation()
 {
-  return static_cast<ControlImpl&>(CustomActor::GetImplementation());
+  return static_cast<Internal::Control&>(CustomActor::GetImplementation());
 }
 
-const ControlImpl& Control::GetImplementation() const
+const Internal::Control& Control::GetImplementation() const
 {
-  return static_cast<const ControlImpl&>(CustomActor::GetImplementation());
+  return static_cast<const Internal::Control&>(CustomActor::GetImplementation());
 }
 
 void Control::SetSizePolicy( SizePolicy widthPolicy, SizePolicy heightPolicy )
@@ -158,6 +149,16 @@ LongPressGestureDetector Control::GetLongPressGestureDetector() const
   return GetImplementation().GetLongPressGestureDetector();
 }
 
+void Control::SetStyleName( const std::string& styleName )
+{
+  GetImplementation().SetStyleName( styleName );
+}
+
+const std::string& Control::GetStyleName() const
+{
+  return GetImplementation().GetStyleName();
+}
+
 void Control::SetBackgroundColor( const Vector4& color )
 {
   GetImplementation().SetBackgroundColor( color );
@@ -183,37 +184,12 @@ Actor Control::GetBackgroundActor() const
   return GetImplementation().GetBackgroundActor();
 }
 
-Control::KeyEventSignalV2& Control::KeyEventSignal()
+Control::KeyEventSignalType& Control::KeyEventSignal()
 {
   return GetImplementation().KeyEventSignal();
 }
 
-/**
- * @copydoc ConnectionTrackerInterface::SignalConnected
- */
-void Control::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )
-{
-  GetImplementation().SignalConnected(slotObserver, callback );
-}
-
-/**
- * @copydoc ConnectionTrackerInterface::SignalDisconnected
- */
-void Control::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback )
-{
-  GetImplementation().SignalDisconnected(slotObserver, callback );
-}
-
-/**
- * @copydoc ConnectionTrackerInterface::GetConnectionCount
- */
-std::size_t Control::GetConnectionCount() const
-{
-  return GetImplementation().GetConnectionCount( );
-}
-
-
-Control::Control(ControlImpl& implementation)
+Control::Control(Internal::Control& implementation)
 : CustomActor(implementation)
 {
 }
@@ -221,7 +197,7 @@ Control::Control(ControlImpl& implementation)
 Control::Control(Dali::Internal::CustomActor* internal)
 : CustomActor(internal)
 {
-  VerifyCustomActorPointer<ControlImpl>(internal);
+  VerifyCustomActorPointer<Internal::Control>(internal);
 }
 
 } // namespace Toolkit