davemds pushed a commit to branch master.

http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=458121f6be1c6b9b911c8f65fdc728ecc623e71d

commit 458121f6be1c6b9b911c8f65fdc728ecc623e71d
Author: Dave Andreoli <d...@gurumeditation.it>
Date:   Sun Jan 10 13:09:19 2016 +0100

    Moved (un)focused and language,changed events down to Object.
    
    There is no need to replicate this events in every widget, they belong to 
Object
---
 doc/elementary/bubble.rst              |  2 --
 doc/elementary/button.rst              |  2 --
 doc/elementary/calendar.rst            |  2 --
 doc/elementary/check.rst               |  2 --
 doc/elementary/clock.rst               |  2 --
 doc/elementary/colorselector.rst       |  2 --
 doc/elementary/ctxpopup.rst            |  4 ---
 doc/elementary/datetime.rst            |  3 ---
 doc/elementary/dayselector.rst         |  1 -
 doc/elementary/diskselector.rst        |  2 --
 doc/elementary/entry.rst               |  3 ---
 doc/elementary/fileselector_button.rst |  1 -
 doc/elementary/fileselector_entry.rst  |  3 ---
 doc/elementary/flipselector.rst        |  2 --
 doc/elementary/gengrid.rst             |  5 ----
 doc/elementary/genlist.rst             |  2 --
 doc/elementary/hover.rst               |  2 --
 doc/elementary/index.rst               |  3 ---
 doc/elementary/label.rst               |  1 -
 doc/elementary/layout.rst              |  1 -
 doc/elementary/list.rst                |  3 ---
 doc/elementary/map.rst                 |  3 ---
 doc/elementary/multibuttonentry.rst    |  3 +--
 doc/elementary/naviframe.rst           |  2 --
 doc/elementary/object.rst              |  9 +++++++
 doc/elementary/panel.rst               |  6 -----
 doc/elementary/photocam.rst            |  2 --
 doc/elementary/popup.rst               |  3 ---
 doc/elementary/progressbar.rst         |  3 +--
 doc/elementary/radio.rst               |  2 --
 doc/elementary/scroller.rst            |  2 --
 doc/elementary/slider.rst              |  2 --
 doc/elementary/slideshow.rst           |  2 --
 doc/elementary/spinner.rst             |  3 ---
 doc/elementary/toolbar.rst             |  3 ---
 doc/elementary/video.rst               |  6 -----
 doc/elementary/web.rst                 |  2 --
 doc/elementary/window.rst              |  2 --
 efl/elementary/bubble.pxi              | 21 ---------------
 efl/elementary/button.pxi              | 21 ---------------
 efl/elementary/calendar.pxi            | 19 --------------
 efl/elementary/check.pxi               | 19 --------------
 efl/elementary/clock.pxi               | 19 --------------
 efl/elementary/colorselector.pxi       | 19 --------------
 efl/elementary/ctxpopup.pxi            | 26 ------------------
 efl/elementary/datetime.pxi            | 31 ----------------------
 efl/elementary/dayselector.pxi         |  7 -----
 efl/elementary/diskselector.pxi        | 20 --------------
 efl/elementary/entry.pxi               | 21 ---------------
 efl/elementary/fileselector_button.pxi | 10 -------
 efl/elementary/fileselector_entry.pxi  | 24 -----------------
 efl/elementary/flipselector.pxi        | 19 --------------
 efl/elementary/gengrid_widget.pxi      | 26 ------------------
 efl/elementary/genlist_widget.pxi      | 26 ------------------
 efl/elementary/glview.pyx              | 27 -------------------
 efl/elementary/hover.pxi               | 20 --------------
 efl/elementary/index.pxi               | 26 ------------------
 efl/elementary/label.pxi               |  7 -----
 efl/elementary/layout.pxi              |  6 -----
 efl/elementary/list.pxi                | 34 ------------------------
 efl/elementary/map.pxi                 | 28 --------------------
 efl/elementary/multibuttonentry.pxi    | 12 ---------
 efl/elementary/naviframe.pxi           | 19 --------------
 efl/elementary/object.pxi              | 48 ++++++++++++++++++++++++++++++++++
 efl/elementary/panel.pxi               | 19 --------------
 efl/elementary/photocam.pxi            | 19 --------------
 efl/elementary/popup.pxi               | 30 ---------------------
 efl/elementary/progressbar.pxi         | 19 --------------
 efl/elementary/radio.pxi               | 19 --------------
 efl/elementary/scroller.pxi            | 21 ---------------
 efl/elementary/slider.pxi              | 19 --------------
 efl/elementary/slideshow.pxi           | 19 --------------
 efl/elementary/spinner.pxi             | 26 ------------------
 efl/elementary/toolbar.pxi             | 27 -------------------
 efl/elementary/video.pxi               | 38 ---------------------------
 efl/elementary/web.pxi                 | 21 ---------------
 efl/elementary/window.pxi              | 20 --------------
 examples/elementary/test_focus.py      | 25 ++++++++++++++----
 78 files changed, 79 insertions(+), 901 deletions(-)

diff --git a/doc/elementary/bubble.rst b/doc/elementary/bubble.rst
index d66826a..dcc1650 100644
--- a/doc/elementary/bubble.rst
+++ b/doc/elementary/bubble.rst
@@ -50,8 +50,6 @@ Emitted signals
 ===============
 
 - ``clicked`` - This is called when a user has clicked the bubble.
-- ``focused`` - When the bubble has received focus. (since 1.8)
-- ``unfocused`` - When the bubble has lost focus. (since 1.8)
 
 
 Enumerations
diff --git a/doc/elementary/button.rst b/doc/elementary/button.rst
index becdc6b..29515d4 100644
--- a/doc/elementary/button.rst
+++ b/doc/elementary/button.rst
@@ -50,8 +50,6 @@ Emitted signals
 - ``repeated``: the user pressed the button without releasing it.
 - ``pressed``: button was pressed.
 - ``unpressed``: button was released after being pressed.
-- ``focused`` : When the button has received focus. (since 1.8)
-- ``unfocused`` : When the button has lost focus. (since 1.8)
 
 
 Inheritance diagram
diff --git a/doc/elementary/calendar.rst b/doc/elementary/calendar.rst
index 5278f3d..384bcd9 100644
--- a/doc/elementary/calendar.rst
+++ b/doc/elementary/calendar.rst
@@ -28,8 +28,6 @@ Emitted signals
 - ``changed`` - emitted when the date in the calendar is changed.
 - ``display,changed`` - emitted when the current month displayed in the
   calendar is changed.
-- ``focused`` - When the calendar has received focus. (since 1.8)
-- ``unfocused`` - When the calendar has lost focus. (since 1.8)
 
 
 Enumerations
diff --git a/doc/elementary/check.rst b/doc/elementary/check.rst
index 62a714a..e0fb3fc 100644
--- a/doc/elementary/check.rst
+++ b/doc/elementary/check.rst
@@ -21,8 +21,6 @@ Emitted signals
 
 - ``changed`` - This is called whenever the user changes the state of
   the check objects.
-- ``focused`` - When the check has received focus. (since 1.8)
-- ``unfocused`` - When the check has lost focus. (since 1.8)
 
 
 Layout content parts
diff --git a/doc/elementary/clock.rst b/doc/elementary/clock.rst
index d0a896a..f07c5cc 100644
--- a/doc/elementary/clock.rst
+++ b/doc/elementary/clock.rst
@@ -39,8 +39,6 @@ Emitted signals
 ===============
 
 - ``changed`` - the clock's user changed the time
-- ``focused`` - When the clock has received focus. (since 1.8)
-- ``unfocused`` - When the clock has lost focus. (since 1.8)
 
 
 Enumerations
diff --git a/doc/elementary/colorselector.rst b/doc/elementary/colorselector.rst
index b79c393..1084c82 100644
--- a/doc/elementary/colorselector.rst
+++ b/doc/elementary/colorselector.rst
@@ -28,8 +28,6 @@ Emitted signals
 - ``"color,item,longpressed"`` - When user long presses on color item.
     The event_info parameter of the callback will be the selected
     color item.
-- ``focused`` - When the colorselector has received focus. (since 1.8)
-- ``unfocused`` - When the colorselector has lost focus. (since 1.8)
 
 
 Enumerations
diff --git a/doc/elementary/ctxpopup.rst b/doc/elementary/ctxpopup.rst
index a9dc880..e63e634 100644
--- a/doc/elementary/ctxpopup.rst
+++ b/doc/elementary/ctxpopup.rst
@@ -27,10 +27,6 @@ Emitted signals
   or 2. its parent area is changed or 3. the language is changed and also when
   4. the parent object is resized due to the window rotation. Then ctxpopup is
   dismissed.
-- ``language,changed`` - This is called when the program's language is
-  changed.
-- ``focused`` - When the ctxpopup has received focus. (since 1.8)
-- ``unfocused`` - When the ctxpopup has lost focus. (since 1.8)
 
 Layout content parts
 ====================
diff --git a/doc/elementary/datetime.rst b/doc/elementary/datetime.rst
index c271396..19d6fd9 100644
--- a/doc/elementary/datetime.rst
+++ b/doc/elementary/datetime.rst
@@ -172,9 +172,6 @@ Emitted signals
 ===============
 
 - ``changed`` - whenever Datetime field value is changed, this signal is sent.
-- ``language,changed`` - whenever system locale changes, this signal is sent.
-- ``focused`` - When the datetime has received focus. (since 1.8)
-- ``unfocused`` - When the datetime has lost focus. (since 1.8)
 
 
 Enumerations
diff --git a/doc/elementary/dayselector.rst b/doc/elementary/dayselector.rst
index 7eb0ac8..35889ea 100644
--- a/doc/elementary/dayselector.rst
+++ b/doc/elementary/dayselector.rst
@@ -50,7 +50,6 @@ Emitted signals
 ===============
 
 - ``dayselector,changed`` - when the user changes the state of a day.
-- ``language,changed`` - the program's language changed
 
 
 Enumerations
diff --git a/doc/elementary/diskselector.rst b/doc/elementary/diskselector.rst
index 76ec557..9c78058 100644
--- a/doc/elementary/diskselector.rst
+++ b/doc/elementary/diskselector.rst
@@ -26,8 +26,6 @@ Emitted signals
 - ``scroll,anim,stop`` - scrolling animation has stopped
 - ``scroll,drag,start`` - dragging the diskselector has started
 - ``scroll,drag,stop`` - dragging the diskselector has stopped
-- ``focused`` - When the diskselector has received focus. (since 1.8)
-- ``unfocused`` - When the diskselector has lost focus. (since 1.8)
 
 .. note:: The ``scroll,anim,*`` and ``scroll,drag,*`` signals are only emitted
           by user intervention.
diff --git a/doc/elementary/entry.rst b/doc/elementary/entry.rst
index f25708f..d6bf40a 100644
--- a/doc/elementary/entry.rst
+++ b/doc/elementary/entry.rst
@@ -223,8 +223,6 @@ Emitted signals
 - ``clicked``: The entry has been clicked (mouse press and release).
 - ``clicked,double``: The entry has been double clicked.
 - ``clicked,triple``: The entry has been triple clicked.
-- ``focused``: The entry has received focus.
-- ``unfocused``: The entry has lost focus.
 - ``selection,paste``: A paste of the clipboard contents was requested.
 - ``selection,copy``: A copy of the selected text into the clipboard was
   requested.
@@ -246,7 +244,6 @@ Emitted signals
 - ``anchor,down``: Mouse button has been pressed on an anchor. The event_info
   parameter for the callback will be an :py:class:`EntryAnchorInfo`.
 - ``preedit,changed``: The preedit string has changed.
-- ``language,changed``: Program language changed.
 - ``text,set,done``: Whole text has been set to the entry.
 - ``rejected``: .Called when some of inputs are rejected by the filter. (since 
1.9)
 
diff --git a/doc/elementary/fileselector_button.rst 
b/doc/elementary/fileselector_button.rst
index fd06331..b86b3d5 100644
--- a/doc/elementary/fileselector_button.rst
+++ b/doc/elementary/fileselector_button.rst
@@ -35,7 +35,6 @@ Emitted signals
 
 - ``file,chosen`` - the user has selected a path which comes as the
   ``event_info`` data
-- ``language,changed`` - the program's language changed
 
 
 Layout text parts
diff --git a/doc/elementary/fileselector_entry.rst 
b/doc/elementary/fileselector_entry.rst
index b916ab4..9c33cc6 100644
--- a/doc/elementary/fileselector_entry.rst
+++ b/doc/elementary/fileselector_entry.rst
@@ -39,8 +39,6 @@ Emitted signals
   couple seconds
 - ``clicked`` - The entry has been clicked
 - ``clicked,double`` - The entry has been double clicked
-- ``focused`` - The entry has received focus
-- ``unfocused`` - The entry has lost focus
 - ``selection,paste`` - A paste action has occurred on the
   entry
 - ``selection,copy`` - A copy action has occurred on the entry
@@ -50,7 +48,6 @@ Emitted signals
 - ``file,chosen`` - The user has selected a path via the file
   selector entry's internal file selector, whose string
   comes as the ``event_info`` data.
-- ``language,changed`` - the program's language changed
 
 
 Layout text parts
diff --git a/doc/elementary/flipselector.rst b/doc/elementary/flipselector.rst
index aa4e4af..cb9b583 100644
--- a/doc/elementary/flipselector.rst
+++ b/doc/elementary/flipselector.rst
@@ -29,8 +29,6 @@ Emitted signals
   from the first item in its list to the last
 - ``underflowed`` - when the widget's current selection is changed
   from the last item in its list to the first
-- ``focused`` - When the flipselector has received focus. (since 1.8)
-- ``unfocused`` - When the flipselector has lost focus. (since 1.8)
 
 
 Layout text parts
diff --git a/doc/elementary/gengrid.rst b/doc/elementary/gengrid.rst
index 294fb9b..9527361 100644
--- a/doc/elementary/gengrid.rst
+++ b/doc/elementary/gengrid.rst
@@ -233,11 +233,6 @@ Emitted signals
   when the user releases an item or keyboard selection is moved so the item
   is physically unhighlighted. The ``event_info`` parameter is the item that
   was unhighlighted.
-- ``language,changed`` - This is called when the program's language is
-  changed. Call :meth:`~Gengrid.realized_items_update` if items text should
-  be translated.
-- ``focused`` - When the gengrid has received focus. (since 1.8)
-- ``unfocused`` - When the gengrid has lost focus. (since 1.8)
 - ``item,focused`` - When the gengrid item has received focus. (since 1.10)
 - ``item,unfocused`` - When the gengrid item has lost focus. (since 1.10)
 - ``item,reorder,anim,start`` - This is called when a gengrid item movement
diff --git a/doc/elementary/genlist.rst b/doc/elementary/genlist.rst
index 5f28fe4..e6cb8d0 100644
--- a/doc/elementary/genlist.rst
+++ b/doc/elementary/genlist.rst
@@ -344,8 +344,6 @@ Emitted signals
   when the user releases an item or keyboard selection is moved so the item
   is physically unhighlighted. The ``event_info`` parameter is the item that
   was unhighlighted.
-- ``focused`` - When the genlist has received focus. (since 1.8)
-- ``unfocused`` - When the genlist has lost focus. (since 1.8)
 - ``item,focused`` - When the genlist item has received focus. (since 1.10)
 - ``item,unfocused`` - When the genlist item has lost focus. (since 1.10)
 - ``changed`` - Genlist is now changed their items and properties and all
diff --git a/doc/elementary/hover.rst b/doc/elementary/hover.rst
index 136fdce..8cfae13 100644
--- a/doc/elementary/hover.rst
+++ b/doc/elementary/hover.rst
@@ -39,8 +39,6 @@ Emitted signals
   (since 1.8)
 - ``smart,changed`` - a content object placed under the "smart"
   policy was replaced to a new slot direction.
-- ``focused`` - When the hover has received focus. (since 1.8)
-- ``unfocused`` - When the hover has lost focus. (since 1.8)
 
 
 Layout content parts
diff --git a/doc/elementary/index.rst b/doc/elementary/index.rst
index 79dbf0d..6761b46 100644
--- a/doc/elementary/index.rst
+++ b/doc/elementary/index.rst
@@ -42,9 +42,6 @@ Emitted signals
   level to the second level
 - ``level,down`` - when the user moves a finger from the second
   level to the first level
-- ``language,changed`` - the program's language changed
-- ``focused`` - When the index has received focus. (since 1.8)
-- ``unfocused`` - When the index has lost focus. (since 1.8)
 
 The ``delay,changed`` event has a delay on change before the event is actually
 reported and moreover just the last event happening on those time frames will
diff --git a/doc/elementary/label.rst b/doc/elementary/label.rst
index dfd17d3..13f0fe7 100644
--- a/doc/elementary/label.rst
+++ b/doc/elementary/label.rst
@@ -43,7 +43,6 @@ they like.
 Emitted signals
 ===============
 
-- ``language,changed`` - The program's language changed.
 - ``slide,end`` - The slide is end.
 
 
diff --git a/doc/elementary/layout.rst b/doc/elementary/layout.rst
index 6acf0d6..f227593 100644
--- a/doc/elementary/layout.rst
+++ b/doc/elementary/layout.rst
@@ -151,7 +151,6 @@ Emitted signals
 ===============
 
 - ``theme,changed`` - The theme was changed.
-- ``language,changed`` - the program's language changed
 
 
 Inheritance diagram
diff --git a/doc/elementary/list.rst b/doc/elementary/list.rst
index 01b29f1..cada62e 100644
--- a/doc/elementary/list.rst
+++ b/doc/elementary/list.rst
@@ -38,9 +38,6 @@ Emitted signals
 - ``unhighlighted`` - an item in the list is unhighlighted. This is called
   when the user releases an item or keyboard selection is moved so the item
   is physically unhighlighted.
-- ``language,changed`` - the program's language changed
-- ``focused`` - When the list has received focus. (since 1.8)
-- ``unfocused`` - When the list has lost focus. (since 1.8)
 - ``item,focused`` - When the list item has received focus. (since 1.10)
 - ``item,unfocused`` - When the list item has lost focus. (since 1.10)
 
diff --git a/doc/elementary/map.rst b/doc/elementary/map.rst
index 263d65c..53cb107 100644
--- a/doc/elementary/map.rst
+++ b/doc/elementary/map.rst
@@ -52,9 +52,6 @@ Emitted signals
 - ``name,loaded,fail`` - Name request fails.
 - ``overlay,clicked`` - A overlay is clicked.
 - ``loaded`` - when a map is finally loaded.
-- ``language,changed`` - the program's language changed
-- ``focused`` - When the map has received focus. (since 1.8)
-- ``unfocused`` - When the map has lost focus. (since 1.8)
 
 
 Scrollable Interface
diff --git a/doc/elementary/multibuttonentry.rst 
b/doc/elementary/multibuttonentry.rst
index 30b4b88..d60b10c 100644
--- a/doc/elementary/multibuttonentry.rst
+++ b/doc/elementary/multibuttonentry.rst
@@ -36,13 +36,12 @@ Emitted signals
   interaction. Both "item,selected" and "item,clicked" are needed.
   event_info contains the item.
 - ``clicked`` - when multi-button entry is clicked.
-- ``focused`` - when multi-button entry is focused.
-- ``unfocused`` - when multi-button entry is unfocused.
 - ``expanded`` - when multi-button entry is expanded.
 - ``contracted`` - when multi-button entry is contracted.
 - ``expand,state,changed`` - when shrink mode state of
   multi-button entry is changed.
 
+
 Layout text parts
 =================
 
diff --git a/doc/elementary/naviframe.rst b/doc/elementary/naviframe.rst
index c1dfc3f..8292caa 100644
--- a/doc/elementary/naviframe.rst
+++ b/doc/elementary/naviframe.rst
@@ -65,8 +65,6 @@ Emitted signals
 - ``transition,finished`` - When the transition is finished in changing the 
item
 - ``title,transition,finished`` -  When the title area's transition is finished
 - ``title,clicked`` - User clicked title area
-- ``focused`` - When the naviframe has received focus. (since 1.8)
-- ``unfocused`` - When the naviframe has lost focus. (since 1.8)
 
 All the parts, for content and text, described here will also be
 reachable by naviframe **items** direct calls:
diff --git a/doc/elementary/object.rst b/doc/elementary/object.rst
index c784354..df0bd3c 100644
--- a/doc/elementary/object.rst
+++ b/doc/elementary/object.rst
@@ -47,6 +47,15 @@ More information is on
  - X11R6 Inter-Client Communication Conventions Manual, section 2
 
 
+Emitted smart events
+====================
+
+- ``moved`` - When the object change position. (since 1.17)
+- ``focus`` - When the object has received focus. (since 1.8)
+- ``unfocus`` - When the object has lost focus. (since 1.8)
+- ``language,changed`` - Whenever system locale changes.
+
+
 Enumerations
 ============
 
diff --git a/doc/elementary/panel.rst b/doc/elementary/panel.rst
index 8c2be7a..3c2da1e 100644
--- a/doc/elementary/panel.rst
+++ b/doc/elementary/panel.rst
@@ -14,12 +14,6 @@ A panel is a type of animated container that contains 
subobjects.
 It can be expanded or contracted by clicking the button on it's edge.
 
 
-Emitted signals
-===============
-
-- ``focused`` - When the panel has received focus. (since 1.8)
-- ``unfocused`` - When the panel has lost focus. (since 1.8)
-
 
 Layout content parts
 ====================
diff --git a/doc/elementary/photocam.rst b/doc/elementary/photocam.rst
index 37d6e2e..b024155 100644
--- a/doc/elementary/photocam.rst
+++ b/doc/elementary/photocam.rst
@@ -41,8 +41,6 @@ Emitted signals
 - ``download,progress`` - url download in progress
 - ``download,end`` - remote url download has finished
 - ``download,error`` - remote url download has finished with errors
-- ``focused`` - When the photocam has received focus. (since 1.8)
-- ``unfocused`` - When the photocam has lost focus. (since 1.8)
 
 
 Scrollable Interface
diff --git a/doc/elementary/popup.rst b/doc/elementary/popup.rst
index e821740..2747c63 100644
--- a/doc/elementary/popup.rst
+++ b/doc/elementary/popup.rst
@@ -69,9 +69,6 @@ Emitted signals
 
 - ``timeout`` - when ever popup is closed as a result of timeout.
 - ``block,clicked`` - when ever user taps on Blocked Event area.
-- ``focused`` - When the popup has received focus. (since 1.8)
-- ``unfocused`` - When the popup has lost focus. (since 1.8)
-- ``language,changed`` - the program's language changed (since 1.8)
 - ``item,focused`` - the popup item has received focus. (since 1.10)
 - ``item,unfocused`` - the popup item has lost focus. (since 1.10)
 
diff --git a/doc/elementary/progressbar.rst b/doc/elementary/progressbar.rst
index dff5271..16d50cd 100644
--- a/doc/elementary/progressbar.rst
+++ b/doc/elementary/progressbar.rst
@@ -34,8 +34,7 @@ This widget emits the following signals, besides the ones 
sent from
 :py:class:`~efl.elementary.layout_class.LayoutClass`:
 
 - ``changed`` - when the value is changed
-- ``focused`` - When the progressbar has received focus. (since 1.8)
-- ``unfocused`` - When the progressbar has lost focus. (since 1.8)
+
 
 This widget has the following styles:
 
diff --git a/doc/elementary/radio.rst b/doc/elementary/radio.rst
index 853a58e..aae8bf2 100644
--- a/doc/elementary/radio.rst
+++ b/doc/elementary/radio.rst
@@ -37,8 +37,6 @@ Emitted signals
 
 - ``changed`` - This is called whenever the user changes the state of one of
     the radio objects within the group of radio objects that work together.
-- ``focused`` - When the radio has received focus. (since 1.8)
-- ``unfocused`` - When the radio has lost focus. (since 1.8)
 
 
 Layout text parts
diff --git a/doc/elementary/scroller.rst b/doc/elementary/scroller.rst
index b7fdafb..43e0755 100644
--- a/doc/elementary/scroller.rst
+++ b/doc/elementary/scroller.rst
@@ -50,8 +50,6 @@ Emitted signals
 - ``hbar,press`` - the horizontal scroll bar has been pressed
 - ``hbar,unpress`` - the horizontal scroll bar has been unpressed
 - ``scroll,page,changed`` - the visible page has changed
-- ``focused`` - When the scroller has received focus. (since 1.8)
-- ``unfocused`` - When the scroller has lost focus. (since 1.8)
 
 .. note:: The "scroll,anim,*" and "scroll,drag,*" signals are only emitted by
     user intervention.
diff --git a/doc/elementary/slider.rst b/doc/elementary/slider.rst
index 678f21c..01e4000 100644
--- a/doc/elementary/slider.rst
+++ b/doc/elementary/slider.rst
@@ -43,8 +43,6 @@ Emitted signals
   the user. This will be called only when the user stops dragging
   for a very short period or when they release their finger/mouse,
   so it avoids possibly expensive reactions to the value change.
-- ``focused`` - When the slider has received focus. (since 1.8)
-- ``unfocused`` - When the slider has lost focus. (since 1.8)
 
 
 Layout content parts
diff --git a/doc/elementary/slideshow.rst b/doc/elementary/slideshow.rst
index 39b9a02..fa135a8 100644
--- a/doc/elementary/slideshow.rst
+++ b/doc/elementary/slideshow.rst
@@ -60,8 +60,6 @@ Emitted signals
   event_info parameter in callback contains the current visible item
 - ``transition,end`` - when a slide transition ends. event_info
   parameter in callback contains the current visible item
-- ``focused`` - When the slideshow has received focus. (since 1.8)
-- ``unfocused`` - When the slideshow has lost focus. (since 1.8)
 
 
 Inheritance diagram
diff --git a/doc/elementary/spinner.rst b/doc/elementary/spinner.rst
index b805974..547260c 100644
--- a/doc/elementary/spinner.rst
+++ b/doc/elementary/spinner.rst
@@ -31,9 +31,6 @@ Emitted signals
   the user.  This will be called only when the user stops dragging
   for a very short period or when they release their finger/mouse,
   so it avoids possibly expensive reactions to the value change.
-- ``language,changed`` - the program's language changed
-- ``focused`` - When the spinner has received focus. (since 1.8)
-- ``unfocused`` - When the spinner has lost focus. (since 1.8)
 
 
 Available styles
diff --git a/doc/elementary/toolbar.rst b/doc/elementary/toolbar.rst
index 1dfcd0d..a025273 100644
--- a/doc/elementary/toolbar.rst
+++ b/doc/elementary/toolbar.rst
@@ -23,9 +23,6 @@ Emitted signals
 
 - ``clicked`` - when the user clicks on a toolbar item and becomes selected.
 - ``longpressed`` - when the toolbar is pressed for a certain amount of time.
-- ``language,changed`` - when the program language changes.
-- ``focused`` - When the toolbar has received focus. (since 1.8)
-- ``unfocused`` - When the toolbar has lost focus. (since 1.8)
 - ``item,focused`` - When the toolbar item has received focus. (since 1.10)
 - ``item,unfocused`` - When the toolbar item has lost focus. (since 1.10)
 
diff --git a/doc/elementary/video.rst b/doc/elementary/video.rst
index bfaa31f..3b07a0a 100644
--- a/doc/elementary/video.rst
+++ b/doc/elementary/video.rst
@@ -13,12 +13,6 @@ It embeds the video inside an Edje object, so you can do some
 animation depending on the video state change. It also implements a
 resource management policy to remove this burden from the application.
 
-These widgets emit the following signals, besides the ones sent from
-:py:class:`~efl.elementary.layout_class.LayoutClass`:
-
-- ``focused`` - When the widget has received focus. (since 1.8)
-- ``unfocused`` - When the widget has lost focus. (since 1.8)
-
 
 Inheritance diagram
 ===================
diff --git a/doc/elementary/web.rst b/doc/elementary/web.rst
index b909541..4a84647 100644
--- a/doc/elementary/web.rst
+++ b/doc/elementary/web.rst
@@ -76,8 +76,6 @@ Emitted signals
 - ``windows,close,request``: A JavaScript request to close the current
   window was requested
 - ``zoom,animated,end``: Animated zoom finished
-- ``focused`` : When the web has received focus. (since 1.8)
-- ``unfocused`` : When the web has lost focus. (since 1.8)
 
 
 Enumerations
diff --git a/doc/elementary/window.rst b/doc/elementary/window.rst
index 1728fb4..b97c0c0 100644
--- a/doc/elementary/window.rst
+++ b/doc/elementary/window.rst
@@ -95,8 +95,6 @@ Emitted signals
 - ``indicator,prop,changed``: an indicator's property has been changed
 - ``rotation,changed``: window rotation has been changed
 - ``profile,changed``: profile of the window has been changed
-- ``focused`` - When the window has received focus. (since 1.8)
-- ``unfocused`` - When the window has lost focus. (since 1.8)
 - ``theme,changed`` - The theme was changed. (since 1.13)
 
 
diff --git a/efl/elementary/bubble.pxi b/efl/elementary/bubble.pxi
index e8662e8..a7cd27d 100644
--- a/efl/elementary/bubble.pxi
+++ b/efl/elementary/bubble.pxi
@@ -65,26 +65,5 @@ cdef class Bubble(LayoutClass):
     def callback_clicked_del(self, func):
         self._callback_del("clicked", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the bubble has received focus.
-
-        .. versionadded:: 1.8
-
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the bubble has lost focus.
-
-        .. versionadded:: 1.8
-
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Bubble", Bubble)
diff --git a/efl/elementary/button.pxi b/efl/elementary/button.pxi
index 67955cc..9abb7c9 100644
--- a/efl/elementary/button.pxi
+++ b/efl/elementary/button.pxi
@@ -134,26 +134,5 @@ cdef class Button(LayoutClass):
     def callback_unpressed_del(self, func):
         self._callback_del("unpressed", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the button has received focus.
-
-        .. versionadded:: 1.8
-
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the button has lost focus.
-
-        .. versionadded:: 1.8
-
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Button", Button)
diff --git a/efl/elementary/calendar.pxi b/efl/elementary/calendar.pxi
index 6df7765..a26bfd1 100644
--- a/efl/elementary/calendar.pxi
+++ b/efl/elementary/calendar.pxi
@@ -390,24 +390,5 @@ cdef class Calendar(LayoutClass):
     def callback_changed_del(self, func):
         self._callback_del("display,changed", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the calendar has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the calendar has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Calendar", Calendar)
diff --git a/efl/elementary/check.pxi b/efl/elementary/check.pxi
index 3a77f2f..353b2f3 100644
--- a/efl/elementary/check.pxi
+++ b/efl/elementary/check.pxi
@@ -64,24 +64,5 @@ cdef class Check(LayoutClass):
     def callback_changed_del(self, func):
         self._callback_del("changed", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the check has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the check has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Check", Check)
diff --git a/efl/elementary/clock.pxi b/efl/elementary/clock.pxi
index 6fa5ca8..d624e68 100644
--- a/efl/elementary/clock.pxi
+++ b/efl/elementary/clock.pxi
@@ -220,24 +220,5 @@ cdef class Clock(LayoutClass):
     def callback_changed_del(self, func):
         self._callback_del("changed", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the clock has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the clock has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Clock", Clock)
diff --git a/efl/elementary/colorselector.pxi b/efl/elementary/colorselector.pxi
index ecbc2cc..e9c8f83 100644
--- a/efl/elementary/colorselector.pxi
+++ b/efl/elementary/colorselector.pxi
@@ -279,24 +279,5 @@ cdef class Colorselector(LayoutClass):
         self._callback_del_full("color,item,longpressed",
                                 _cb_object_item_conv, func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the check has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the check has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Colorselector", Colorselector)
diff --git a/efl/elementary/ctxpopup.pxi b/efl/elementary/ctxpopup.pxi
index 51d5768..857fa97 100644
--- a/efl/elementary/ctxpopup.pxi
+++ b/efl/elementary/ctxpopup.pxi
@@ -395,31 +395,5 @@ cdef class Ctxpopup(LayoutClass):
     def callback_dismissed_del(self, func):
         self._callback_del("dismissed", func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """This is called when the program's language is changed."""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
-
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the ctxpopup has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the ctxpopup has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Ctxpopup", Ctxpopup)
diff --git a/efl/elementary/datetime.pxi b/efl/elementary/datetime.pxi
index 0fab64b..768c3de 100644
--- a/efl/elementary/datetime.pxi
+++ b/efl/elementary/datetime.pxi
@@ -346,36 +346,5 @@ cdef class Datetime(Object):
     def callback_changed_del(self, func):
         self._callback_del("changed", func)
 
-    @DEPRECATED("1.10", "Use callback_language_changed_add instead.")
-    def callback_languge_changed_add(self, func, *args, **kwargs):
-        """Whenever system locale changes, this signal is sent."""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """Whenever system locale changes, this signal is sent."""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
-
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the datetime has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the datetime has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Datetime", Datetime)
diff --git a/efl/elementary/dayselector.pxi b/efl/elementary/dayselector.pxi
index 420025c..4821283 100644
--- a/efl/elementary/dayselector.pxi
+++ b/efl/elementary/dayselector.pxi
@@ -133,12 +133,5 @@ cdef class Dayselector(LayoutClass):
     def callback_dayselector_changed_del(self, func):
         self._callback_del("dayselector,changed", func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """the program's language changed"""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
-
 
 _object_mapping_register("Elm_Dayselector", Dayselector)
diff --git a/efl/elementary/diskselector.pxi b/efl/elementary/diskselector.pxi
index e6f1fb3..9b118e5 100644
--- a/efl/elementary/diskselector.pxi
+++ b/efl/elementary/diskselector.pxi
@@ -406,26 +406,6 @@ cdef class Diskselector(Object):
     def callback_scroll_drag_stop_del(self, func):
         self._callback_del("scroll,drag,stop", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the diskselector has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the diskselector has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
 
     property scroller_policy:
         """
diff --git a/efl/elementary/entry.pxi b/efl/elementary/entry.pxi
index 25bd031..8e82210 100644
--- a/efl/elementary/entry.pxi
+++ b/efl/elementary/entry.pxi
@@ -1640,20 +1640,6 @@ cdef class Entry(LayoutClass):
     def callback_triple_clicked_del(self, func):
         self._callback_del("clicked,triple", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """The entry has received focus."""
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """The entry has lost focus."""
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
     def callback_selection_paste_add(self, func, *args, **kwargs):
         """A paste of the clipboard contents was requested."""
         self._callback_add("selection,paste", func, args, kwargs)
@@ -1778,13 +1764,6 @@ cdef class Entry(LayoutClass):
     def callback_preedit_changed_del(self, func):
         self._callback_del("preedit,changed", func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """Program language changed."""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
-
     def callback_text_set_done_add(self, func, *args, **kwargs):
         """Whole text has been set to the entry."""
         self._callback_add("text,set,done", func, args, kwargs)
diff --git a/efl/elementary/fileselector_button.pxi 
b/efl/elementary/fileselector_button.pxi
index 4cf9f9e..5bb0ec0 100644
--- a/efl/elementary/fileselector_button.pxi
+++ b/efl/elementary/fileselector_button.pxi
@@ -217,15 +217,5 @@ cdef class FileselectorButton(Button):
     def callback_file_chosen_del(self, func):
         self._callback_del_full("file,chosen", _cb_string_conv, func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """The program's language changed.
-
-        .. versionadded:: 1.8.1
-
-        """
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
 
 _object_mapping_register("Elm_Fileselector_Button", FileselectorButton)
diff --git a/efl/elementary/fileselector_entry.pxi 
b/efl/elementary/fileselector_entry.pxi
index d258897..002dd1b 100644
--- a/efl/elementary/fileselector_entry.pxi
+++ b/efl/elementary/fileselector_entry.pxi
@@ -282,20 +282,6 @@ cdef class FileselectorEntry(LayoutClass):
     def callback_clicked_double_del(self, func):
         self._callback_del("clicked,double", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """The entry has received focus."""
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """The entry has lost focus."""
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
     def callback_selection_paste_add(self, func, *args, **kwargs):
         """A paste action has occurred on the entry."""
         self._callback_add("selection,paste", func, args, kwargs)
@@ -335,15 +321,5 @@ cdef class FileselectorEntry(LayoutClass):
     def callback_file_chosen_del(self, func):
         self._callback_del_full("file,chosen", _cb_string_conv, func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """The program's language changed.
-
-        .. versionadded:: 1.8.1
-
-        """
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
 
 _object_mapping_register("Elm_Fileselector_Entry", FileselectorEntry)
diff --git a/efl/elementary/flipselector.pxi b/efl/elementary/flipselector.pxi
index 77980e5..1756b1f 100644
--- a/efl/elementary/flipselector.pxi
+++ b/efl/elementary/flipselector.pxi
@@ -382,24 +382,5 @@ cdef class FlipSelector(Object):
     def callback_underflowed_del(self, func):
         self._callback_del("underflowed", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the flipselector has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the flipselector has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Flipselector", FlipSelector)
diff --git a/efl/elementary/gengrid_widget.pxi 
b/efl/elementary/gengrid_widget.pxi
index e27c737..a96c35d 100644
--- a/efl/elementary/gengrid_widget.pxi
+++ b/efl/elementary/gengrid_widget.pxi
@@ -975,32 +975,6 @@ cdef class Gengrid(Object):
     def callback_unhighlighted_del(self, func):
         self._callback_del_full("unhighlighted", _cb_object_item_conv, func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """This is called when the program's language is
-        changed. Call :meth:`Gengrid.realized_items_update` if items text
-        should be translated."""
-        self.callback_add("language,changed", func, args, kwargs)
-
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the gengrid has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the gengrid has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
     def callback_item_focused_add(self, func, *args, **kwargs):
         """When the gengrid item has received focus.
 
diff --git a/efl/elementary/genlist_widget.pxi 
b/efl/elementary/genlist_widget.pxi
index 9c86788..6961255 100644
--- a/efl/elementary/genlist_widget.pxi
+++ b/efl/elementary/genlist_widget.pxi
@@ -1009,12 +1009,6 @@ cdef class Genlist(Object):
     def callback_moved_before_del(self, func):
         self._callback_del_full("moved,before",  _cb_object_item_conv, func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
-
     def callback_tree_effect_finished_add(self, func, *args, **kwargs):
         self._callback_add("tree,effect,finished", func, args, kwargs)
 
@@ -1043,26 +1037,6 @@ cdef class Genlist(Object):
     def callback_unhighlighted_del(self, func):
         self._callback_del_full("unhighlighted", _cb_object_item_conv, func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the genlist has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the genlist has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
     def callback_item_focused_add(self, func, *args, **kwargs):
         """When the genlist item has received focus.
 
diff --git a/efl/elementary/glview.pyx b/efl/elementary/glview.pyx
index 13668d7..c2799d3 100644
--- a/efl/elementary/glview.pyx
+++ b/efl/elementary/glview.pyx
@@ -23,13 +23,6 @@ GLView hides all the complicated evas_gl details so that the 
user only
 has to deal with registering a few callback functions for rendering
 to a surface using OpenGL APIs.
 
-This widget emits the following signals, besides the ones sent from
-:py:class:`LayoutClass<efl.elementary.layout_class.LayoutClass>`:
-
-- ``focused`` - when glview has received focus.
-- ``unfocused`` - when glview has lost focus.
-- ``language,changed`` - the program's language changed
-
 
 Enumerations
 ============
@@ -346,25 +339,5 @@ cdef class GLView(LayoutClass):
         """
         elm_glview_changed_set(self.obj)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """when glview has received focus."""
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """when glview has lost focus."""
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """the program's language changed"""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
 
 _object_mapping_register("Elm_Glview", GLView)
diff --git a/efl/elementary/hover.pxi b/efl/elementary/hover.pxi
index 17e63fd..a390ee6 100644
--- a/efl/elementary/hover.pxi
+++ b/efl/elementary/hover.pxi
@@ -139,25 +139,5 @@ cdef class Hover(LayoutClass):
     def callback_smart_changed_del(self, func):
         self._callback_del("smart,changed", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the hover has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the hover has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
 
 _object_mapping_register("Elm_Hover", Hover)
diff --git a/efl/elementary/index.pxi b/efl/elementary/index.pxi
index d9aebd7..4828d5d 100644
--- a/efl/elementary/index.pxi
+++ b/efl/elementary/index.pxi
@@ -589,31 +589,5 @@ cdef class Index(LayoutClass):
     def callback_level_down_del(self, func):
         self._callback_del("level,down", func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """the program's language changed"""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
-
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the index has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the index has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Index", Index)
diff --git a/efl/elementary/label.pxi b/efl/elementary/label.pxi
index 668632e..34cf742 100644
--- a/efl/elementary/label.pxi
+++ b/efl/elementary/label.pxi
@@ -195,13 +195,6 @@ cdef class Label(LayoutClass):
         """
         elm_label_slide_go(self.obj)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """The program's language changed."""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
-
     def callback_slide_end_add(self, func, *args, **kwargs):
         """A slide effect has ended."""
         self._callback_add("slide,end", func, args, kwargs)
diff --git a/efl/elementary/layout.pxi b/efl/elementary/layout.pxi
index efb97ab..7e88f6c 100644
--- a/efl/elementary/layout.pxi
+++ b/efl/elementary/layout.pxi
@@ -927,12 +927,6 @@ cdef class LayoutClass(Object):
     def callback_theme_changed_del(self, func):
         self._callback_del("theme,changed", func)
 
-    def callback_language_changed_add(self,func,*args, **kwargs):
-        """the program's language changed"""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
 
 
 cdef class Layout(LayoutClass):
diff --git a/efl/elementary/list.pxi b/efl/elementary/list.pxi
index 6735dd8..a76abcb 100644
--- a/efl/elementary/list.pxi
+++ b/efl/elementary/list.pxi
@@ -882,13 +882,6 @@ cdef class List(Object):
     def callback_edge_right_del(self, func):
         self._callback_del("edge,right",  func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """The program's language changed."""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed",  func)
-
     def callback_highlighted_add(self, func, *args, **kwargs):
         """an item in the list is highlighted. This is called when
         the user presses an item or keyboard selection is done so the item is
@@ -921,33 +914,6 @@ cdef class List(Object):
     def callback_unhighlighted_del(self, func):
         self._callback_del_full("unhighlighted", _cb_object_item_conv, func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """the program's language changed"""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
-
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the list has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the list has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
     def callback_item_focused_add(self, func, *args, **kwargs):
         """When the list item has received focus.
 
diff --git a/efl/elementary/map.pxi b/efl/elementary/map.pxi
index e02e5e0..26dadd3 100644
--- a/efl/elementary/map.pxi
+++ b/efl/elementary/map.pxi
@@ -1618,34 +1618,6 @@ cdef class Map(Object):
         """ Delete a previously attached callback """
         self._callback_del("loaded", func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """ Add a callback to be called on the "language,changed" signal. """
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        """ Delete a previously attached callback """
-        self._callback_del("language,changed", func)
-
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the map has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the map has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
     property scroller_policy:
         """
 
diff --git a/efl/elementary/multibuttonentry.pxi 
b/efl/elementary/multibuttonentry.pxi
index 27da297..e1bfbf3 100644
--- a/efl/elementary/multibuttonentry.pxi
+++ b/efl/elementary/multibuttonentry.pxi
@@ -478,18 +478,6 @@ cdef class MultiButtonEntry(Object):
     def callback_clicked_del(self, func):
         self._callback_del("clicked", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
     def callback_expanded_add(self, func, *args, **kwargs):
         self._callback_add("expanded", func, args, kwargs)
 
diff --git a/efl/elementary/naviframe.pxi b/efl/elementary/naviframe.pxi
index 16bf1ce..bee57e4 100644
--- a/efl/elementary/naviframe.pxi
+++ b/efl/elementary/naviframe.pxi
@@ -502,24 +502,5 @@ cdef class Naviframe(LayoutClass):
     def callback_title_clicked_del(self, func):
         self._callback_del_full("title,clicked", _cb_object_item_conv, func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the naviframe has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the naviframe has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Naviframe", Naviframe)
diff --git a/efl/elementary/object.pxi b/efl/elementary/object.pxi
index 5c5ddad..fd8cb36 100644
--- a/efl/elementary/object.pxi
+++ b/efl/elementary/object.pxi
@@ -595,6 +595,54 @@ cdef class Object(SmartObject):
         return bool(elm_object_orientation_mode_disabled_get(self.obj))
 
     #
+    # Smart event callbacks
+    # =====================
+
+    def callback_moved_add(self, func, *args, **kwargs):
+        """ The Object change position.
+
+        .. versionadded:: 1.17
+        """
+        self._callback_add("moved", func, args, kwargs)
+
+    def callback_moved_del(self, func):
+        """ Delete a previously attached callback """
+        self._callback_del("moved", func)
+
+    def callback_focused_add(self, func, *args, **kwargs):
+        """ The Object has received focus.
+
+        .. versionadded:: 1.8
+        """
+        self._callback_add("focused", func, args, kwargs)
+
+    def callback_focused_del(self, func):
+        """ Delete a previously attached callback """
+        self._callback_del("focused", func)
+
+    def callback_unfocused_add(self, func, *args, **kwargs):
+        """ The Object has lost focus.
+
+        .. versionadded:: 1.8
+        """
+        self._callback_add("unfocused", func, args, kwargs)
+
+    def callback_unfocused_del(self, func):
+        """ Delete a previously attached callback """
+        self._callback_del("unfocused", func)
+
+    def callback_language_changed_add(self, func, *args, **kwargs):
+        """ The program's language changed
+
+        .. versionadded:: 1.8.1
+        """
+        self._callback_add("language,changed", func, args, kwargs)
+
+    def callback_language_changed_del(self, func):
+        """ Delete a previously attached callback """
+        self._callback_del("language,changed", func)
+
+    #
     # Cursors
     # =======
 
diff --git a/efl/elementary/panel.pxi b/efl/elementary/panel.pxi
index c3351ef..1cf63d0 100644
--- a/efl/elementary/panel.pxi
+++ b/efl/elementary/panel.pxi
@@ -112,24 +112,5 @@ cdef class Panel(LayoutClass):
         """Toggle the hidden state of the panel from code."""
         elm_panel_toggle(self.obj)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the panel has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the panel has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Panel", Panel)
diff --git a/efl/elementary/photocam.pxi b/efl/elementary/photocam.pxi
index c6dd88b..e6f7f7d 100644
--- a/efl/elementary/photocam.pxi
+++ b/efl/elementary/photocam.pxi
@@ -482,25 +482,6 @@ cdef class Photocam(Object):
     def callback_download_error_del(self, func):
         self._callback_del_full("download,error", 
_photocam_download_error_conv, func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the photocam has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the photocam has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
     property scroller_policy:
         """
diff --git a/efl/elementary/popup.pxi b/efl/elementary/popup.pxi
index a65688e..e14676a 100644
--- a/efl/elementary/popup.pxi
+++ b/efl/elementary/popup.pxi
@@ -225,36 +225,6 @@ cdef class Popup(LayoutClass):
     def callback_block_clicked_del(self, func):
         self._callback_del("block,clicked", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the popup has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the popup has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """the program's language changed
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
-
     def callback_item_focused_add(self, func, *args, **kwargs):
         """When the popup item has received focus.
 
diff --git a/efl/elementary/progressbar.pxi b/efl/elementary/progressbar.pxi
index 11519bb..b48a16f 100644
--- a/efl/elementary/progressbar.pxi
+++ b/efl/elementary/progressbar.pxi
@@ -248,24 +248,5 @@ cdef class Progressbar(LayoutClass):
     def callback_changed_del(self, func):
         self._callback_del("changed", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the progressbar has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the progressbar has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Progressbar", Progressbar)
diff --git a/efl/elementary/radio.pxi b/efl/elementary/radio.pxi
index 70f82bb..9778a5c 100644
--- a/efl/elementary/radio.pxi
+++ b/efl/elementary/radio.pxi
@@ -128,24 +128,5 @@ cdef class Radio(LayoutClass):
     def callback_changed_del(self, func):
         self._callback_del("changed", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the radio has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the radio has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Radio", Radio)
diff --git a/efl/elementary/scroller.pxi b/efl/elementary/scroller.pxi
index deff9d7..215db4b 100644
--- a/efl/elementary/scroller.pxi
+++ b/efl/elementary/scroller.pxi
@@ -669,7 +669,6 @@ cdef class Scrollable(Object):
     def callback_scroll_down_del(self, func):
         self._callback_del("scroll,down", func)
 
-
     def callback_scroll_anim_start_add(self, func, *args, **kwargs):
         """Scrolling animation has started."""
         self._callback_add("scroll,anim,start", func, args, kwargs)
@@ -747,26 +746,6 @@ cdef class Scrollable(Object):
     def callback_scroll_page_changed_del(self, func):
         self._callback_del("scroll,page,changed", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the scroller has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the scroller has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
 
 cdef class _ScrollerWidget(LayoutClass):
     def __init__(self, evasObject parent, *args, **kwargs):
diff --git a/efl/elementary/slider.pxi b/efl/elementary/slider.pxi
index d9c409e..82d124c 100644
--- a/efl/elementary/slider.pxi
+++ b/efl/elementary/slider.pxi
@@ -377,24 +377,5 @@ cdef class Slider(LayoutClass):
     def callback_delay_changed_del(self, func):
         self._callback_del("delay,changed", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the slider has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the slider has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Slider", Slider)
diff --git a/efl/elementary/slideshow.pxi b/efl/elementary/slideshow.pxi
index 65a7892..ac177c7 100644
--- a/efl/elementary/slideshow.pxi
+++ b/efl/elementary/slideshow.pxi
@@ -673,24 +673,5 @@ cdef class Slideshow(LayoutClass):
     def callback_transition_end_del(self, func):
         self._callback_del_full("transition,end", _cb_object_item_conv, func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the slideshow has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the slideshow has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Slideshow", Slideshow)
diff --git a/efl/elementary/spinner.pxi b/efl/elementary/spinner.pxi
index bfeaf6a..1baa094 100644
--- a/efl/elementary/spinner.pxi
+++ b/efl/elementary/spinner.pxi
@@ -367,31 +367,5 @@ cdef class Spinner(LayoutClass):
     def callback_delay_changed_del(self, func):
         self._callback_del("delay,changed", func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """the program's language changed"""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
-
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the spinner has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the spinner has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Spinner", Spinner)
diff --git a/efl/elementary/toolbar.pxi b/efl/elementary/toolbar.pxi
index 3f2e24f..e9aee57 100644
--- a/efl/elementary/toolbar.pxi
+++ b/efl/elementary/toolbar.pxi
@@ -952,33 +952,6 @@ cdef class Toolbar(LayoutClass):
     def callback_longpressed_del(self, func):
         self._callback_del_full("longpressed", _cb_object_item_conv, func)
 
-    def callback_language_changed_add(self, func, *args, **kwargs):
-        """When the program language changes."""
-        self._callback_add("language,changed", func, args, kwargs)
-
-    def callback_language_changed_del(self, func):
-        self._callback_del("language,changed", func)
-
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the toolbar has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the toolbar has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
     def callback_item_focused_add(self, func, *args, **kwargs):
         """When the toolbar item has received focus.
 
diff --git a/efl/elementary/video.pxi b/efl/elementary/video.pxi
index 5330ba7..aa7c8dc 100644
--- a/efl/elementary/video.pxi
+++ b/efl/elementary/video.pxi
@@ -228,25 +228,6 @@ cdef class Video(LayoutClass):
     def title_get(self):
         return _ctouni(elm_video_title_get(self.obj))
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the video has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the video has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Video", Video)
 
@@ -347,24 +328,5 @@ cdef class Player(LayoutClass):
     def callback_stop_clicked_del(self, func):
         self._callback_del("stop,clicked", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the player has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the player has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 _object_mapping_register("Elm_Player", Player)
diff --git a/efl/elementary/web.pxi b/efl/elementary/web.pxi
index 19c2c19..b9ee90d 100644
--- a/efl/elementary/web.pxi
+++ b/efl/elementary/web.pxi
@@ -1089,27 +1089,6 @@ cdef class Web(Object):
     def callback_zoom_animated_end_del(self, func):
         self._callback_del("zoom,animated,end", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the web has received focus.
-
-        .. versionadded:: 1.8
-
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the web has lost focus.
-
-        .. versionadded:: 1.8
-
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
 
 
 _object_mapping_register("Elm_Web", Web)
diff --git a/efl/elementary/window.pxi b/efl/elementary/window.pxi
index ae0665f..bbf9346 100644
--- a/efl/elementary/window.pxi
+++ b/efl/elementary/window.pxi
@@ -1454,26 +1454,6 @@ cdef class Window(Object):
     def callback_profile_changed_del(self, func):
         self._callback_del("profile,changed", func)
 
-    def callback_focused_add(self, func, *args, **kwargs):
-        """When the window has received focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("focused", func, args, kwargs)
-
-    def callback_focused_del(self, func):
-        self._callback_del("focused", func)
-
-    def callback_unfocused_add(self, func, *args, **kwargs):
-        """When the window has lost focus.
-
-        .. versionadded:: 1.8
-        """
-        self._callback_add("unfocused", func, args, kwargs)
-
-    def callback_unfocused_del(self, func):
-        self._callback_del("unfocused", func)
-
     def callback_theme_changed_add(self, func, *args, **kwargs):
         """When the theme was changed.
 
diff --git a/examples/elementary/test_focus.py 
b/examples/elementary/test_focus.py
index 63be861..48272e0 100644
--- a/examples/elementary/test_focus.py
+++ b/examples/elementary/test_focus.py
@@ -39,6 +39,9 @@ def _tb_sel(tb, item):
     print(item)
     print(item.text)
 
+def _obj_focused_cb(obj):
+    print("Focused: ", obj)
+
 def focus_clicked(obj, item=None):
     win = StandardWindow("focus", "Focus", autodel=True, size=(800,600))
     
@@ -51,6 +54,7 @@ def focus_clicked(obj, item=None):
     ### Toolbar
     tbar = Toolbar(win, shrink_mode=ELM_TOOLBAR_SHRINK_MENU,
                    size_hint_align=(EVAS_HINT_FILL,0.0))
+    tbar.callback_focused_add(_obj_focused_cb)
 
     tb_it = tbar.item_append("document-print", "Hello", _tb_sel)
     tb_it.disabled = True
@@ -89,6 +93,7 @@ def focus_clicked(obj, item=None):
     lb.show()
 
     tg = Check(win, style="toggle")
+    tg.callback_focused_add(_obj_focused_cb)
     tg.part_text_set("on", "Yes")
     tg.part_text_set("off", "No")
     bx.pack_end(tg)
@@ -96,6 +101,7 @@ def focus_clicked(obj, item=None):
     
     en = Entry(win, scrollable=True, single_line=True, text="This is a single 
line",
                     size_hint_weight=EXPAND_HORIZ, size_hint_align=FILL_HORIZ)
+    en.callback_focused_add(_obj_focused_cb)
     bx.pack_end(en)
     en.show()
 
@@ -106,6 +112,7 @@ def focus_clicked(obj, item=None):
 
     for i in range(2):
         bt = Button(win, text="Box", size_hint_align=FILL_BOTH, disabled=(i % 
2))
+        bt.callback_focused_add(_obj_focused_cb)
         bx2.pack_end(bt)
         bt.show()
 
@@ -115,11 +122,13 @@ def focus_clicked(obj, item=None):
     sc.show()
 
     bt = Button(win, text="Scroller", size_hint_align=FILL_BOTH)
+    bt.callback_focused_add(_obj_focused_cb)
     sc.content = bt
     bt.show()
 
     #
     bt = Button(win, text="Box", size_hint_align=FILL_BOTH)
+    bt.callback_focused_add(_obj_focused_cb)
     bx.pack_end(bt)
     bt.show()
 
@@ -135,13 +144,14 @@ def focus_clicked(obj, item=None):
 
         for j in range(3):
             bt = Button(win, text="Box", size_hint_align=FILL_BOTH)
+            bt.callback_focused_add(_obj_focused_cb)
             bx3.pack_end(bt)
             bt.show()
     
 
     sc = Scroller(win, bounce=(False, True), content_min_limit=(1,0),
                   size_hint_align=FILL_BOTH, size_hint_weight=EXPAND_BOTH)
-    sc.content_min_limit=(1,1)
+    sc.content_min_limit=(1, 1) ## Why this do not work ???
     bx2.pack_end(sc)
     sc.show()
 
@@ -151,6 +161,7 @@ def focus_clicked(obj, item=None):
 
     for i in range(5):
         bt = Button(win, text="BX Scroller", size_hint_align=FILL_BOTH)
+        bt.callback_focused_add(_obj_focused_cb)
         bx3.pack_end(bt)
         bt.show()
 
@@ -167,6 +178,7 @@ def focus_clicked(obj, item=None):
 
     for i in range(3):
         bt = Button(win, text="Layout", size_hint_align=FILL_BOTH)
+        bt.callback_focused_add(_obj_focused_cb)
         bx2.pack_end(bt)
         bt.show()
         bx2.focus_custom_chain_prepend(bt)
@@ -177,12 +189,14 @@ def focus_clicked(obj, item=None):
 
     bt = Button(win, text="Disable", size_hint_align=FILL_BOTH)
     bt.callback_clicked_add(lambda b: b.disabled_set(True))
+    bt.callback_focused_add(_obj_focused_cb)
     bx2.pack_end(bt)
     bt.show()
     bx2.focus_custom_chain_prepend(bt)
 
     bt2 = Button(win, text="Enable", size_hint_align=FILL_BOTH)
     bt2.callback_clicked_add(lambda b, b1: b1.disabled_set(False), bt)
+    bt2.callback_focused_add(_obj_focused_cb)
     bx2.pack_end(bt2)
     bt2.show()
     bx2.focus_custom_chain_append(bt2)
@@ -203,6 +217,7 @@ def focus_clicked(obj, item=None):
     for j in range(1):
         for i in range(2):
             bt = Button(win, text="Table", size_hint_align=FILL_BOTH, 
size_hint_weight=EXPAND_BOTH)
+            bt.callback_focused_add(_obj_focused_cb)
             tb.pack(bt, i, j, 1, 1)
             bt.show()
 
@@ -216,10 +231,10 @@ def focus_clicked(obj, item=None):
     tb.show()
 
     for j in range(2):
-        for i in range(1):
-            bt = Button(win, text="Table", size_hint_align=FILL_BOTH, 
size_hint_weight=EXPAND_BOTH)
-            tb.pack(bt, i, j, 1, 1)
-            bt.show()
+        bt = Button(win, text="Table", size_hint_align=FILL_BOTH, 
size_hint_weight=EXPAND_BOTH)
+        bt.callback_focused_add(_obj_focused_cb)
+        tb.pack(bt, 0, j, 1, 1)
+        bt.show()
 
 
     win.show()

-- 


Reply via email to