fix up copy & paste with inlined win and a few other cnp nigglies.

also no unimplemented win times for now.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@58686 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 33f0699..4356636 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -469,10 +469,7 @@ extern "C" {
         ELM_WIN_NOTIFICATION,
         ELM_WIN_COMBO,
         ELM_WIN_DND,
-           
-        ELM_WIN_INLINED, // YYY: not implemented yet
         ELM_WIN_INLINED_IMAGE,
-        ELM_WIN_MEMORY // YYY: not implemented yet
      } Elm_Win_Type;
 
    typedef enum _Elm_Win_Keyboard_Mode

diff --git a/src/lib/elm_cnp_helper.c b/src/lib/elm_cnp_helper.c
index 664685a..6c547b1 100644 (file)
--- a/src/lib/elm_cnp_helper.c
+++ b/src/lib/elm_cnp_helper.c
@@ -10,7 +10,7 @@
 
 #define ARRAYINIT(foo)  [foo] =
 
-//#define DEBUGON 1
+#define DEBUGON 1
 
 
 #ifdef DEBUGON
@@ -649,6 +649,7 @@ notify_handler_targets(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notif
 {
    Ecore_X_Selection_Data_Targets *targets;
    Ecore_X_Atom *atomlist;
+   Evas_Object *top;
    int i, j;
 
    targets = notify->data;
@@ -672,8 +673,10 @@ notify_handler_targets(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notif
    return ECORE_CALLBACK_PASS_ON;
 
 done:
-   cnp_debug("Sending request for %s\n",atoms[j].name);
-   sel->request(elm_win_xwindow_get(sel->requestwidget), atoms[j].name);
+   top = elm_widget_top_get(sel->requestwidget);
+   if (!top) top = sel->requestwidget;
+   cnp_debug("Sending request for %s\n", atoms[j].name);
+   sel->request(elm_win_xwindow_get(top), atoms[j].name);
 
    return ECORE_CALLBACK_PASS_ON;
 }

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 18d7e06..fe6e630 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1434,7 +1434,6 @@ _event_selection_notify(void *data, int type __UNUSED__, void *event)
 static Eina_Bool
 _event_selection_clear(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
-/*
    Widget_Data *wd = elm_widget_data_get(data);
    Ecore_X_Event_Selection_Clear *ev = event;
    if (!wd) return ECORE_CALLBACK_PASS_ON;
@@ -1444,7 +1443,6 @@ _event_selection_clear(void *data __UNUSED__, int type __UNUSED__, void *event _
      {
         elm_entry_select_none(data);
      }
-   return 1; */
    return ECORE_CALLBACK_PASS_ON;
 }
 
@@ -1456,7 +1454,6 @@ _drag_drop_cb(void *data __UNUSED__, Evas_Object *obj, Elm_Selection_Data *drop)
    Eina_Bool rv;
 
    wd = elm_widget_data_get(obj);
-
    if (!wd) return EINA_FALSE;
    printf("Inserting at (%d,%d) %s\n",drop->x,drop->y,(char*)drop->data);
 

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 37d3fdf..9ab1169 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -1150,10 +1150,6 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
 
    switch (type)
      {
-      case ELM_WIN_INLINED:
-        // FIXME: implement. same as ELM_WIN_INLINED_IMAGE but with border
-        // frame
-        break;
       case ELM_WIN_INLINED_IMAGE:
           {
              if (parent)
@@ -1183,9 +1179,6 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
                }
           }
         break;
-      case ELM_WIN_MEMORY:
-        // FIXME: implement
-        break;
       default:
         if (ENGINE_COMPARE(ELM_SOFTWARE_X11))
           {