NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

datetime module: include elm_widget_datetime.h instead of elm_priv.h 

The external module can't include elm_priv.h.
So Elm_Datetime_Module_Data moves in elm_widget_datetime.h
This commit is contained in:
Jaehwan Kim 2015-02-04 18:52:14 +09:00
parent ccfc6df9ed
commit 4629240ad2
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/elementary/src/lib/elm_priv.h
View File

@ -80,7 +80,6 @@ typedef struct _Elm_Config_Bindings_Widget Elm_Config_Bindings_Widget;
typedef struct _Elm_Config_Binding_Key Elm_Config_Binding_Key; typedef struct _Elm_Config_Binding_Key Elm_Config_Binding_Key;
typedef struct _Elm_Config_Binding_Modifier Elm_Config_Binding_Modifier; typedef struct _Elm_Config_Binding_Modifier Elm_Config_Binding_Modifier;
typedef struct _Elm_Module Elm_Module; typedef struct _Elm_Module Elm_Module;
typedef struct _Elm_Datetime_Module_Data Elm_Datetime_Module_Data;
struct _Edje_Signal_Data struct _Edje_Signal_Data
{ {
@ -332,17 +331,6 @@ struct _Elm_Module
int references; int references;
}; };
struct _Elm_Datetime_Module_Data
{
Evas_Object *base;
void (*field_limit_get)(Evas_Object *obj,
Elm_Datetime_Field_Type field_type,
int *range_min,
int *range_max);
const char *(*field_format_get)(Evas_Object * obj,
Elm_Datetime_Field_Type field_type);
};
Eo *_elm_atspi_bridge_root_get(void); Eo *_elm_atspi_bridge_root_get(void);
void _elm_atspi_bridge_init(void); void _elm_atspi_bridge_init(void);
void _elm_atspi_bridge_shutdown(void); void _elm_atspi_bridge_shutdown(void);

20
legacy/elementary/src/lib/elm_widget_datetime.h
View File

@ -23,15 +23,27 @@
/** /**
* Base layout smart data extended with datetime instance data. * Base layout smart data extended with datetime instance data.
*/ */
typedef struct _Elm_Datetime_Data Elm_Datetime_Data; typedef struct _Elm_Datetime_Module_Data Elm_Datetime_Module_Data;
typedef struct _Datetime_Field Datetime_Field; typedef struct _Elm_Datetime_Data Elm_Datetime_Data;
typedef struct _Datetime_Mod_Api Datetime_Mod_Api; typedef struct _Datetime_Field Datetime_Field;
typedef struct _Format_Map Format_Map; typedef struct _Datetime_Mod_Api Datetime_Mod_Api;
typedef struct _Format_Map Format_Map;
#define ELM_DATETIME_TYPE_COUNT 6 #define ELM_DATETIME_TYPE_COUNT 6
#define ELM_DATETIME_MAX_FORMAT_LEN 64 #define ELM_DATETIME_MAX_FORMAT_LEN 64
#define ELM_DATETIME_MAX_FIELD_FORMAT_LEN 3 #define ELM_DATETIME_MAX_FIELD_FORMAT_LEN 3
struct _Elm_Datetime_Module_Data
{
Evas_Object *base;
void (*field_limit_get)(Evas_Object *obj,
Elm_Datetime_Field_Type field_type,
int *range_min,
int *range_max);
const char *(*field_format_get)(Evas_Object * obj,
Elm_Datetime_Field_Type field_type);
};
struct _Datetime_Field struct _Datetime_Field
{ {
Evas_Object *item_obj; Evas_Object *item_obj;

4
legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
View File

@ -3,7 +3,7 @@
#endif #endif
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" #include "elm_widget_datetime.h"
#define DATETIME_FIELD_COUNT 6 #define DATETIME_FIELD_COUNT 6
#define FIELD_FORMAT_LEN 3 #define FIELD_FORMAT_LEN 3
@ -327,7 +327,7 @@ EAPI Elm_Datetime_Module_Data *
obj_hook(Evas_Object *obj) obj_hook(Evas_Object *obj)
{ {
Ctxpopup_Module_Data *ctx_mod; Ctxpopup_Module_Data *ctx_mod;
ctx_mod = ELM_NEW(Ctxpopup_Module_Data); ctx_mod = calloc(1, sizeof(Ctxpopup_Module_Data));
if (!ctx_mod) return NULL; if (!ctx_mod) return NULL;
evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE,