forked from enlightenment/efl
elementary/fileselector: Fix legacy path set/get of Fileselector.Entry
This commit is contained in:
parent
f2bb08ba12
commit
d4479b3f55
|
@ -320,9 +320,8 @@ elm_fileselector_button_window_size_get(const Eo *obj, Evas_Coord *width, Evas_C
|
||||||
if (height) *height = sd->h;
|
if (height) *height = sd->h;
|
||||||
}
|
}
|
||||||
|
|
||||||
EINA_DEPRECATED EAPI void
|
void
|
||||||
elm_fileselector_button_path_set(Evas_Object *obj,
|
_elm_fileselector_button_path_set_internal(Evas_Object *obj, const char *path)
|
||||||
const char *path)
|
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_INTERFACE_CHECK(obj);
|
ELM_FILESELECTOR_INTERFACE_CHECK(obj);
|
||||||
ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(obj, sd);
|
ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(obj, sd);
|
||||||
|
@ -343,6 +342,12 @@ elm_fileselector_button_path_set(Evas_Object *obj,
|
||||||
if (sd->fs) elm_interface_fileselector_selected_model_set(sd->fs, model, NULL);
|
if (sd->fs) elm_interface_fileselector_selected_model_set(sd->fs, model, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EINA_DEPRECATED EAPI void
|
||||||
|
elm_fileselector_button_path_set(Evas_Object *obj, const char *path)
|
||||||
|
{
|
||||||
|
_elm_fileselector_button_path_set_internal(obj, path);
|
||||||
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_elm_fileselector_button_elm_interface_fileselector_model_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Efl_Model *model)
|
_elm_fileselector_button_elm_interface_fileselector_model_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Efl_Model *model)
|
||||||
{
|
{
|
||||||
|
@ -365,14 +370,20 @@ _elm_fileselector_button_elm_interface_fileselector_model_set(Eo *obj EINA_UNUSE
|
||||||
if (sd->fs) elm_interface_fileselector_selected_model_set(sd->fs, model, NULL);
|
if (sd->fs) elm_interface_fileselector_selected_model_set(sd->fs, model, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
EINA_DEPRECATED EAPI const char *
|
const char *
|
||||||
elm_fileselector_button_path_get(const Evas_Object *obj)
|
_elm_fileselector_button_path_get_internal(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
|
ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
|
||||||
ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN_VAL(obj, sd, NULL);
|
ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN_VAL(obj, sd, NULL);
|
||||||
return sd->fsd.path;
|
return sd->fsd.path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EINA_DEPRECATED EAPI const char *
|
||||||
|
elm_fileselector_button_path_get(const Evas_Object *obj)
|
||||||
|
{
|
||||||
|
return _elm_fileselector_button_path_get_internal(obj);
|
||||||
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Model *
|
EOLIAN static Efl_Model *
|
||||||
_elm_fileselector_button_elm_interface_fileselector_model_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd)
|
_elm_fileselector_button_elm_interface_fileselector_model_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd)
|
||||||
{
|
{
|
||||||
|
|
|
@ -401,7 +401,7 @@ elm_fileselector_entry_selected_set(Evas_Object *obj, const char *path)
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_INTERFACE_CHECK(obj);
|
ELM_FILESELECTOR_INTERFACE_CHECK(obj);
|
||||||
ELM_FILESELECTOR_ENTRY_DATA_GET_OR_RETURN(obj, sd);
|
ELM_FILESELECTOR_ENTRY_DATA_GET_OR_RETURN(obj, sd);
|
||||||
elm_fileselector_path_set(sd->button, path);
|
_elm_fileselector_button_path_set_internal(sd->button, path);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
|
@ -419,7 +419,7 @@ elm_fileselector_entry_selected_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
|
ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
|
||||||
ELM_FILESELECTOR_ENTRY_DATA_GET_OR_RETURN_VAL(obj, sd, NULL);
|
ELM_FILESELECTOR_ENTRY_DATA_GET_OR_RETURN_VAL(obj, sd, NULL);
|
||||||
return elm_fileselector_path_get(sd->button);
|
return _elm_fileselector_button_path_get_internal(sd->button);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Model *
|
EOLIAN static Efl_Model *
|
||||||
|
@ -475,7 +475,7 @@ elm_fileselector_entry_path_set(Evas_Object *obj,
|
||||||
free(s);
|
free(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
elm_fileselector_path_set(sd->button, path);
|
_elm_fileselector_button_path_set_internal(sd->button, path);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -12,4 +12,10 @@
|
||||||
return __VA_ARGS__; \
|
return __VA_ARGS__; \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
_elm_fileselector_button_path_set_internal(Evas_Object *obj, const char *path);
|
||||||
|
|
||||||
|
const char *
|
||||||
|
_elm_fileselector_button_path_get_internal(const Evas_Object *obj);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue