Port browser to new elementary 1.7 semantics 29/2629/1
authorRusty Lynch <rusty.lynch@intel.com>
Wed, 19 Dec 2012 22:47:13 +0000 (14:47 -0800)
committerRusty Lynch <rusty.lynch@intel.com>
Wed, 19 Dec 2012 22:47:13 +0000 (14:47 -0800)
src/scissorbox/scissorbox.cpp

index 83cf20e..b91af41 100755 (executable)
@@ -562,20 +562,13 @@ _scissorbox_show(void *data, Evas *e, Evas_Object *obj, void *event_info)
 Evas_Object *br_scissorbox_add(Evas_Object *parent)
 {
        Evas_Object *obj;
-       Evas *e;
        Widget_Data *wd;
 
        EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
 
-       e = evas_object_evas_get(parent);
-
-       if (!e) {
-               return NULL;
-       }
-
        wd = (Widget_Data *)ELM_NEW(Widget_Data);
 
-       obj = elm_widget_add(NULL, e);
+       obj = elm_widget_add(NULL, parent);
        elm_widget_type_set(obj, "scissorbox");
        elm_widget_sub_object_add(parent, obj);
        elm_widget_data_set(obj, wd);
@@ -585,7 +578,7 @@ Evas_Object *br_scissorbox_add(Evas_Object *parent)
 
        wd->parent = parent;
        wd->obj = obj;
-       wd->evas = e;
+       wd->evas = evas_object_evas_get(parent);
        wd->pot_w = DEFAULT_MIN_RECT_SIZE;
        wd->pot_h = DEFAULT_MIN_RECT_SIZE;
        wd->event_pot_w = DEFAULT_MIN_EVENT_RECT_SIZE;