* Revert my previous commit, the correct way to set the style of a widget is to...

 * Mark all the remaining elm_*_style_set() as deprecated.
 * Some whitespaces

SVN revision: 43095

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 4133d7b..8792938 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -243,7 +243,7 @@ extern "C" {
 
    EAPI Evas_Object *elm_win_inwin_add(Evas_Object *obj);
    EAPI void         elm_win_inwin_activate(Evas_Object *obj);
-   EAPI void         elm_win_inwin_style_set(Evas_Object *obj, const char *style);
+   EAPI void         elm_win_inwin_style_set(Evas_Object *obj, const char *style); /** DEPRECATED. use elm_object_style_set() instead */
    EAPI void         elm_win_inwin_content_set(Evas_Object *obj, Evas_Object *content);
    /* available styles:
     * default
@@ -319,7 +319,7 @@ extern "C" {
    EAPI const char  *elm_button_label_get(Evas_Object *obj);
    EAPI void         elm_button_icon_set(Evas_Object *obj, Evas_Object *icon);
    EAPI Evas_Object *elm_button_icon_get(Evas_Object *obj);
-   EAPI void         elm_button_style_set(Evas_Object *obj, const char *style);
+   EAPI void         elm_button_style_set(Evas_Object *obj, const char *style);/** DEPRECATED. use elm_object_style_set() instead */
    /* available styles:
     * default
     * anchor
@@ -385,7 +385,7 @@ extern "C" {
    EAPI void         elm_frame_label_set(Evas_Object *obj, const char *label);
    EAPI const char  *elm_frame_label_get(Evas_Object *obj);
    EAPI void         elm_frame_content_set(Evas_Object *obj, Evas_Object *content);
-   EAPI void         elm_frame_style_set(Evas_Object *obj, const char *style);
+   EAPI void         elm_frame_style_set(Evas_Object *obj, const char *style);/** DEPRECATED. use elm_object_style_set() instead */
    /* available styles:
     * default
     * pad_small
@@ -450,7 +450,7 @@ extern "C" {
    EAPI void         elm_hover_target_set(Evas_Object *obj, Evas_Object *target);
    EAPI void         elm_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
    EAPI void         elm_hover_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content);
-   EAPI void         elm_hover_style_set(Evas_Object *obj, const char *style);
+   EAPI void         elm_hover_style_set(Evas_Object *obj, const char *style); /** DEPRECATED. use elm_object_style_set() instead */
    EAPI const char  *elm_hover_best_content_location_get(const Evas_Object *obj, Elm_Hover_Axis pref_axis);
    /* available styles:
     * default
@@ -829,7 +829,6 @@ extern "C" {
    EAPI void         elm_pager_content_promote(Evas_Object *obj, Evas_Object *content);
    EAPI Evas_Object *elm_pager_content_bottom_get(Evas_Object *obj);
    EAPI Evas_Object *elm_pager_content_top_get(Evas_Object *obj);
-   EAPI void         elm_pager_style_set(Evas_Object *obj, const char *style);
    /* available item styles:
     * default
     * fade

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index ac34f24..54c5e47 100644 (file)
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -97,7 +97,7 @@ _sub_del(void *data, Evas_Object *obj, void *event_info)
    if (sub == wd->icon)
      {
        edje_object_signal_emit(wd->btn, "elm,state,icon,hidden", "elm");
-       evas_object_event_callback_del(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 
+       evas_object_event_callback_del(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                        _changed_size_hints);
        wd->icon = NULL;
        edje_object_message_signal_process(wd->btn);
@@ -139,7 +139,7 @@ elm_button_add(Evas_Object *parent)
 
    wd->btn = edje_object_add(e);
    _elm_theme_set(wd->btn, "button", "base", "default");
-   edje_object_signal_callback_add(wd->btn, "elm,action,click", "", 
+   edje_object_signal_callback_add(wd->btn, "elm,action,click", "",
                                    _signal_clicked, obj);
    elm_widget_resize_object_set(obj, wd->btn);
 
@@ -153,7 +153,7 @@ elm_button_add(Evas_Object *parent)
  * Set the label used in the button
  *
  * @param obj The button object
- * @param label The text will be written on the button 
+ * @param label The text will be written on the button
  *
  * @ingroup Button
  */
@@ -232,6 +232,8 @@ elm_button_icon_get(Evas_Object *obj)
  * @param obj The button object
  * @param style The style for the button
  *
+ * DEPRECATED. use elm_object_style_set() instead
+ *
  * @ingroup Button
  */
 EAPI void

diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index 2bdd4bc..996fa38 100644 (file)
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -68,7 +68,7 @@ _sub_del(void *data, Evas_Object *obj, void *event_info)
 
    if (sub == wd->content)
      {
-       evas_object_event_callback_del(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 
+       evas_object_event_callback_del(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                        _changed_size_hints);
        wd->content = NULL;
        _sizing_eval(obj);
@@ -164,7 +164,7 @@ elm_frame_content_set(Evas_Object *obj, Evas_Object *content)
      {
        elm_widget_sub_object_add(obj, content);
        edje_object_part_swallow(wd->frm, "elm.swallow.content", content);
-       evas_object_event_callback_add(content, 
+       evas_object_event_callback_add(content,
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                       _changed_size_hints, obj);
        _sizing_eval(obj);
@@ -177,6 +177,8 @@ elm_frame_content_set(Evas_Object *obj, Evas_Object *content)
  * @param obj The frame object
  * @param style The style will be applied in this frame
  *
+ * DEPRECATED. use elm_object_style_set() instead
+ *
  * @ingroup Frame
  */
 EAPI void

diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 39412b3..84dcaef 100644 (file)
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -67,7 +67,7 @@ _theme_hook(Evas_Object *obj)
 
    // FIXME: hover contents doesnt seem to propagate resizes properly
    _elm_theme_set(wd->cov, "hover", "base", elm_widget_style_get(obj));
-   edje_object_scale_set(wd->cov, elm_widget_scale_get(obj) * 
+   edje_object_scale_set(wd->cov, elm_widget_scale_get(obj) *
                          _elm_config->scale);
    _reval_content(obj);
    _sizing_eval(obj);
@@ -271,7 +271,7 @@ elm_hover_add(Evas_Object *parent)
    wd->cov = edje_object_add(e);
    _elm_theme_set(wd->cov, "hover", "base", "default");
    elm_widget_sub_object_add(obj, wd->cov);
-   edje_object_signal_callback_add(wd->cov, "elm,action,dismiss", "", 
+   edje_object_signal_callback_add(wd->cov, "elm,action,dismiss", "",
                                    _signal_dismiss, obj);
 
    wd->offset = evas_object_rectangle_add(e);
@@ -299,12 +299,12 @@ elm_hover_target_set(Evas_Object *obj, Evas_Object *target)
    Widget_Data *wd = elm_widget_data_get(obj);
 
    if (wd->target)
-     evas_object_event_callback_del(wd->target, EVAS_CALLBACK_DEL, 
+     evas_object_event_callback_del(wd->target, EVAS_CALLBACK_DEL,
                                     _target_del);
    wd->target = target;
    if (wd->target)
      {
-       evas_object_event_callback_add(wd->target, EVAS_CALLBACK_DEL, 
+       evas_object_event_callback_add(wd->target, EVAS_CALLBACK_DEL,
                                        _target_del, obj);
        elm_widget_hover_object_set(target, obj);
        _sizing_eval(obj);
@@ -318,29 +318,29 @@ elm_hover_parent_set(Evas_Object *obj, Evas_Object *parent)
 
    if (wd->parent)
      {
-       evas_object_event_callback_del(wd->parent, EVAS_CALLBACK_MOVE, 
+       evas_object_event_callback_del(wd->parent, EVAS_CALLBACK_MOVE,
                                        _parent_move);
-       evas_object_event_callback_del(wd->parent, EVAS_CALLBACK_RESIZE, 
+       evas_object_event_callback_del(wd->parent, EVAS_CALLBACK_RESIZE,
                                        _parent_resize);
-       evas_object_event_callback_del(wd->parent, EVAS_CALLBACK_SHOW, 
+       evas_object_event_callback_del(wd->parent, EVAS_CALLBACK_SHOW,
                                        _parent_show);
-       evas_object_event_callback_del(wd->parent, EVAS_CALLBACK_HIDE, 
+       evas_object_event_callback_del(wd->parent, EVAS_CALLBACK_HIDE,
                                        _parent_hide);
-       evas_object_event_callback_del(wd->parent, EVAS_CALLBACK_DEL, 
+       evas_object_event_callback_del(wd->parent, EVAS_CALLBACK_DEL,
                                        _parent_del);
      }
    wd->parent = parent;
    if (wd->parent)
      {
-       evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_MOVE, 
+       evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_MOVE,
                                        _parent_move, obj);
-       evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_RESIZE, 
+       evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_RESIZE,
                                        _parent_resize, obj);
-       evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_SHOW, 
+       evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_SHOW,
                                        _parent_show, obj);
-       evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_HIDE, 
+       evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_HIDE,
                                        _parent_hide, obj);
-       evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_DEL, 
+       evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_DEL,
                                        _parent_del, obj);
 //     elm_widget_sub_object_add(parent, obj);
      }
@@ -377,11 +377,11 @@ elm_hover_content_set(Evas_Object *obj, const char *swallow, Evas_Object *conten
      }
 }
 
+/** DEPRECATED. use elm_object_style_set() instead */
 EAPI void
 elm_hover_style_set(Evas_Object *obj, const char *style)
 {
    elm_widget_style_set(obj, style);
-//   Widget_Data *wd = elm_widget_data_get(obj);
 }
 
 EAPI const char *

diff --git a/src/lib/elm_pager.c b/src/lib/elm_pager.c
index 4ec6a61..c31fca7 100644 (file)
--- a/src/lib/elm_pager.c
+++ b/src/lib/elm_pager.c
@@ -367,16 +367,3 @@ elm_pager_content_top_get(Evas_Object *obj)
    return it->content;
 }
 
-/**
- * Set the pager style
- *
- * @param obj The pager object
- * @param style The style will be applied in this pager
- *
- * @ingroup Pager
- */
-EAPI void
-elm_pager_style_set(Evas_Object *obj, const char *style)
-{
-   elm_widget_style_set(obj, style);
-}

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 5bfce7c..be1b4c8 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -874,6 +874,7 @@ elm_win_inwin_add(Evas_Object *obj)
    return obj2;
 }
 
+/** DEPRECATED. use elm_object_style_set() instead */
 EAPI void
 elm_win_inwin_style_set(Evas_Object *obj, const char *style)
 {