diff options
author | Rusty Lynch <rusty.lynch@intel.com> | 2012-12-19 14:47:13 -0800 |
---|---|---|
committer | Rusty Lynch <rusty.lynch@intel.com> | 2012-12-19 14:47:13 -0800 |
commit | 615816f2ddd1309af3d656c48802c79c8848a60c (patch) | |
tree | 01d7f6847e3e50c5d92a4f530b24a53c8ddec626 | |
parent | fa1324367fc9c459632697c64749cc607134274a (diff) | |
download | org.tizen.browser-615816f2ddd1309af3d656c48802c79c8848a60c.tar.gz org.tizen.browser-615816f2ddd1309af3d656c48802c79c8848a60c.tar.bz2 org.tizen.browser-615816f2ddd1309af3d656c48802c79c8848a60c.zip |
Port browser to new elementary 1.7 semantics
-rwxr-xr-x | src/scissorbox/scissorbox.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/scissorbox/scissorbox.cpp b/src/scissorbox/scissorbox.cpp index 83cf20e..b91af41 100755 --- a/src/scissorbox/scissorbox.cpp +++ b/src/scissorbox/scissorbox.cpp @@ -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; |