Merge branch 'devel/master' into sandbox/dkdk/tizen

[platform/core/uifw/dali-adaptor.git] / dali / devel-api / adaptor-framework / application-devel.cpp

diff --git a/dali/devel-api/adaptor-framework/application-devel.cpp b/dali/devel-api/adaptor-framework/application-devel.cpp
index 8ed500a..792bc36 100644 (file)
--- a/dali/devel-api/adaptor-framework/application-devel.cpp
+++ b/dali/devel-api/adaptor-framework/application-devel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 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.
@@ -17,19 +17,33 @@
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/application-devel.h>
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
 #include <dali/internal/adaptor/common/application-impl.h>
 
 namespace Dali
 {
-
 namespace DevelApplication
 {
+bool AddIdleWithReturnValue(Application application, CallbackBase* callback)
+{
+  return Internal::Adaptor::GetImplementation(application).AddIdle(callback, true);
+}
 
-void PreInitialize( int* argc, char** argv[] )
+std::string GetDataPath()
 {
-  Internal::Adaptor::Application::PreInitialize( argc, argv );
+  return Internal::Adaptor::Application::GetDataPath();
+}
+
+Application DownCast(Dali::RefObject* refObject)
+{
+  return Application(dynamic_cast<Dali::Internal::Adaptor::Application*>(refObject));
 }
 
 } // namespace DevelApplication
 
 } // namespace Dali
+
+extern "C" void ApplicationPreInitialize(int* argc, char** argv[])
+{
+  Dali::Internal::Adaptor::Application::PreInitialize(argc, argv);
+}