adopt the return type for caller to send button in keyboard mode

[platform/core/uifw/inputdelegator.git] / src / MoreOption.cpp

diff --git a/src/MoreOption.cpp b/src/MoreOption.cpp
index 33a335e..5159e0c 100755 (executable)
--- a/src/MoreOption.cpp
+++ b/src/MoreOption.cpp
@@ -16,6 +16,7 @@
 
 #include "Debug.h"
 
+#include <string>
 #include <assert.h>
 #include <iostream>
 #include <stdexcept>
@@ -28,14 +29,14 @@
 #include "w-input-stt-ise.h"
 #include "w-input-stt-voice.h"
 
+using namespace std;
+
 extern Evas_Object *g_setting_window;
 
 MoreOption::MoreOption(Evas_Object *naviframe, void* voicedata)
        : nf(naviframe)
        , more_option_layout(NULL)
-#ifdef _WEARABLE
        , item(NULL)
-#endif
        , option_opened(EINA_FALSE)
        , voicedata(voicedata) {
        /** todo. implement constructor */
@@ -118,7 +119,10 @@ void MoreOption::SetContentLayout(Evas_Object *content) {
        elm_object_part_content_set(more_option_layout, "elm.swallow.content", content);
 
        Elm_Object_Item *nit = NULL;
-       nit = elm_naviframe_item_push(nf, NULL, NULL, NULL, more_option_layout, "empty");
+       const char *item_style = NULL;
+       if (_WEARABLE)
+               item_style = "empty";
+       nit = elm_naviframe_item_push(nf, NULL, NULL, NULL, more_option_layout, item_style);
        elm_naviframe_item_title_enabled_set(nit, EINA_FALSE, EINA_FALSE);
 
        elm_naviframe_item_pop_cb_set(nit,
@@ -223,12 +227,13 @@ Evas_Object* MoreOption::AddLanguageIcon(Evas_Object *parent) {
                PRINTFUNC(DLOG_ERROR, "It's failed to add image.");
        }
 
-       std::string res_path;
-       char *tmp_path = app_get_resource_path();
-       if (tmp_path) {
-               res_path = tmp_path;
-               free(tmp_path);
-       }
+       string res_path = get_resource_path();
+       if (_WEARABLE)
+               res_path = res_path + "wearable/";
+       else if (_TV)
+               res_path = res_path + "tv/";
+       else
+               res_path = res_path + "mobile/";
 
        std::string image_path = res_path + "images/prompt_ic_languages.png";