fix widgets that were forcing style to be "default".

SVN revision: 50257

diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index a34a872f766c6885cf963f3f62c6dc78b1099d59..ebcfda90b362be1ab33f3c445ff3844e25b9adca 100644 (file)
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -49,7 +49,7 @@ _theme_hook(Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
    if (wd->stdicon)
-     _elm_theme_object_icon_set(obj, wd->img, wd->stdicon, "default");
+     _elm_theme_object_icon_set(obj, wd->img, wd->stdicon, elm_widget_style_get(obj));
    _sizing_eval(obj);
 }
 

diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 83494682ecaa05e61c8abc2573141e7566494709..a1d81a34ac8cdf3ca0dfe41487ff6508da1a6a7a 100644 (file)
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -50,17 +50,18 @@ static void
 _theme_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   const char *style = elm_widget_style_get(obj);
    if (!wd) return;
 
-   if(wd->horizontal)
-       _elm_theme_object_set(obj, wd->panes, "panes", "horizontal", "default");
+   if (wd->horizontal)
+     _elm_theme_object_set(obj, wd->panes, "panes", "horizontal", style);
    else
-       _elm_theme_object_set(obj, wd->panes, "panes", "vertical", "default");
+     _elm_theme_object_set(obj, wd->panes, "panes", "vertical", style);
 
-   if(wd->contents.left)
-       edje_object_part_swallow(wd->panes, "elm.swallow.left", wd->contents.right);
-   if(wd->contents.right)
-       edje_object_part_swallow(wd->panes, "elm.swallow.right", wd->contents.right);
+   if (wd->contents.left)
+     edje_object_part_swallow(wd->panes, "elm.swallow.left", wd->contents.right);
+   if (wd->contents.right)
+     edje_object_part_swallow(wd->panes, "elm.swallow.right", wd->contents.right);
 
    edje_object_scale_set(wd->panes, elm_widget_scale_get(obj) *
                          _elm_config->scale);

diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 7ccaa6440c4be856692b9d0ad29107522cc176fe..7f9d9e5f9da5b60a47538d2c9a557d9b5a60d478 100644 (file)
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -92,7 +92,7 @@ _theme_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   _elm_theme_object_set(obj, wd->slideshow, "slideshow", "base", "default");
+   _elm_theme_object_set(obj, wd->slideshow, "slideshow", "base", elm_widget_style_get(obj));
    edje_object_scale_set(wd->slideshow, elm_widget_scale_get(obj) *
                          _elm_config->scale);
    _sizing_eval(obj);