#include "els_box.h"
#include "els_icon.h"
-/* FIXME: I couldn't find a macro for it, this should be fixed.
- * Just doing this commit to fix the brokeness that was introduced. */
-#define BASE(it) (&(it)->base)
-
typedef struct _Widget_Data Widget_Data;
typedef struct _Elm_Toolbar_Item Elm_Toolbar_Item;
Eina_Bool sel;
if (!wd) return;
- if ((BASE(it)->disabled) || (it->separator)) return;
+ if (elm_widget_item_disabled_get(it) || (it->separator)) return;
sel = it->selected;
if (!wd->no_select)
Widget_Data *wd = elm_widget_data_get(WIDGET(it));
if (!wd) return;
- if (BASE(it)->disabled == disabled) return;
- BASE(it)->disabled = !!disabled;
- if (BASE(it)->disabled)
+ if (elm_widget_item_disabled_get(it) == disabled) return;
+ elm_object_item_disabled_set((Elm_Object_Item *) it, disabled);
+ if (disabled)
{
edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
elm_widget_signal_emit(it->icon, "elm,state,disabled", "elm");
edje_object_signal_emit(view, "elm,state,selected", "elm");
elm_widget_signal_emit(it->icon, "elm,state,selected", "elm");
}
- if (BASE(it)->disabled)
+ if (elm_widget_item_disabled_get(it))
{
edje_object_signal_emit(view, "elm,state,disabled", "elm");
elm_widget_signal_emit(it->icon, "elm,state,disabled", "elm");
menu_it = elm_menu_item_add(menu, NULL,
it->icon_str, it->label,
_elm_toolbar_item_menu_cb, it);
- elm_object_item_disabled_set(menu_it, BASE(it)->disabled);
+ elm_object_item_disabled_set(menu_it,
+ elm_widget_item_disabled_get(it));
if (it->o_menu)
elm_menu_clone(it->o_menu, menu, menu_it);
}
Elm_Toolbar_Item *it = (Elm_Toolbar_Item *)item;
if (it->separator)
return strdup(E_("Separator"));
- else if (BASE(it)->disabled)
+ else if (elm_widget_item_disabled_get(it))
return strdup(E_("State: Disabled"));
else if (it->selected)
return strdup(E_("State: Selected"));
wd->icon_size,
"elm,state,icon_set,backward");
}
- if (BASE(item)->disabled)
+ if (elm_widget_item_disabled_get(item))
elm_widget_signal_emit(item->icon, "elm,state,disabled", "elm");
else
elm_widget_signal_emit(item->icon, "elm,state,enabled", "elm");