From cf8be94835ba2e4f2aba1f448209cf7e9d3e93e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Fri, 4 May 2012 08:08:20 +0200 Subject: update elm --- lib/efl/native/elm/elm_calendar.rb | 22 ++++++++++++++++++---- lib/efl/native/elm/elm_entry.rb | 2 +- lib/efl/native/elm/elm_genlist.rb | 2 +- lib/efl/native/elm/elm_object_item.rb | 4 ---- lib/efl/native/elm/elm_slider.rb | 4 ++-- lib/efl/native/elm/elm_win.rb | 4 ++-- 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/lib/efl/native/elm/elm_calendar.rb b/lib/efl/native/elm/elm_calendar.rb index 2f93e11..79bfe1f 100644 --- a/lib/efl/native/elm/elm_calendar.rb +++ b/lib/efl/native/elm/elm_calendar.rb @@ -25,10 +25,20 @@ module Efl # typedef enum {...} _Elm_Calendar_Mark_Repeat_Type; enum :_elm_calendar_mark_repeat_type, [ :elm_calendar_unique, :elm_calendar_daily, :elm_calendar_weekly, :elm_calendar_monthly, :elm_calendar_annually ] + # typedef enum {...} _Elm_Calendar_Weekday; + enum :_elm_calendar_weekday, [ :elm_day_sunday, :elm_day_monday, :elm_day_tuesday, :elm_day_wednesday, :elm_day_thursday, :elm_day_friday, + :elm_day_saturday, :elm_day_last ] + # typedef enum {...} _Elm_Calendar_Select_Mode; + enum :_elm_calendar_select_mode, [ :elm_calendar_select_mode_default, 0, :elm_calendar_select_mode_always, 1, :elm_calendar_select_mode_none, + 2, :elm_calendar_select_mode_ondemand, 3 ] # # TYPEDEFS # typedef _Elm_Calendar_Mark_Repeat_Type Elm_Calendar_Mark_Repeat_Type; typedef :_elm_calendar_mark_repeat_type, :elm_calendar_mark_repeat_type + # typedef _Elm_Calendar_Weekday Elm_Calendar_Weekday; + typedef :_elm_calendar_weekday, :elm_calendar_weekday + # typedef _Elm_Calendar_Select_Mode Elm_Calendar_Select_Mode; + typedef :_elm_calendar_select_mode, :elm_calendar_select_mode # typedef struct _Elm_Calendar_Mark Elm_Calendar_Mark; typedef :pointer, :elm_calendar_mark # @@ -48,10 +58,10 @@ module Efl [ :elm_calendar_min_max_year_set, [ :evas_object, :int, :int ], :void ], # EAPI void elm_calendar_min_max_year_get(const Evas_Object *obj, int *min, int *max); [ :elm_calendar_min_max_year_get, [ :evas_object, :pointer, :pointer ], :void ], - # EAPI void elm_calendar_day_selection_disabled_set(Evas_Object *obj, Eina_Bool disabled); - [ :elm_calendar_day_selection_disabled_set, [ :evas_object, :bool ], :void ], - # EAPI Eina_Bool elm_calendar_day_selection_disabled_get(const Evas_Object *obj); - [ :elm_calendar_day_selection_disabled_get, [ :evas_object ], :bool ], + # EAPI void elm_calendar_select_mode_set(Evas_Object *obj, Elm_Calendar_Select_Mode mode); + [ :elm_calendar_select_mode_set, [ :evas_object, :_elm_calendar_select_mode ], :void ], + # EAPI Elm_Calendar_Select_Mode elm_calendar_select_mode_get(const Evas_Object *obj); + [ :elm_calendar_select_mode_get, [ :evas_object ], :_elm_calendar_select_mode ], # EAPI void elm_calendar_selected_time_set(Evas_Object *obj, struct tm *selected_time); [ :elm_calendar_selected_time_set, [ :evas_object, :pointer ], :void ], # EAPI Eina_Bool elm_calendar_selected_time_get(const Evas_Object *obj, struct tm *selected_time); @@ -72,6 +82,10 @@ module Efl [ :elm_calendar_interval_set, [ :evas_object, :double ], :void ], # EAPI double elm_calendar_interval_get(const Evas_Object *obj); [ :elm_calendar_interval_get, [ :evas_object ], :double ], + # EAPI void elm_calendar_first_day_of_week_set(Evas_Object *obj, Elm_Calendar_Weekday day); + [ :elm_calendar_first_day_of_week_set, [ :evas_object, :_elm_calendar_weekday ], :void ], + # EAPI Elm_Calendar_Weekday elm_calendar_first_day_of_week_get(const Evas_Object *obj); + [ :elm_calendar_first_day_of_week_get, [ :evas_object ], :_elm_calendar_weekday ], ] # attach_fcts fcts diff --git a/lib/efl/native/elm/elm_entry.rb b/lib/efl/native/elm/elm_entry.rb index 9d9c67d..c5c0190 100644 --- a/lib/efl/native/elm/elm_entry.rb +++ b/lib/efl/native/elm/elm_entry.rb @@ -43,7 +43,7 @@ module Efl enum :elm_input_panel_return_key_type, [ :elm_input_panel_return_key_type_default, :elm_input_panel_return_key_type_done, :elm_input_panel_return_key_type_go, :elm_input_panel_return_key_type_join, :elm_input_panel_return_key_type_login, :elm_input_panel_return_key_type_next, :elm_input_panel_return_key_type_search, :elm_input_panel_return_key_type_send ] - # typedef enum _Elm_Cnp_Mode {...} Elm_Cnp_Mode; + # typedef enum {...} Elm_Cnp_Mode; enum :elm_cnp_mode, [ :elm_cnp_mode_markup, :elm_cnp_mode_no_image, :elm_cnp_mode_plaintext ] # # TYPEDEFS diff --git a/lib/efl/native/elm/elm_genlist.rb b/lib/efl/native/elm/elm_genlist.rb index 1208dc6..8e40f60 100644 --- a/lib/efl/native/elm/elm_genlist.rb +++ b/lib/efl/native/elm/elm_genlist.rb @@ -186,7 +186,7 @@ module Efl [ :elm_genlist_item_demote, [ :elm_object_item ], :void ], # EAPI void elm_genlist_item_fields_update(Elm_Object_Item *it, const char *parts, Elm_Genlist_Item_Field_Type itf); [ :elm_genlist_item_fields_update, [ :elm_object_item, :string, :elm_genlist_item_field_type ], :void ], - # EAPI void elm_genlist_item_decorate_mode_set(Elm_Object_Item *it, const char *mode_type, Eina_Bool mode_set); + # EAPI void elm_genlist_item_decorate_mode_set(Elm_Object_Item *it, const char *decorate_it_type, Eina_Bool decorate_it_set); [ :elm_genlist_item_decorate_mode_set, [ :elm_object_item, :string, :bool ], :void ], # EAPI const char *elm_genlist_item_decorate_mode_get(const Elm_Object_Item *it); [ :elm_genlist_item_decorate_mode_get, [ :elm_object_item ], :string ], diff --git a/lib/efl/native/elm/elm_object_item.rb b/lib/efl/native/elm/elm_object_item.rb index f3825cd..9f4bb50 100644 --- a/lib/efl/native/elm/elm_object_item.rb +++ b/lib/efl/native/elm/elm_object_item.rb @@ -21,10 +21,6 @@ module Efl # ffi_lib 'elementary' # - # CALLBACKS - # typedef void (*Elm_Object_Item_Smart_Cb) (void *data, Elm_Object_Item *it, void *event_info); - callback :elm_object_item_smart_cb, [ :pointer, :elm_object_item, :pointer ], :void - # # FUNCTIONS fcts = [ # EAPI Evas_Object *elm_object_item_widget_get(const Elm_Object_Item *it); diff --git a/lib/efl/native/elm/elm_slider.rb b/lib/efl/native/elm/elm_slider.rb index f5deff9..7d88c76 100644 --- a/lib/efl/native/elm/elm_slider.rb +++ b/lib/efl/native/elm/elm_slider.rb @@ -37,9 +37,9 @@ module Efl [ :elm_slider_indicator_format_set, [ :evas_object, :string ], :void ], # EAPI const char *elm_slider_indicator_format_get(const Evas_Object *obj); [ :elm_slider_indicator_format_get, [ :evas_object ], :string ], - # EAPI void elm_slider_indicator_format_function_set(Evas_Object *obj, const char *(*func)(double val), void (*free_func)(const char *str)); + # EAPI void elm_slider_indicator_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str)); [ :elm_slider_indicator_format_function_set, [ :evas_object, ( callback [:double], :string ), (callback [:string], :void) ], :void ], - # EAPI void elm_slider_units_format_function_set(Evas_Object *obj, const char *(*func)(double val), void (*free_func)(const char *str)); + # EAPI void elm_slider_units_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str)); [ :elm_slider_units_format_function_set, [ :evas_object, (callback [:double], :string), (callback [:string], :void) ], :void ], # EAPI void elm_slider_horizontal_set(Evas_Object *obj, Eina_Bool horizontal); [ :elm_slider_horizontal_set, [ :evas_object, :bool ], :void ], diff --git a/lib/efl/native/elm/elm_win.rb b/lib/efl/native/elm/elm_win.rb index 5546b89..8e62ba1 100644 --- a/lib/efl/native/elm/elm_win.rb +++ b/lib/efl/native/elm/elm_win.rb @@ -202,6 +202,8 @@ module Efl [ :elm_win_screen_position_get, [ :evas_object, :pointer, :pointer ], :void ], # EAPI Eina_Bool elm_win_socket_listen(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys); [ :elm_win_socket_listen, [ :evas_object, :string, :int, :bool ], :bool ], + # EAPI Ecore_X_Window elm_win_xwindow_get(const Evas_Object *obj); + [ :elm_win_xwindow_get, [ :evas_object ], :uint ], # EAPI Evas_Object *elm_win_inwin_add(Evas_Object *parent); [ :elm_win_inwin_add, [ :evas_object ], :evas_object ], # EAPI void elm_win_inwin_activate(Evas_Object *obj); @@ -212,8 +214,6 @@ module Efl [ :elm_win_inwin_content_get, [ :evas_object ], :evas_object ], # EAPI Evas_Object *elm_win_inwin_content_unset(Evas_Object *obj); [ :elm_win_inwin_content_unset, [ :evas_object ], :evas_object ], - # EAPI Ecore_X_Window elm_win_xwindow_get(const Evas_Object *obj); - [ :elm_win_xwindow_get, [ :evas_object ], :uint ], ] # attach_fcts fcts -- cgit v1.1-2-g2b99