Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / popup / popup-impl.h

diff --git a/base/dali-toolkit/internal/controls/popup/popup-impl.h b/dali-toolkit/internal/controls/popup/popup-impl.h
similarity index 98%
rename from base/dali-toolkit/internal/controls/popup/popup-impl.h
rename to dali-toolkit/internal/controls/popup/popup-impl.h
index e4bab54..6a6fc0e 100755 (executable)
--- a/base/dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/dali-toolkit/internal/controls/popup/popup-impl.h
@@ -246,7 +246,12 @@ private:
   virtual void OnControlChildAdd( Actor& child );
 
   /**
   virtual void OnControlChildAdd( Actor& child );
 
   /**

-   * @copydoc Control::OnRelayout()
+   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& size )
+   */
+  virtual void OnControlSizeSet( const Vector3& size );
+
+  /**
+   * @copydoc Control::OnRelayOut()

    */
   virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
 
    */
   virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );