-#ifndef __DALI_TOOLKIT_INTERNAL_POPUP_H__
-#define __DALI_TOOLKIT_INTERNAL_POPUP_H__
+#ifndef DALI_TOOLKIT_INTERNAL_POPUP_H
+#define DALI_TOOLKIT_INTERNAL_POPUP_H
/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
namespace Dali
* @param[in] touch The Touch Data.
* @return Whether to consume event or not.
*/
- bool OnBackingTouched(Actor actor, const TouchData& touch);
+ bool OnBackingTouched(Actor actor, const TouchEvent& touch);
/**
* Signal occurs when a mouse wheel event occurs on the dimmed backing.
* @param[in] touch The Touch Data.
* @return Whether to consume event or not.
*/
- bool OnDialogTouched( Actor actor, const TouchData& touch );
+ bool OnDialogTouched( Actor actor, const TouchEvent& touch );
/**
* @copydoc Toolkit::Control::OnInitialize()
/**
* Called when the popup is directly or indirectly parented to the stage.
*/
- virtual void OnStageConnection( int depth );
+ virtual void OnSceneConnection( int depth );
/**
* From Control; called after a child has been added to the owning actor.
*/
void AddFocusableChildrenRecursive( Actor parent, std::vector< Actor >& focusableActors );
+ /**
+ * Sets up the touch signals connections as required.
+ * @note This must be called after all the members have been created.
+ */
+ void SetupTouch();
+
private:
// Undefined.
} // namespace Dali
-#endif // __DALI_TOOLKIT_INTERNAL_POPUP_H__
+#endif // DALI_TOOLKIT_INTERNAL_POPUP_H