Merge "Remove CXX03 Build & old Tizen Version Builds" into devel/master

[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 c7bfa39..b9ef5dd 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) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -19,45 +19,24 @@
 #include <dali/devel-api/adaptor-framework/application-devel.h>
 #include <dali/internal/adaptor/common/application-impl.h>
 
+#ifdef DALI_ADAPTOR_COMPILATION
+#include <dali/integration-api/scene-holder.h>
+#else
+#include <dali/integration-api/adaptors/scene-holder.h>
+#endif
+
 namespace Dali
 {
 
 namespace DevelApplication
 {
 
-void PreInitialize( int* argc, char** argv[] )
-{
-  Internal::Adaptor::Application::PreInitialize( argc, argv );
-}
 
 bool AddIdleWithReturnValue( Application application, CallbackBase* callback )
 {
   return Internal::Adaptor::GetImplementation( application ).AddIdle( callback, true );
 }
 
-Dali::Window CreateWindow( Application application, PositionSize childPosSize, const std::string& childWindowName, const std::string& childWindowClassName, bool childWindowMode )
-{
-  auto& adaptor = Internal::Adaptor::GetImplementation( application ).GetAdaptor();
-
-  Dali::Window childWindow = Dali::Window::New( childPosSize, childWindowName, childWindowClassName, childWindowMode );
-  Internal::Adaptor::Adaptor::GetImplementation( adaptor ).AddWindow( &childWindow, childWindowName, childWindowClassName, childWindowMode );
-  return childWindow;
-}
-
-bool DestroyWindow( Application application, Dali::Window* childWindow )
-{
-  auto& adaptor = Internal::Adaptor::GetImplementation( application ).GetAdaptor();
-
-  return Internal::Adaptor::Adaptor::GetImplementation( adaptor ).RemoveWindow( childWindow );
-}
-
-bool DestroyWindow( Application application, const std::string& childWindowName )
-{
-  auto& adaptor = Internal::Adaptor::GetImplementation( application ).GetAdaptor();
-
-  return Internal::Adaptor::Adaptor::GetImplementation( adaptor ).RemoveWindow( childWindowName );
-}
-
 std::string GetDataPath()
 {
   return Internal::Adaptor::Application::GetDataPath();
@@ -66,3 +45,10 @@ std::string GetDataPath()
 } // namespace DevelApplication
 
 } // namespace Dali
+
+extern "C"
+void PreInitialize( int* argc, char** argv[] )
+{
+  Dali::Internal::Adaptor::Application::PreInitialize( argc, argv );
+}
+