diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c
index 230dbe2494..d8072d20b1 100644
--- a/legacy/evas/src/lib/canvas/evas_events.c
+++ b/legacy/evas/src/lib/canvas/evas_events.c
@@ -218,7 +218,7 @@ evas_event_feed_mouse_down(Evas *e, int b, Evas_Button_Flags flags, unsigned int
 	ev.locks = &(e->locks);
 	ev.flags = flags;
 	ev.timestamp = timestamp;
-	if (!e->events_frozen)
+	if (e->events_frozen <= 0)
 	  evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_DOWN, &ev);
      }
    if (copy) copy = evas_list_free(copy);
@@ -265,7 +265,7 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
 	ev.locks = &(e->locks);
 	ev.flags = flags;
 	ev.timestamp = timestamp;
-	if (!e->events_frozen)
+	if (e->events_frozen <= 0)
 	  evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_UP, &ev);
      }
    if (copy) copy = evas_list_free(copy);
@@ -298,7 +298,7 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
 		  ev.modifiers = &(e->modifiers);
 		  ev.locks = &(e->locks);
 		  ev.timestamp = timestamp;
-		  if (!e->events_frozen)
+		  if (e->events_frozen <= 0)
 		    evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
 	       }
 	  }
@@ -325,7 +325,7 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
 		       ev.modifiers = &(e->modifiers);
 		       ev.locks = &(e->locks);
 		       ev.timestamp = timestamp;
-		       if (!e->events_frozen)
+		       if (e->events_frozen <= 0)
 			 evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev);
 		    }
 	       }
@@ -362,25 +362,25 @@ evas_event_feed_mouse_wheel(Evas *e, int direction, int z, unsigned int timestam
    e->last_timestamp = timestamp;
 
    copy = evas_event_list_copy(e->pointer.object.in);
-
+   
    for (l = copy; l; l = l->next)
-   {
-      Evas_Event_Mouse_Wheel ev;
-      Evas_Object *obj = l->data;
-
-      ev.direction = direction;
-      ev.z = z;
-      ev.output.x = e->pointer.x;
-      ev.output.y = e->pointer.y;
-      ev.canvas.x = e->pointer.canvas_x;
-      ev.canvas.y = e->pointer.canvas_y;
-      ev.data = (void *) data;
-      ev.modifiers = &(e->modifiers);
-      ev.locks = &(e->locks);
-      ev.timestamp = timestamp;
-      if (!e->events_frozen)
+     {
+	Evas_Event_Mouse_Wheel ev;
+	Evas_Object *obj = l->data;
+	
+	ev.direction = direction;
+	ev.z = z;
+	ev.output.x = e->pointer.x;
+	ev.output.y = e->pointer.y;
+	ev.canvas.x = e->pointer.canvas_x;
+	ev.canvas.y = e->pointer.canvas_y;
+	ev.data = (void *) data;
+	ev.modifiers = &(e->modifiers);
+	ev.locks = &(e->locks);
+	ev.timestamp = timestamp;
+	if (e->events_frozen <= 0)
 	  evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_WHEEL, &ev);
-   }
+     }
    if (copy) copy = evas_list_free(copy);
 
    return;
@@ -451,7 +451,7 @@ evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const
 		       ev.modifiers = &(e->modifiers);
 		       ev.locks = &(e->locks);
 		       ev.timestamp = timestamp;
-		       if (!e->events_frozen)
+		       if (e->events_frozen <= 0)
 			 evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_MOVE, &ev);
 		    }
 	       }
@@ -481,7 +481,7 @@ evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const
 		       ev.modifiers = &(e->modifiers);
 		       ev.locks = &(e->locks);
 		       ev.timestamp = timestamp;
-		       if (!e->events_frozen)
+		       if (e->events_frozen <= 0)
 			 evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
 		    }
 	       }
@@ -530,7 +530,7 @@ evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const
 		       ev.modifiers = &(e->modifiers);
 		       ev.locks = &(e->locks);
 		       ev.timestamp = timestamp;
-		       if (!e->events_frozen)
+		       if (e->events_frozen <= 0)
 			 evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_MOVE, &ev);
 		    }
 	       }
@@ -549,7 +549,7 @@ evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const
 		  ev.modifiers = &(e->modifiers);
 		  ev.locks = &(e->locks);
 		  ev.timestamp = timestamp;
-		  if (!e->events_frozen)
+		  if (e->events_frozen <= 0)
 		    evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
 	       }
 	  }
@@ -575,7 +575,7 @@ evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const
 		  ev.modifiers = &(e->modifiers);
 		  ev.locks = &(e->locks);
 		  ev.timestamp = timestamp;
-		  if (!e->events_frozen)
+		  if (e->events_frozen <= 0)
 		    evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev);
 	       }
 	  }
@@ -630,7 +630,7 @@ evas_event_feed_mouse_in(Evas *e, unsigned int timestamp, const void *data)
 	     ev.modifiers = &(e->modifiers);
 	     ev.locks = &(e->locks);
 	     ev.timestamp = timestamp;
-	     if (!e->events_frozen)
+	     if (e->events_frozen <= 0)
 	       evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev);
 	  }
      }
@@ -683,7 +683,7 @@ evas_event_feed_mouse_out(Evas *e, unsigned int timestamp, const void *data)
 		  ev.modifiers = &(e->modifiers);
 		  ev.locks = &(e->locks);
 		  ev.timestamp = timestamp;
-		  if (!e->events_frozen)
+		  if (e->events_frozen <= 0)
 		    evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
 	       }
 	  }
@@ -743,7 +743,7 @@ evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const ch
 			 (g->not_modifiers == ~e->modifiers.mask))) &&
 		      (!strcmp(keyname, g->keyname)))
 		    {
-		       if (!e->events_frozen)
+		       if (e->events_frozen <= 0)
 			 evas_object_event_callback_call(g->object, EVAS_CALLBACK_KEY_DOWN, &ev);
 		       if (g->exclusive) exclusive = 1;
 		    }
@@ -770,7 +770,7 @@ evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const ch
 	  }
 	if ((e->focused) && (!exclusive))
 	  {
-	     if (!e->events_frozen)
+	     if (e->events_frozen <= 0)
 	       evas_object_event_callback_call(e->focused, EVAS_CALLBACK_KEY_DOWN, &ev);
 	  }
      }
@@ -826,7 +826,7 @@ evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const char
 			 (g->not_modifiers == ~e->modifiers.mask))) &&
 		      (!strcmp(keyname, g->keyname)))
 		    {
-		       if (!e->events_frozen)
+		       if (e->events_frozen <= 0)
 			 evas_object_event_callback_call(g->object, EVAS_CALLBACK_KEY_UP, &ev);
 		       if (g->exclusive) exclusive = 1;
 		    }
@@ -853,7 +853,7 @@ evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const char
 	  }
 	if ((e->focused) && (!exclusive))
 	  {
-	     if (!e->events_frozen)
+	     if (e->events_frozen <= 0)
 	       evas_object_event_callback_call(e->focused, EVAS_CALLBACK_KEY_UP, &ev);
 	  }
      }
diff --git a/legacy/evas/src/lib/canvas/evas_object_line.c b/legacy/evas/src/lib/canvas/evas_object_line.c
index 3c2e92c165..148c24f994 100644
--- a/legacy/evas/src/lib/canvas/evas_object_line.c
+++ b/legacy/evas/src/lib/canvas/evas_object_line.c
@@ -111,7 +111,7 @@ evas_object_line_xy_set(Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coo
    MAGIC_CHECK_END();
    if ((x1 == o->cur.x1) && (y1 == o->cur.y1) &&
        (x2 == o->cur.x2) && (y2 == o->cur.y2)) return;
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	if (!evas_event_passes_through(obj))
 	  was = evas_object_is_in_output_rect(obj,
@@ -150,7 +150,7 @@ evas_object_line_xy_set(Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coo
    o->changed = 1;
    evas_object_change(obj);
    evas_object_coords_recalc(obj);
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	is = evas_object_is_in_output_rect(obj,
 					   obj->layer->evas->pointer.x,
diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c
index bd0052dbff..097d94e906 100644
--- a/legacy/evas/src/lib/canvas/evas_object_main.c
+++ b/legacy/evas/src/lib/canvas/evas_object_main.c
@@ -467,7 +467,7 @@ evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 	evas_object_inform_call_move(obj);
 	return;
      }
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	pass = evas_event_passes_through(obj);
 	if (pass)
@@ -480,7 +480,7 @@ evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
    obj->cur.cache.geometry.validity = 0;
    evas_object_change(obj);
    evas_object_clip_dirty(obj);
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	evas_object_recalc_clippees(obj);
 	if (!pass)
@@ -531,7 +531,7 @@ evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
 	evas_object_inform_call_resize(obj);
 	return;
      }
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	pass = evas_event_passes_through(obj);
 	if (!pass)
@@ -545,7 +545,7 @@ evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
    evas_object_change(obj);
    evas_object_clip_dirty(obj);
    evas_object_recalc_clippees(obj);
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	//   if (obj->func->coords_recalc) obj->func->coords_recalc(obj);
 	if (!pass)
@@ -634,7 +634,7 @@ evas_object_show(Evas_Object *obj)
    obj->cur.visible = 1;
    evas_object_change(obj);
    evas_object_clip_dirty(obj);
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	evas_object_recalc_clippees(obj);
 	if (!evas_event_passes_through(obj))
@@ -681,7 +681,7 @@ evas_object_hide(Evas_Object *obj)
    obj->cur.visible = 0;
    evas_object_change(obj);
    evas_object_clip_dirty(obj);
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	evas_object_recalc_clippees(obj);
 	if (!evas_event_passes_through(obj))
diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c
index f6cac9cbfb..9608ae9f0f 100644
--- a/legacy/evas/src/lib/canvas/evas_object_text.c
+++ b/legacy/evas/src/lib/canvas/evas_object_text.c
@@ -152,7 +152,7 @@ evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size siz
 	same_font = 1;
 	if (size == o->cur.size) return;
      }
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	pass = evas_event_passes_through(obj);
 	if (!pass)
@@ -222,7 +222,7 @@ evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size siz
    o->changed = 1;
    evas_object_change(obj);
    evas_object_coords_recalc(obj);
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	if (!pass)
 	  {
diff --git a/legacy/evas/src/lib/canvas/evas_stack.c b/legacy/evas/src/lib/canvas/evas_stack.c
index 158ba66b6c..22e916d136 100644
--- a/legacy/evas/src/lib/canvas/evas_stack.c
+++ b/legacy/evas/src/lib/canvas/evas_stack.c
@@ -72,7 +72,7 @@ evas_object_raise(Evas_Object *obj)
      }
    obj->restack = 1;
    evas_object_change(obj);
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	if (!evas_event_passes_through(obj))
 	  {
@@ -125,7 +125,7 @@ evas_object_lower(Evas_Object *obj)
      }
    obj->restack = 1;
    evas_object_change(obj);
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	if (!evas_event_passes_through(obj))
 	  {
@@ -191,7 +191,7 @@ evas_object_stack_above(Evas_Object *obj, Evas_Object *above)
      }
    obj->restack = 1;
    evas_object_change(obj);
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	if (!evas_event_passes_through(obj))
 	  {
@@ -257,7 +257,7 @@ evas_object_stack_below(Evas_Object *obj, Evas_Object *below)
      }
    obj->restack = 1;
    evas_object_change(obj);
-   if (obj->layer->evas->events_frozen != 0)
+   if (obj->layer->evas->events_frozen <= 0)
      {
 	if (!evas_event_passes_through(obj))
 	  {