Eolian: Integration of Entry

legacy/elementary/src/lib/Makefile.am

@@ -581,7 +581,9 @@ BUILT_SOURCES = \
 		elm_dayselector.eo.c \
 		elm_dayselector.eo.h \
 		elm_diskselector.eo.c \
-		elm_diskselector.eo.h
+		elm_diskselector.eo.h \
+		elm_entry.eo.c \
+		elm_entry.eo.h
 
 EXTRA_DIST += \
 	     elm_widget.eo \
@@ -612,7 +614,8 @@ EXTRA_DIST += \
 	     elc_ctxpopup.eo \
 	     elm_datetime.eo \
 	     elm_dayselector.eo \
-	     elm_diskselector.eo
+	     elm_diskselector.eo \
+	     elm_entry.eo
 
 nodist_includesunstable_HEADERS = \
 				  elm_widget.eo.h \
@@ -643,5 +646,6 @@ nodist_includesunstable_HEADERS = \
 				  elc_ctxpopup.eo.h \
 				  elm_datetime.eo.h \
 				  elm_dayselector.eo.h \
-				  elm_diskselector.eo.h
+				  elm_diskselector.eo.h \
+				  elm_entry.eo.h
 

legacy/elementary/src/lib/elm_entry_eo.h

@@ -1,3 +1,5 @@
+#include "elm_entry.eo.h"
+#if 0
 #define ELM_OBJ_ENTRY_CLASS elm_obj_entry_class_get()
 
 const Eo_Class *elm_obj_entry_class_get(void) EINA_CONST;
@@ -1396,3 +1398,4 @@ enum
  * @ingroup Entry
  */
 #define elm_obj_entry_anchor_hover_end() ELM_OBJ_ENTRY_ID(ELM_OBJ_ENTRY_SUB_ID_ANCHOR_HOVER_END)
+#endif

legacy/elementary/src/lib/elm_entry_legacy.h

@@ -194,7 +194,7 @@ EAPI Eina_Bool          elm_entry_is_empty(const Evas_Object *obj);
  *
  * @ingroup Entry
  */
-EAPI Evas_Object *      elm_entry_textblock_get(Evas_Object *obj);
+EAPI Evas_Object *      elm_entry_textblock_get(const Evas_Object *obj);
 
 /**
  * Forces calculation of the entry size and text layouting.
@@ -1112,7 +1112,7 @@ EAPI void                   elm_entry_input_panel_return_key_autoenabled_set(Eva
  *
  * @ingroup Entry
  */
-EAPI void                  *elm_entry_imf_context_get(Evas_Object *obj);
+EAPI void                  *elm_entry_imf_context_get(const Evas_Object *obj);
 
 /**
  * Set the parent of the hover popup

legacy/elementary/src/lib/elm_widget_entry.h

@@ -20,8 +20,8 @@ typedef struct _Mod_Api                     Mod_Api;
 /**
  * Base widget smart data extended with entry instance data.
  */
-typedef struct _Elm_Entry_Smart_Data        Elm_Entry_Smart_Data;
-struct _Elm_Entry_Smart_Data
+typedef struct _Elm_Entry_Data        Elm_Entry_Data;
+struct _Elm_Entry_Data
 {
    Evas_Object                          *hit_rect, *entry_edje, *scr_edje;
 
@@ -147,7 +147,7 @@ typedef enum _Length_Unit
  */
 
 #define ELM_ENTRY_DATA_GET(o, sd) \
-  Elm_Entry_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_ENTRY_CLASS)
+  Elm_Entry_Data * sd = eo_data_scope_get(o, ELM_OBJ_ENTRY_CLASS)
 
 #define ELM_ENTRY_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_ENTRY_DATA_GET(o, ptr);                        \