X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpopup%2Fpopup-impl.h;h=b6ee02beaa11adf181e8d77d0827e85bc5ac3635;hb=refs%2Fchanges%2F81%2F35081%2F7;hp=747df4cfd923a2bc89d9d099062f5ad5f838d715;hpb=e2eda444afbe82e9591fe198eef339227f90a616;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.h b/dali-toolkit/internal/controls/popup/popup-impl.h
index 747df4c..b6ee02b 100755
--- a/dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/dali-toolkit/internal/controls/popup/popup-impl.h
@@ -1,24 +1,29 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_POPUP_H__
 #define __DALI_TOOLKIT_INTERNAL_POPUP_H__
 
-//
-// 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.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/animation/animation.h>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/popup/popup.h>
 #include <dali-toolkit/internal/controls/popup/popup-style-impl.h>
@@ -43,7 +48,7 @@ typedef IntrusivePtr<PopupStyle> PopupStylePtr;
 /**
  * @copydoc Toolkit::Popup
  */
-class Popup : public ControlImpl
+class Popup : public Control
 {
 public:
 
@@ -179,12 +184,12 @@ public: // Signals
   /**
    * @copydoc Dali::Toolkit::Popup::OutsideTouchedSignal()
    */
-  Toolkit::Popup::TouchedOutsideSignalV2& OutsideTouchedSignal();
+  Toolkit::Popup::TouchedOutsideSignalType& OutsideTouchedSignal();
 
   /**
    * @copydoc Dali::Toolkit::Popup::HiddenSignal()
    */
-  Toolkit::Popup::HiddenSignalV2& HiddenSignal();
+  Toolkit::Popup::HiddenSignalType& HiddenSignal();
 
   /**
    * Connects a callback function with the object's signals.
@@ -240,18 +245,23 @@ private:
   virtual void OnPropertySet( Property::Index index, Property::Value propertyValue );
 
   /**
-   * From ControlImpl; called after a child has been added to the owning actor.
+   * From Control; called after a child has been added to the owning actor.
    * @param[in] child The child which has been added.
    */
   virtual void OnControlChildAdd( Actor& child );
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnRelaidOut()
+   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& size )
+   */
+  virtual void OnControlSizeSet( const Vector3& size );
+
+  /**
+   * @copydoc Control::OnRelayOut()
    */
-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnKeyEvent()
+   * @copydoc Control::OnKeyEvent()
    */
   virtual bool OnKeyEvent(const KeyEvent& event);
 
@@ -273,7 +283,7 @@ private:
   /**
    * @copydoc Control::GetNextKeyboardFocusableActor()
    */
-  Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);
+  Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);
 
 private:
 
@@ -318,8 +328,8 @@ private:
 
   LayoutInfo mLayoutInfo;                 ///< Stores sizes of all popup components.
 
-  Toolkit::Popup::TouchedOutsideSignalV2 mTouchedOutsideSignalV2;
-  Toolkit::Popup::HiddenSignalV2 mHiddenSignalV2;
+  Toolkit::Popup::TouchedOutsideSignalType mTouchedOutsideSignal;
+  Toolkit::Popup::HiddenSignalType mHiddenSignal;
 
   Property::Index mPropertyTitle;         ///< Property index for Title.
   Property::Index mPropertyState;         ///< Property index for popup state.