summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Stanislawski <l.stanislaws@samsung.com>2014-10-17 16:56:11 +0100
committerTom Hacohen <tom@stosb.com>2014-10-17 16:57:26 +0100
commited365503126a690e767f786dff24a06fbb77b72e (patch)
tree733e2ea4596fbd046daf03edd89359492db03802
parente2301ee5b183755b9f6c12676978d2b9d94b6cd2 (diff)
atspi: properly include at-spi headers.
Summary: Change requested by TAsn. Previuosly AT-SPI headers were kept private and included directly into elementary source code. From now on, AT-SPI headers can be included from Elementary.h public header, however will be marked as beta APIs. Commit includes following changes: * include all atspi headers into new elm_interfaces.h header. * marking all at-spi interfaces methods/properties as @protected. * wrap all common headers with EFL_BETA_API_SUPPORT. * make some common APIs visible in lib, by adding EAPI attribute (if someone decides to use beta APIs). Test Plan: out-off tree build with gcc, g++ Reviewers: tasn Reviewed By: tasn Subscribers: seoz, q66, kuuko Maniphest Tasks: T1721 Differential Revision: https://phab.enlightenment.org/D1528
-rw-r--r--src/lib/Elementary.h.in1
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/elc_ctxpopup.c11
-rw-r--r--src/lib/elc_fileselector.c11
-rw-r--r--src/lib/elc_fileselector_button.c6
-rw-r--r--src/lib/elc_fileselector_entry.c7
-rw-r--r--src/lib/elc_hoversel.c12
-rw-r--r--src/lib/elc_multibuttonentry.c6
-rw-r--r--src/lib/elc_naviframe.c11
-rw-r--r--src/lib/elc_player.c11
-rw-r--r--src/lib/elc_popup.c11
-rw-r--r--src/lib/elm_actionslider.c6
-rw-r--r--src/lib/elm_atspi_app_object.c8
-rw-r--r--src/lib/elm_atspi_app_object.h6
-rw-r--r--src/lib/elm_atspi_bridge.c14
-rw-r--r--src/lib/elm_bg.c6
-rw-r--r--src/lib/elm_box.c6
-rw-r--r--src/lib/elm_bubble.c6
-rw-r--r--src/lib/elm_button.c12
-rw-r--r--src/lib/elm_calendar.c11
-rw-r--r--src/lib/elm_check.c12
-rw-r--r--src/lib/elm_clock.c6
-rw-r--r--src/lib/elm_colorselector.c11
-rw-r--r--src/lib/elm_conform.c6
-rw-r--r--src/lib/elm_datetime.c6
-rw-r--r--src/lib/elm_dayselector.c6
-rw-r--r--src/lib/elm_diskselector.c11
-rw-r--r--src/lib/elm_entry.c14
-rw-r--r--src/lib/elm_flip.c6
-rw-r--r--src/lib/elm_flipselector.c12
-rw-r--r--src/lib/elm_frame.c6
-rw-r--r--src/lib/elm_gengrid.c11
-rw-r--r--src/lib/elm_genlist.c11
-rw-r--r--src/lib/elm_glview.c6
-rw-r--r--src/lib/elm_grid.c6
-rw-r--r--src/lib/elm_hover.c6
-rw-r--r--src/lib/elm_icon.c6
-rw-r--r--src/lib/elm_image.c15
-rw-r--r--src/lib/elm_index.c6
-rw-r--r--src/lib/elm_interface_atspi_accessible.c10
-rw-r--r--src/lib/elm_interface_atspi_accessible.eo2
-rw-r--r--src/lib/elm_interface_atspi_accessible.h17
-rw-r--r--src/lib/elm_interface_atspi_action.c6
-rw-r--r--src/lib/elm_interface_atspi_component.c4
-rw-r--r--src/lib/elm_interface_atspi_component.eo2
-rw-r--r--src/lib/elm_interface_atspi_editable_text.c5
-rw-r--r--src/lib/elm_interface_atspi_image.c6
-rw-r--r--src/lib/elm_interface_atspi_image.eo2
-rw-r--r--src/lib/elm_interface_atspi_selection.c5
-rw-r--r--src/lib/elm_interface_atspi_text.c9
-rw-r--r--src/lib/elm_interface_atspi_text.h16
-rw-r--r--src/lib/elm_interface_atspi_value.c5
-rw-r--r--src/lib/elm_interface_atspi_widget.c11
-rw-r--r--src/lib/elm_interface_atspi_widget_action.c10
-rw-r--r--src/lib/elm_interface_atspi_widget_action.h14
-rw-r--r--src/lib/elm_interface_atspi_window.c1
-rw-r--r--src/lib/elm_interfaces.h24
-rw-r--r--src/lib/elm_inwin.c6
-rw-r--r--src/lib/elm_label.c6
-rw-r--r--src/lib/elm_layout.c6
-rw-r--r--src/lib/elm_list.c11
-rw-r--r--src/lib/elm_map.c11
-rw-r--r--src/lib/elm_mapbuf.c6
-rw-r--r--src/lib/elm_menu.c6
-rw-r--r--src/lib/elm_notify.c6
-rw-r--r--src/lib/elm_panel.c11
-rw-r--r--src/lib/elm_panes.c6
-rw-r--r--src/lib/elm_photo.c6
-rw-r--r--src/lib/elm_photocam.c11
-rw-r--r--src/lib/elm_plug.c6
-rw-r--r--src/lib/elm_prefs.c6
-rw-r--r--src/lib/elm_progressbar.c6
-rw-r--r--src/lib/elm_radio.c11
-rw-r--r--src/lib/elm_scroller.c11
-rw-r--r--src/lib/elm_segment_control.c6
-rw-r--r--src/lib/elm_separator.c6
-rw-r--r--src/lib/elm_slider.c15
-rw-r--r--src/lib/elm_slideshow.c11
-rw-r--r--src/lib/elm_spinner.c15
-rw-r--r--src/lib/elm_table.c6
-rw-r--r--src/lib/elm_thumb.c6
-rw-r--r--src/lib/elm_toolbar.c11
-rw-r--r--src/lib/elm_video.c11
-rw-r--r--src/lib/elm_web2.c6
-rw-r--r--src/lib/elm_widget.c1
-rw-r--r--src/lib/elm_win.c14
86 files changed, 260 insertions, 455 deletions
diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 91d9f3581..9f6bfdb62 100644
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -183,6 +183,7 @@ EAPI extern Elm_Version *elm_version;
183#include <elm_app_client.h> 183#include <elm_app_client.h>
184#include <elm_app_client_view.h> 184#include <elm_app_client_view.h>
185#include <elm_app.h> 185#include <elm_app.h>
186#include <elm_atspi_app_object.h>
186#include <elm_bg.h> 187#include <elm_bg.h>
187#include <elm_box.h> 188#include <elm_box.h>
188 189
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 44ac1a15a..5bbe57218 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -152,6 +152,7 @@ elm_app_client.h \
152elm_app_client_view_eo.h \ 152elm_app_client_view_eo.h \
153elm_app_client_view.h \ 153elm_app_client_view.h \
154elm_app.h \ 154elm_app.h \
155elm_atspi_app_object.h \
155elm_authors.h \ 156elm_authors.h \
156elm_bg.h \ 157elm_bg.h \
157elm_bg_eo.h \ 158elm_bg_eo.h \
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 8f1973dde..9ae6ac196 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -2,19 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6 9
7#include "elm_priv.h" 10#include "elm_priv.h"
8#include "elm_widget_ctxpopup.h" 11#include "elm_widget_ctxpopup.h"
9 12
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
15#include "elm_interface_atspi_widget_action.h"
16#include "elm_interface_atspi_widget_action.eo.h"
17
18#define MY_CLASS ELM_CTXPOPUP_CLASS 13#define MY_CLASS ELM_CTXPOPUP_CLASS
19 14
20#define MY_CLASS_NAME "Elm_Ctxpopup" 15#define MY_CLASS_NAME "Elm_Ctxpopup"
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 9ca256314..e1145c473 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -9,19 +9,14 @@
9# include "elementary_config.h" 9# include "elementary_config.h"
10#endif 10#endif
11 11
12#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
13#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
14
12#include <Elementary.h> 15#include <Elementary.h>
13#include "elm_priv.h" 16#include "elm_priv.h"
14#include "elm_interface_fileselector.h" 17#include "elm_interface_fileselector.h"
15#include "elm_widget_fileselector.h" 18#include "elm_widget_fileselector.h"
16 19
17#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
18#include "elm_interface_atspi_accessible.h"
19#include "elm_interface_atspi_accessible.eo.h"
20
21#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
22#include "elm_interface_atspi_widget_action.h"
23#include "elm_interface_atspi_widget_action.eo.h"
24
25#define MY_CLASS ELM_FILESELECTOR_CLASS 20#define MY_CLASS ELM_FILESELECTOR_CLASS
26 21
27#define MY_CLASS_NAME "Elm_Fileselector" 22#define MY_CLASS_NAME "Elm_Fileselector"
diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c
index 3891389e7..52b2a2a18 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_priv.h" 8#include "elm_priv.h"
7#include "elm_interface_fileselector.h" 9#include "elm_interface_fileselector.h"
8#include "elm_widget_fileselector_button.h" 10#include "elm_widget_fileselector_button.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_FILESELECTOR_BUTTON_CLASS 12#define MY_CLASS ELM_FILESELECTOR_BUTTON_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Fileselector_Button" 14#define MY_CLASS_NAME "Elm_Fileselector_Button"
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index 35b18e807..3983750aa 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -3,16 +3,13 @@
3# include "elementary_config.h" 3# include "elementary_config.h"
4#endif 4#endif
5 5
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
7
6#include <Elementary.h> 8#include <Elementary.h>
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_interface_fileselector.h" 10#include "elm_interface_fileselector.h"
9#include "elm_widget_fileselector_entry.h" 11#include "elm_widget_fileselector_entry.h"
10 12
11
12#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
13#include "elm_interface_atspi_accessible.h"
14#include "elm_interface_atspi_accessible.eo.h"
15
16#define MY_CLASS ELM_FILESELECTOR_ENTRY_CLASS 13#define MY_CLASS ELM_FILESELECTOR_ENTRY_CLASS
17 14
18#define MY_CLASS_NAME "Elm_Fileselector_Entry" 15#define MY_CLASS_NAME "Elm_Fileselector_Entry"
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index a8f7a13a2..27db5a5a0 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -2,19 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6#include "elm_priv.h" 9#include "elm_priv.h"
7#include "elm_widget_hoversel.h" 10#include "elm_widget_hoversel.h"
8 11
9
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
15#include "elm_interface_atspi_widget_action.h"
16#include "elm_interface_atspi_widget_action.eo.h"
17
18#define MY_CLASS ELM_HOVERSEL_CLASS 12#define MY_CLASS ELM_HOVERSEL_CLASS
19 13
20#define MY_CLASS_NAME "Elm_Hoversel" 14#define MY_CLASS_NAME "Elm_Hoversel"
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index d394453d3..0204133a2 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -2,14 +2,12 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_priv.h" 8#include "elm_priv.h"
7#include "elm_widget_multibuttonentry.h" 9#include "elm_widget_multibuttonentry.h"
8 10
9#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
10#include "elm_interface_atspi_accessible.h"
11#include "elm_interface_atspi_accessible.eo.h"
12
13#define MY_CLASS ELM_MULTIBUTTONENTRY_CLASS 11#define MY_CLASS ELM_MULTIBUTTONENTRY_CLASS
14 12
15#define MY_CLASS_NAME "Elm_Multibuttonentry" 13#define MY_CLASS_NAME "Elm_Multibuttonentry"
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 7a54e8470..b25e7453b 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -2,19 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6#include "elm_priv.h" 9#include "elm_priv.h"
7#include "elm_widget_naviframe.h" 10#include "elm_widget_naviframe.h"
8#include "elm_widget_container.h" 11#include "elm_widget_container.h"
9 12
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
15#include "elm_interface_atspi_widget_action.h"
16#include "elm_interface_atspi_widget_action.eo.h"
17
18#define MY_CLASS ELM_NAVIFRAME_CLASS 13#define MY_CLASS ELM_NAVIFRAME_CLASS
19 14
20#define MY_CLASS_NAME "Elm_Naviframe" 15#define MY_CLASS_NAME "Elm_Naviframe"
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index 1e0c46230..a2f1a8e83 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -4,19 +4,14 @@
4 4
5#include <Emotion.h> 5#include <Emotion.h>
6 6
7#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
8#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
9
7#include <Elementary.h> 10#include <Elementary.h>
8#include "elm_priv.h" 11#include "elm_priv.h"
9#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
10#include "elm_widget_player.h" 13#include "elm_widget_player.h"
11 14
12#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
13#include "elm_interface_atspi_accessible.h"
14#include "elm_interface_atspi_accessible.eo.h"
15
16#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
17#include "elm_interface_atspi_widget_action.h"
18#include "elm_interface_atspi_widget_action.eo.h"
19
20#define MY_CLASS ELM_PLAYER_CLASS 15#define MY_CLASS ELM_PLAYER_CLASS
21 16
22#define MY_CLASS_NAME "Elm_Player" 17#define MY_CLASS_NAME "Elm_Player"
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index 8daa8be0b..fad656c54 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -2,18 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6#include "elm_priv.h" 9#include "elm_priv.h"
7#include "elm_widget_popup.h" 10#include "elm_widget_popup.h"
8 11
9#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
10#include "elm_interface_atspi_accessible.h"
11#include "elm_interface_atspi_accessible.eo.h"
12
13#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
14#include "elm_interface_atspi_widget_action.h"
15#include "elm_interface_atspi_widget_action.eo.h"
16
17#define MY_CLASS ELM_POPUP_CLASS 12#define MY_CLASS ELM_POPUP_CLASS
18 13
19#define MY_CLASS_NAME "Elm_Popup" 14#define MY_CLASS_NAME "Elm_Popup"
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index ec9d72c43..98ca1fe64 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -2,16 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include <math.h> 8#include <math.h>
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_actionslider.h" 10#include "elm_widget_actionslider.h"
9#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
10 12
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define MY_CLASS ELM_ACTIONSLIDER_CLASS 13#define MY_CLASS ELM_ACTIONSLIDER_CLASS
16 14
17#define MY_CLASS_NAME "Elm_Actionslider" 15#define MY_CLASS_NAME "Elm_Actionslider"
diff --git a/src/lib/elm_atspi_app_object.c b/src/lib/elm_atspi_app_object.c
index 6313250c8..08932cfcf 100644
--- a/src/lib/elm_atspi_app_object.c
+++ b/src/lib/elm_atspi_app_object.c
@@ -2,16 +2,12 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_widget.h" 8#include "elm_widget.h"
7#include "elm_priv.h" 9#include "elm_priv.h"
8 10
9#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
10
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13#include "elm_atspi_app_object.eo.h"
14
15extern Eina_List *_elm_win_list; 11extern Eina_List *_elm_win_list;
16 12
17typedef struct _Elm_Atspi_App_Object_Data Elm_Atspi_App_Object_Data; 13typedef struct _Elm_Atspi_App_Object_Data Elm_Atspi_App_Object_Data;
diff --git a/src/lib/elm_atspi_app_object.h b/src/lib/elm_atspi_app_object.h
new file mode 100644
index 000000000..53042f86f
--- /dev/null
+++ b/src/lib/elm_atspi_app_object.h
@@ -0,0 +1,6 @@
1#ifdef EFL_EO_API_SUPPORT
2#include "elm_atspi_app_object.eo.h"
3#endif
4#ifndef EFL_NOLEGACY_API_SUPPORT
5#include "elm_atspi_app_object.eo.legacy.h"
6#endif
diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c
index cba44ba2d..a3f5e2409 100644
--- a/src/lib/elm_atspi_bridge.c
+++ b/src/lib/elm_atspi_bridge.c
@@ -18,20 +18,6 @@
18#include "elm_priv.h" 18#include "elm_priv.h"
19#include <assert.h> 19#include <assert.h>
20 20
21#include "elm_atspi_app_object.eo.h"
22
23#include "elm_interface_atspi_accessible.h"
24#include "elm_interface_atspi_accessible.eo.h"
25#include "elm_interface_atspi_component.eo.h"
26#include "elm_interface_atspi_window.eo.h"
27#include "elm_interface_atspi_action.eo.h"
28#include "elm_interface_atspi_value.eo.h"
29#include "elm_interface_atspi_image.eo.h"
30#include "elm_interface_atspi_selection.eo.h"
31#include "elm_interface_atspi_text.h"
32#include "elm_interface_atspi_text.eo.h"
33#include "elm_interface_atspi_editable_text.eo.h"
34
35/* 21/*
36 * Accessibility Bus info not defined in atspi-constants.h 22 * Accessibility Bus info not defined in atspi-constants.h
37 */ 23 */
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index b791fe02e..425586a9e 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_priv.h" 8#include "elm_priv.h"
7#include "elm_widget_bg.h" 9#include "elm_widget_bg.h"
8#include "elm_widget_layout.h" 10#include "elm_widget_layout.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_BG_CLASS 12#define MY_CLASS ELM_BG_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Bg" 14#define MY_CLASS_NAME "Elm_Bg"
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index 94440542d..b6a84dbef 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_priv.h" 8#include "elm_priv.h"
7#include "els_box.h" 9#include "els_box.h"
8#include "elm_widget_box.h" 10#include "elm_widget_box.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_BOX_CLASS 12#define MY_CLASS ELM_BOX_CLASS
15#define MY_CLASS_NAME "Elm_Box" 13#define MY_CLASS_NAME "Elm_Box"
16#define MY_CLASS_NAME_LEGACY "elm_box" 14#define MY_CLASS_NAME_LEGACY "elm_box"
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index dd3d299f9..54e4d7d60 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_priv.h" 8#include "elm_priv.h"
7#include "elm_widget_bubble.h" 9#include "elm_widget_bubble.h"
8#include "elm_widget_layout.h" 10#include "elm_widget_layout.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_BUBBLE_CLASS 12#define MY_CLASS ELM_BUBBLE_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Bubble" 14#define MY_CLASS_NAME "Elm_Bubble"
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index e994f1680..3083a7b8a 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -2,6 +2,9 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6#include "elm_priv.h" 9#include "elm_priv.h"
7#include "elm_widget_button.h" 10#include "elm_widget_button.h"
@@ -9,15 +12,6 @@
9 12
10#define MY_CLASS ELM_BUTTON_CLASS 13#define MY_CLASS ELM_BUTTON_CLASS
11 14
12// ATSPI Accessibility
13#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
14#include "elm_interface_atspi_widget_action.h"
15#include "elm_interface_atspi_widget_action.eo.h"
16
17#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
18#include "elm_interface_atspi_accessible.h"
19#include "elm_interface_atspi_accessible.eo.h"
20
21#define MY_CLASS_NAME "Elm_Button" 15#define MY_CLASS_NAME "Elm_Button"
22#define MY_CLASS_NAME_LEGACY "elm_button" 16#define MY_CLASS_NAME_LEGACY "elm_button"
23 17
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 70a8213a8..681079067 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -2,18 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6#include "elm_priv.h" 9#include "elm_priv.h"
7#include "elm_widget_calendar.h" 10#include "elm_widget_calendar.h"
8 11
9#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
10#include "elm_interface_atspi_accessible.h"
11#include "elm_interface_atspi_accessible.eo.h"
12
13#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
14#include "elm_interface_atspi_widget_action.h"
15#include "elm_interface_atspi_widget_action.eo.h"
16
17#define MY_CLASS ELM_CALENDAR_CLASS 12#define MY_CLASS ELM_CALENDAR_CLASS
18 13
19#define MY_CLASS_NAME "Elm_Calendar" 14#define MY_CLASS_NAME "Elm_Calendar"
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index ce8a43734..9077d5e49 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -2,20 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6#include "elm_priv.h" 9#include "elm_priv.h"
7#include "elm_widget_check.h" 10#include "elm_widget_check.h"
8#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
9 12
10
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
16#include "elm_interface_atspi_widget_action.h"
17#include "elm_interface_atspi_widget_action.eo.h"
18
19#define MY_CLASS ELM_CHECK_CLASS 13#define MY_CLASS ELM_CHECK_CLASS
20 14
21#define MY_CLASS_NAME "Elm_Check" 15#define MY_CLASS_NAME "Elm_Check"
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 473b5e9c6..72191a923 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -2,14 +2,12 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_priv.h" 8#include "elm_priv.h"
7#include "elm_widget_clock.h" 9#include "elm_widget_clock.h"
8 10
9#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
10#include "elm_interface_atspi_accessible.h"
11#include "elm_interface_atspi_accessible.eo.h"
12
13#define MY_CLASS ELM_CLOCK_CLASS 11#define MY_CLASS ELM_CLOCK_CLASS
14 12
15#define MY_CLASS_NAME "Elm_Clock" 13#define MY_CLASS_NAME "Elm_Clock"
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index e4b6fff3e..425024354 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -2,18 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6#include "elm_priv.h" 9#include "elm_priv.h"
7#include "elm_widget_colorselector.h" 10#include "elm_widget_colorselector.h"
8 11
9#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
10#include "elm_interface_atspi_accessible.h"
11#include "elm_interface_atspi_accessible.eo.h"
12
13#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
14#include "elm_interface_atspi_widget_action.h"
15#include "elm_interface_atspi_widget_action.eo.h"
16
17#define MY_CLASS ELM_COLORSELECTOR_CLASS 12#define MY_CLASS ELM_COLORSELECTOR_CLASS
18 13
19#define MY_CLASS_NAME "Elm_Colorselector" 14#define MY_CLASS_NAME "Elm_Colorselector"
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 56da8bb71..13e95af09 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_priv.h" 8#include "elm_priv.h"
7#include "elm_widget_conform.h" 9#include "elm_widget_conform.h"
8#include "elm_widget_layout.h" 10#include "elm_widget_layout.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_CONFORMANT_CLASS 12#define MY_CLASS ELM_CONFORMANT_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Conformant" 14#define MY_CLASS_NAME "Elm_Conformant"
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 9c8d0c1a2..e9fa349b7 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -2,14 +2,12 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_priv.h" 8#include "elm_priv.h"
7#include "elm_widget_datetime.h" 9#include "elm_widget_datetime.h"
8 10
9#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
10#include "elm_interface_atspi_accessible.h"
11#include "elm_interface_atspi_accessible.eo.h"
12
13#define MY_CLASS ELM_DATETIME_CLASS 11#define MY_CLASS ELM_DATETIME_CLASS
14 12
15#define MY_CLASS_NAME "Elm_Datetime" 13#define MY_CLASS_NAME "Elm_Datetime"
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index fc718ca4e..b002922c0 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_priv.h" 8#include "elm_priv.h"
7#include "elm_widget_dayselector.h" 9#include "elm_widget_dayselector.h"
8#include "elm_widget_container.h" 10#include "elm_widget_container.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_DAYSELECTOR_CLASS 12#define MY_CLASS ELM_DAYSELECTOR_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Dayselector" 14#define MY_CLASS_NAME "Elm_Dayselector"
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index 304ded604..02b5d67f4 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -2,19 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6#include "elm_priv.h" 9#include "elm_priv.h"
7#include "elm_widget_diskselector.h" 10#include "elm_widget_diskselector.h"
8#include "elm_interface_scrollable.h" 11#include "elm_interface_scrollable.h"
9 12
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
15#include "elm_interface_atspi_widget_action.h"
16#include "elm_interface_atspi_widget_action.eo.h"
17
18#define DISPLAY_ITEM_NUM_MIN 3 13#define DISPLAY_ITEM_NUM_MIN 3
19 14
20#define MY_CLASS ELM_DISKSELECTOR_CLASS 15#define MY_CLASS ELM_DISKSELECTOR_CLASS
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index af407b61b..7582ff13a 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -2,6 +2,10 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED
7#define ELM_INTERFACE_ATSPI_EDITABLE_TEXT_PROTECTED
8
5#include <Elementary.h> 9#include <Elementary.h>
6#include <Elementary_Cursor.h> 10#include <Elementary_Cursor.h>
7#include "elm_priv.h" 11#include "elm_priv.h"
@@ -9,16 +13,6 @@
9 13
10#define MY_CLASS ELM_ENTRY_CLASS 14#define MY_CLASS ELM_ENTRY_CLASS
11 15
12#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
13#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED
14#define ELM_INTERFACE_ATSPI_EDITABLE_TEXT_PROTECTED
15
16#include "elm_interface_atspi_accessible.h"
17#include "elm_interface_atspi_accessible.eo.h"
18#include "elm_interface_atspi_text.h"
19#include "elm_interface_atspi_text.eo.h"
20#include "elm_interface_atspi_editable_text.eo.h"
21
22#define MY_CLASS_NAME "Elm_Entry" 16#define MY_CLASS_NAME "Elm_Entry"
23#define MY_CLASS_NAME_LEGACY "elm_entry" 17#define MY_CLASS_NAME_LEGACY "elm_entry"
24 18
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index a001c3118..99f7458c5 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_priv.h" 8#include "elm_priv.h"
7#include "elm_widget_flip.h" 9#include "elm_widget_flip.h"
8#include "elm_widget_container.h" 10#include "elm_widget_container.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_FLIP_CLASS 12#define MY_CLASS ELM_FLIP_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Flip" 14#define MY_CLASS_NAME "Elm_Flip"
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index fd90c4841..8d3ce1391 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -2,19 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6#include "elm_priv.h" 9#include "elm_priv.h"
7#include "elm_widget_flipselector.h" 10#include "elm_widget_flipselector.h"
8 11
9
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
15#include "elm_interface_atspi_widget_action.h"
16#include "elm_interface_atspi_widget_action.eo.h"
17
18#define MY_CLASS ELM_FLIPSELECTOR_CLASS 12#define MY_CLASS ELM_FLIPSELECTOR_CLASS
19 13
20#define MY_CLASS_NAME "Elm_Flipselector" 14#define MY_CLASS_NAME "Elm_Flipselector"
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index d32a7eb06..7720656cc 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_priv.h" 8#include "elm_priv.h"
7#include "elm_widget_frame.h" 9#include "elm_widget_frame.h"
8#include "elm_widget_layout.h" 10#include "elm_widget_layout.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_FRAME_CLASS 12#define MY_CLASS ELM_FRAME_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Frame" 14#define MY_CLASS_NAME "Elm_Frame"
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 9896479e8..9c2605b79 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -2,20 +2,15 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6#include <Elementary_Cursor.h> 9#include <Elementary_Cursor.h>
7#include "elm_priv.h" 10#include "elm_priv.h"
8#include "elm_widget_gengrid.h" 11#include "elm_widget_gengrid.h"
9#include "elm_interface_scrollable.h" 12#include "elm_interface_scrollable.h"
10 13
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
16#include "elm_interface_atspi_widget_action.h"
17#include "elm_interface_atspi_widget_action.eo.h"
18
19#define MY_PAN_CLASS ELM_GENGRID_PAN_CLASS 14#define MY_PAN_CLASS ELM_GENGRID_PAN_CLASS
20 15
21#define MY_PAN_CLASS_NAME "Elm_Gengrid_Pan" 16#define MY_PAN_CLASS_NAME "Elm_Gengrid_Pan"
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 9b4d8894d..061e0a4c2 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -4,6 +4,9 @@
4 4
5#include <fnmatch.h> 5#include <fnmatch.h>
6 6
7#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
8#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
9
7#include <Elementary.h> 10#include <Elementary.h>
8#include <Elementary_Cursor.h> 11#include <Elementary_Cursor.h>
9 12
@@ -11,14 +14,6 @@
11#include "elm_widget_genlist.h" 14#include "elm_widget_genlist.h"
12#include "elm_interface_scrollable.h" 15#include "elm_interface_scrollable.h"
13 16
14#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
15#include "elm_interface_atspi_accessible.h"
16#include "elm_interface_atspi_accessible.eo.h"
17
18#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
19#include "elm_interface_atspi_widget_action.h"
20#include "elm_interface_atspi_widget_action.eo.h"
21
22#define MY_PAN_CLASS ELM_GENLIST_PAN_CLASS 17#define MY_PAN_CLASS ELM_GENLIST_PAN_CLASS
23 18
24#define MY_PAN_CLASS_NAME "Elm_Genlist_Pan" 19#define MY_PAN_CLASS_NAME "Elm_Genlist_Pan"
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index d8056952f..26c11a83c 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_glview.h" 10#include "elm_widget_glview.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_GLVIEW_CLASS 12#define MY_CLASS ELM_GLVIEW_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Glview" 14#define MY_CLASS_NAME "Elm_Glview"
diff --git a/src/lib/elm_grid.c b/src/lib/elm_grid.c
index 6b41855e4..7c703519e 100644
--- a/src/lib/elm_grid.c
+++ b/src/lib/elm_grid.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_grid.h" 10#include "elm_widget_grid.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_GRID_CLASS 12#define MY_CLASS ELM_GRID_CLASS
15#define MY_CLASS_NAME "Elm_Grid" 13#define MY_CLASS_NAME "Elm_Grid"
16#define MY_CLASS_NAME_LEGACY "elm_grid" 14#define MY_CLASS_NAME_LEGACY "elm_grid"
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index ecb2e2288..66b6f612e 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_hover.h" 10#include "elm_widget_hover.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_HOVER_CLASS 12#define MY_CLASS ELM_HOVER_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Hover" 14#define MY_CLASS_NAME "Elm_Hover"
diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index 4af3b7a8e..55f426973 100644
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -2,6 +2,8 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
@@ -11,10 +13,6 @@
11#define NON_EXISTING (void *)-1 13#define NON_EXISTING (void *)-1
12static const char *icon_theme = NULL; 14static const char *icon_theme = NULL;
13 15
14#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
15#include "elm_interface_atspi_accessible.h"
16#include "elm_interface_atspi_accessible.eo.h"
17
18#define MY_CLASS ELM_ICON_CLASS 16#define MY_CLASS ELM_ICON_CLASS
19#define MY_CLASS_NAME "Elm_Icon" 17#define MY_CLASS_NAME "Elm_Icon"
20#define MY_CLASS_NAME_LEGACY "elm_icon" 18#define MY_CLASS_NAME_LEGACY "elm_icon"
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 2e9b41840..cab94bf65 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -2,22 +2,15 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
8
5#include <Elementary.h> 9#include <Elementary.h>
6 10
7#include "elm_priv.h" 11#include "elm_priv.h"
8#include "elm_widget_image.h" 12#include "elm_widget_image.h"
9 13
10#define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED
11#include "elm_interface_atspi_image.eo.h"
12
13#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
14#include "elm_interface_atspi_accessible.h"
15#include "elm_interface_atspi_accessible.eo.h"
16
17#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
18#include "elm_interface_atspi_widget_action.h"
19#include "elm_interface_atspi_widget_action.eo.h"
20
21#define FMT_SIZE_T "%zu" 14#define FMT_SIZE_T "%zu"
22 15
23#define MY_CLASS ELM_IMAGE_CLASS 16#define MY_CLASS ELM_IMAGE_CLASS
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index a94aa0728..9fd65b9e0 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -2,6 +2,8 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
@@ -9,10 +11,6 @@
9#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
10#include "elm_widget_index.h" 12#include "elm_widget_index.h"
11 13
12#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
13#include "elm_interface_atspi_accessible.h"
14#include "elm_interface_atspi_accessible.eo.h"
15
16#define MY_CLASS ELM_INDEX_CLASS 14#define MY_CLASS ELM_INDEX_CLASS
17 15
18#define MY_CLASS_NAME "Elm_Index" 16#define MY_CLASS_NAME "Elm_Index"
diff --git a/src/lib/elm_interface_atspi_accessible.c b/src/lib/elm_interface_atspi_accessible.c
index 7c2eb2326..4ddb36961 100644
--- a/src/lib/elm_interface_atspi_accessible.c
+++ b/src/lib/elm_interface_atspi_accessible.c
@@ -2,16 +2,12 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_widget.h" 8#include "elm_widget.h"
7#include "elm_priv.h" 9#include "elm_priv.h"
8 10
9#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
10
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14
15const char* Atspi_Name[] = { 11const char* Atspi_Name[] = {
16 "invalid", 12 "invalid",
17 "accelerator label", 13 "accelerator label",
@@ -273,7 +269,7 @@ _elm_interface_atspi_accessible_relation_set_get(Eo *obj EINA_UNUSED, void *pd E
273 return NULL; 269 return NULL;
274} 270}
275 271
276void elm_atspi_attributes_list_free(Eina_List *list) 272EAPI void elm_atspi_attributes_list_free(Eina_List *list)
277{ 273{
278 Elm_Atspi_Attribute *attr; 274 Elm_Atspi_Attribute *attr;
279 EINA_LIST_FREE(list, attr) 275 EINA_LIST_FREE(list, attr)
diff --git a/src/lib/elm_interface_atspi_accessible.eo b/src/lib/elm_interface_atspi_accessible.eo
index 28cf4679b..9ee5980ac 100644
--- a/src/lib/elm_interface_atspi_accessible.eo
+++ b/src/lib/elm_interface_atspi_accessible.eo
@@ -75,7 +75,7 @@ mixin Elm_Interface_Atspi_Accessible ()
75 int idx; 75 int idx;
76 } 76 }
77 } 77 }
78 description { 78 description @protected {
79 get { 79 get {
80 /*@ Gets widget contextual information. */ 80 /*@ Gets widget contextual information. */
81 } 81 }
diff --git a/src/lib/elm_interface_atspi_accessible.h b/src/lib/elm_interface_atspi_accessible.h
index b38ef0897..32c9b9520 100644
--- a/src/lib/elm_interface_atspi_accessible.h
+++ b/src/lib/elm_interface_atspi_accessible.h
@@ -1,3 +1,7 @@
1#ifndef ELM_INTERFACE_ATSPI_ACCESSIBLE_H
2#define ELM_INTERFACE_ATSPI_ACCESSIBLE_H
3
4#ifdef EFL_BETA_API_SUPPORT
1 5
2/** 6/**
3 * ATSPI object state set. 7 * ATSPI object state set.
@@ -250,7 +254,9 @@ typedef struct _Elm_Atspi_Relation Elm_Atspi_Relation;
250/** 254/**
251 * Free Elm_Atspi_Attributes_List 255 * Free Elm_Atspi_Attributes_List
252 */ 256 */
253void elm_atspi_attributes_list_free(Eina_List *list); 257EAPI void elm_atspi_attributes_list_free(Eina_List *list);
258
259#ifdef EFL_EO_API_SUPPORT
254 260
255/** 261/**
256 * Emits ATSPI 'StateChanged' dbus signal. 262 * Emits ATSPI 'StateChanged' dbus signal.
@@ -316,3 +322,12 @@ void elm_atspi_attributes_list_free(Eina_List *list);
316 */ 322 */
317#define elm_interface_atspi_accessible_active_descendants_changed_signal_emit(obj, desc) \ 323#define elm_interface_atspi_accessible_active_descendants_changed_signal_emit(obj, desc) \
318 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, desc)); 324 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, desc));
325
326#include "elm_interface_atspi_accessible.eo.h"
327#endif
328#ifndef EFL_NOLEGACY_API_SUPPORT
329#include "elm_interface_atspi_accessible.eo.legacy.h"
330#endif
331
332#endif
333#endif
diff --git a/src/lib/elm_interface_atspi_action.c b/src/lib/elm_interface_atspi_action.c
index ef3d9d07e..14e3808fd 100644
--- a/src/lib/elm_interface_atspi_action.c
+++ b/src/lib/elm_interface_atspi_action.c
@@ -2,14 +2,12 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_widget.h" 8#include "elm_widget.h"
7#include "elm_priv.h" 9#include "elm_priv.h"
8 10
9#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED
10
11#include "elm_interface_atspi_action.eo.h"
12
13EOLIAN const char * 11EOLIAN const char *
14_elm_interface_atspi_action_localized_name_get(Eo *obj, void *pd EINA_UNUSED, int id) 12_elm_interface_atspi_action_localized_name_get(Eo *obj, void *pd EINA_UNUSED, int id)
15{ 13{
diff --git a/src/lib/elm_interface_atspi_component.c b/src/lib/elm_interface_atspi_component.c
index 0f0f48a95..6218df4a2 100644
--- a/src/lib/elm_interface_atspi_component.c
+++ b/src/lib/elm_interface_atspi_component.c
@@ -3,14 +3,10 @@
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED 5#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
6#include "atspi/atspi-constants.h"
7 6
8#include <Elementary.h> 7#include <Elementary.h>
9 8
10#include "elm_priv.h" 9#include "elm_priv.h"
11#include "elm_interface_atspi_component.eo.h"
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14 10
15 11
16EOLIAN static void 12EOLIAN static void
diff --git a/src/lib/elm_interface_atspi_component.eo b/src/lib/elm_interface_atspi_component.eo
index 39c77cef3..9955ffbcf 100644
--- a/src/lib/elm_interface_atspi_component.eo
+++ b/src/lib/elm_interface_atspi_component.eo
@@ -92,7 +92,7 @@ mixin Elm_Interface_Atspi_Component ()
92 } 92 }
93 return: bool; 93 return: bool;
94 } 94 }
95 focus_grab { 95 focus_grab @protected {
96 /*@ Focuses accessible widget. 96 /*@ Focuses accessible widget.
97 97
98 @return true if focus grab focus has successed, false otherwise. */ 98 @return true if focus grab focus has successed, false otherwise. */
diff --git a/src/lib/elm_interface_atspi_editable_text.c b/src/lib/elm_interface_atspi_editable_text.c
index 8a0a9c9a8..bebe223db 100644
--- a/src/lib/elm_interface_atspi_editable_text.c
+++ b/src/lib/elm_interface_atspi_editable_text.c
@@ -2,11 +2,10 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_EDITABLE_TEXT_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_widget.h" 8#include "elm_widget.h"
7#include "elm_priv.h" 9#include "elm_priv.h"
8 10
9#define ELM_INTERFACE_ATSPI_EDITABLE_TEXT_PROTECTED
10
11#include "elm_interface_atspi_editable_text.eo.h"
12#include "elm_interface_atspi_editable_text.eo.c" 11#include "elm_interface_atspi_editable_text.eo.c"
diff --git a/src/lib/elm_interface_atspi_image.c b/src/lib/elm_interface_atspi_image.c
index bc4df190a..05c39284f 100644
--- a/src/lib/elm_interface_atspi_image.c
+++ b/src/lib/elm_interface_atspi_image.c
@@ -2,14 +2,12 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_widget.h" 8#include "elm_widget.h"
7#include "elm_priv.h" 9#include "elm_priv.h"
8 10
9#define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED
10
11#include "elm_interface_atspi_image.eo.h"
12
13static void 11static void
14_free_desc(void *data) 12_free_desc(void *data)
15{ 13{
diff --git a/src/lib/elm_interface_atspi_image.eo b/src/lib/elm_interface_atspi_image.eo
index 5483efc3d..6d9ea8071 100644
--- a/src/lib/elm_interface_atspi_image.eo
+++ b/src/lib/elm_interface_atspi_image.eo
@@ -18,7 +18,7 @@ mixin Elm_Interface_Atspi_Image ()
18 int height; 18 int height;
19 } 19 }
20 } 20 }
21 description { 21 description @protected {
22 get { 22 get {
23 /* Gets textual description of image */ 23 /* Gets textual description of image */
24 } 24 }
diff --git a/src/lib/elm_interface_atspi_selection.c b/src/lib/elm_interface_atspi_selection.c
index 31519f48b..5e2c1e70f 100644
--- a/src/lib/elm_interface_atspi_selection.c
+++ b/src/lib/elm_interface_atspi_selection.c
@@ -2,11 +2,10 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_widget.h" 8#include "elm_widget.h"
7#include "elm_priv.h" 9#include "elm_priv.h"
8 10
9#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
10
11#include "elm_interface_atspi_selection.eo.h"
12#include "elm_interface_atspi_selection.eo.c" 11#include "elm_interface_atspi_selection.eo.c"
diff --git a/src/lib/elm_interface_atspi_text.c b/src/lib/elm_interface_atspi_text.c
index 39e0e771a..792d27c4c 100644
--- a/src/lib/elm_interface_atspi_text.c
+++ b/src/lib/elm_interface_atspi_text.c
@@ -2,17 +2,14 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_widget.h" 8#include "elm_widget.h"
7#include "elm_priv.h" 9#include "elm_priv.h"
8 10
9#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED
10
11#include "elm_interface_atspi_text.h"
12#include "elm_interface_atspi_text.eo.h"
13
14void 11void
15elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr) 12EAPI elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr)
16{ 13{
17 if (!attr) return; 14 if (!attr) return;
18 if (attr->name) eina_stringshare_del(attr->name); 15 if (attr->name) eina_stringshare_del(attr->name);
diff --git a/src/lib/elm_interface_atspi_text.h b/src/lib/elm_interface_atspi_text.h
index 2af43652d..be1abc688 100644
--- a/src/lib/elm_interface_atspi_text.h
+++ b/src/lib/elm_interface_atspi_text.h
@@ -1,3 +1,7 @@
1#ifndef ELM_INTERFACE_ATSPI_TEXT_H
2#define ELM_INTERFACE_ATSPI_TEXT_H
3
4#ifdef EFL_BETA_API_SUPPORT
1 5
2enum _Elm_Atspi_Text_Granulatity 6enum _Elm_Atspi_Text_Granulatity
3{ 7{
@@ -40,7 +44,7 @@ typedef enum _Elm_Atspi_Text_Clip_Type Elm_Atspi_Text_Clip_Type;
40/** 44/**
41 * @brief Free Elm_Atspi_Text_Attribute structure 45 * @brief Free Elm_Atspi_Text_Attribute structure
42 */ 46 */
43void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr); 47EAPI void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr);
44 48
45typedef struct _Elm_Atspi_Text_Change_Info Elm_Atspi_Text_Change_Info; 49typedef struct _Elm_Atspi_Text_Change_Info Elm_Atspi_Text_Change_Info;
46 50
@@ -51,3 +55,13 @@ struct _Elm_Atspi_Text_Change_Info
51 size_t pos; 55 size_t pos;
52 size_t len; 56 size_t len;
53}; 57};
58
59#ifdef EFL_EO_API_SUPPORT
60#include "elm_interface_atspi_text.eo.h"
61#endif
62#ifndef EFL_NOLEGACY_API_SUPPORT
63#include "elm_interface_atspi_text.eo.legacy.h"
64#endif
65
66#endif
67#endif
diff --git a/src/lib/elm_interface_atspi_value.c b/src/lib/elm_interface_atspi_value.c
index f42f03b84..f51a0a9a4 100644
--- a/src/lib/elm_interface_atspi_value.c
+++ b/src/lib/elm_interface_atspi_value.c
@@ -2,11 +2,10 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6#include "elm_widget.h" 8#include "elm_widget.h"
7#include "elm_priv.h" 9#include "elm_priv.h"
8 10
9#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
10
11#include "elm_interface_atspi_value.eo.h"
12#include "elm_interface_atspi_value.eo.c" 11#include "elm_interface_atspi_value.eo.c"
diff --git a/src/lib/elm_interface_atspi_widget.c b/src/lib/elm_interface_atspi_widget.c
index c524611b5..cf04d89fa 100644
--- a/src/lib/elm_interface_atspi_widget.c
+++ b/src/lib/elm_interface_atspi_widget.c
@@ -2,20 +2,15 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6#include "elm_widget.h" 9#include "elm_widget.h"
7#include "elm_priv.h" 10#include "elm_priv.h"
8 11
9#include "assert.h" 12#include "assert.h"
10 13
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
13
14#include "elm_interface_atspi_accessible.h"
15#include "elm_interface_atspi_accessible.eo.h"
16#include "elm_interface_atspi_component.eo.h"
17#include "elm_interface_atspi_widget.eo.h"
18
19typedef struct _Elm_Interface_Atspi_Widget_Data Elm_Interface_Atspi_Widget_Data; 14typedef struct _Elm_Interface_Atspi_Widget_Data Elm_Interface_Atspi_Widget_Data;
20 15
21struct _Elm_Interface_Atspi_Widget_Data { 16struct _Elm_Interface_Atspi_Widget_Data {
diff --git a/src/lib/elm_interface_atspi_widget_action.c b/src/lib/elm_interface_atspi_widget_action.c
index 8ab5e06f5..1cc2b5805 100644
--- a/src/lib/elm_interface_atspi_widget_action.c
+++ b/src/lib/elm_interface_atspi_widget_action.c
@@ -2,16 +2,12 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#include <Elementary.h>
6#include "elm_widget.h"
7#include "elm_priv.h"
8
9#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED 5#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED
10#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
11 7
12#include "elm_interface_atspi_action.eo.h" 8#include <Elementary.h>
13#include "elm_interface_atspi_widget_action.h" 9#include "elm_widget.h"
14#include "elm_interface_atspi_widget_action.eo.h" 10#include "elm_priv.h"
15 11
16extern Eina_Hash *_elm_key_bindings; 12extern Eina_Hash *_elm_key_bindings;
17 13
diff --git a/src/lib/elm_interface_atspi_widget_action.h b/src/lib/elm_interface_atspi_widget_action.h
index 8002edfe4..329e22941 100644
--- a/src/lib/elm_interface_atspi_widget_action.h
+++ b/src/lib/elm_interface_atspi_widget_action.h
@@ -1,3 +1,7 @@
1#ifndef ELM_INTERFACE_ATSPI_WIDGET_ACTION_H
2#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_H
3
4#ifdef EFL_BETA_API_SUPPORT
1 5
2struct _Elm_Atspi_Action 6struct _Elm_Atspi_Action
3{ 7{
@@ -8,3 +12,13 @@ struct _Elm_Atspi_Action
8}; 12};
9 13
10typedef struct _Elm_Atspi_Action Elm_Atspi_Action; 14typedef struct _Elm_Atspi_Action Elm_Atspi_Action;
15
16#ifdef EFL_EO_API_SUPPORT
17#include "elm_interface_atspi_widget_action.eo.h"
18#endif
19#ifndef EFL_NOLEGACY_API_SUPPORT
20#include "elm_interface_atspi_widget_action.eo.legacy.h"
21#endif
22
23#endif
24#endif
diff --git a/src/lib/elm_interface_atspi_window.c b/src/lib/elm_interface_atspi_window.c
index 6a4580020..7ef0c18b2 100644
--- a/src/lib/elm_interface_atspi_window.c
+++ b/src/lib/elm_interface_atspi_window.c
@@ -6,5 +6,4 @@
6#include "elm_widget.h" 6#include "elm_widget.h"
7#include "elm_priv.h" 7#include "elm_priv.h"
8 8
9#include "elm_interface_atspi_window.eo.h"
10#include "elm_interface_atspi_window.eo.c" 9#include "elm_interface_atspi_window.eo.c"
diff --git a/src/lib/elm_interfaces.h b/src/lib/elm_interfaces.h
index aa170aa9b..a77c8cb65 100644
--- a/src/lib/elm_interfaces.h
+++ b/src/lib/elm_interfaces.h
@@ -1,5 +1,29 @@
1#include "elm_interface_atspi_accessible.h"
2#include "elm_interface_atspi_text.h"
3#include "elm_interface_atspi_widget_action.h"
4
1#ifdef EFL_EO_API_SUPPORT 5#ifdef EFL_EO_API_SUPPORT
2#include "elm_interface_scrollable.h" 6#include "elm_interface_scrollable.h"
7#ifdef EFL_BETA_API_SUPPORT
8#include "elm_interface_atspi_action.eo.h"
9#include "elm_interface_atspi_component.eo.h"
10#include "elm_interface_atspi_editable_text.eo.h"
11#include "elm_interface_atspi_image.eo.h"
12#include "elm_interface_atspi_selection.eo.h"
13#include "elm_interface_atspi_value.eo.h"
14#include "elm_interface_atspi_widget.eo.h"
15#include "elm_interface_atspi_window.eo.h"
16#endif
3#endif 17#endif
4#ifndef EFL_NOLEGACY_API_SUPPORT 18#ifndef EFL_NOLEGACY_API_SUPPORT
19#ifdef EFL_BETA_API_SUPPORT
20#include "elm_interface_atspi_action.eo.legacy.h"
21#include "elm_interface_atspi_component.eo.legacy.h"
22#include "elm_interface_atspi_editable_text.eo.legacy.h"
23#include "elm_interface_atspi_image.eo.legacy.h"
24#include "elm_interface_atspi_selection.eo.legacy.h"
25#include "elm_interface_atspi_value.eo.legacy.h"
26#include "elm_interface_atspi_widget.eo.legacy.h"
27#include "elm_interface_atspi_window.eo.legacy.h"
28#endif
5#endif 29#endif
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index cf6a21cec..f6abc2cc9 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -2,16 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_inwin.h" 10#include "elm_widget_inwin.h"
9#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
10 12
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define MY_CLASS ELM_INWIN_CLASS 13#define MY_CLASS ELM_INWIN_CLASS
16 14
17#define MY_CLASS_NAME "Elm_Inwin" 15#define MY_CLASS_NAME "Elm_Inwin"
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index dc938f2f1..24c6474dd 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -2,16 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_layout.h" 10#include "elm_widget_layout.h"
9#include "elm_widget_label.h" 11#include "elm_widget_label.h"
10 12
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define MY_CLASS ELM_LABEL_CLASS 13#define MY_CLASS ELM_LABEL_CLASS
16 14
17#define MY_CLASS_NAME "Elm_Label" 15#define MY_CLASS_NAME "Elm_Label"
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 59e041046..7c0675e2c 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_layout.h" 10#include "elm_widget_layout.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_LAYOUT_CLASS 12#define MY_CLASS ELM_LAYOUT_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Layout" 14#define MY_CLASS_NAME "Elm_Layout"
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 25ed9c703..37c3b9d2b 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -2,20 +2,15 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6 9
7#include "elm_priv.h" 10#include "elm_priv.h"
8#include "elm_widget_list.h" 11#include "elm_widget_list.h"
9#include "elm_interface_scrollable.h" 12#include "elm_interface_scrollable.h"
10 13
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
16#include "elm_interface_atspi_widget_action.h"
17#include "elm_interface_atspi_widget_action.eo.h"
18
19#define MY_CLASS ELM_LIST_CLASS 14#define MY_CLASS ELM_LIST_CLASS
20 15
21#define MY_CLASS_NAME "Elm_List" 16#define MY_CLASS_NAME "Elm_List"
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 6d28fbdfc..ea574e981 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -2,20 +2,15 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6 9
7#include "elm_priv.h" 10#include "elm_priv.h"
8#include "elm_widget_map.h" 11#include "elm_widget_map.h"
9#include "elm_interface_scrollable.h" 12#include "elm_interface_scrollable.h"
10 13
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
16#include "elm_interface_atspi_widget_action.h"
17#include "elm_interface_atspi_widget_action.eo.h"
18
19#define MY_PAN_CLASS ELM_MAP_PAN_CLASS 14#define MY_PAN_CLASS ELM_MAP_PAN_CLASS
20 15
21#define MY_PAN_CLASS_NAME "Elm_Map_Pan" 16#define MY_PAN_CLASS_NAME "Elm_Map_Pan"
diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index 367f99e79..cf2f7fcbb 100644
--- a/src/lib/elm_mapbuf.c
+++ b/src/lib/elm_mapbuf.c
@@ -2,16 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_mapbuf.h" 10#include "elm_widget_mapbuf.h"
9#include "elm_widget_container.h" 11#include "elm_widget_container.h"
10 12
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define MY_CLASS ELM_MAPBUF_CLASS 13#define MY_CLASS ELM_MAPBUF_CLASS
16 14
17#define MY_CLASS_NAME "Elm_Mapbuf" 15#define MY_CLASS_NAME "Elm_Mapbuf"
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 95ce2bb66..cf255f76a 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_menu.h" 10#include "elm_widget_menu.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_MENU_CLASS 12#define MY_CLASS ELM_MENU_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Menu" 14#define MY_CLASS_NAME "Elm_Menu"
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 60307a19c..92bff9612 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -2,16 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_notify.h" 10#include "elm_widget_notify.h"
9#include "elm_widget_container.h" 11#include "elm_widget_container.h"
10 12
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define MY_CLASS ELM_NOTIFY_CLASS 13#define MY_CLASS ELM_NOTIFY_CLASS
16 14
17#define MY_CLASS_NAME "Elm_Notify" 15#define MY_CLASS_NAME "Elm_Notify"
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 945ca6b2e..65e778a56 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -2,6 +2,9 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6 9
7#include "elm_priv.h" 10#include "elm_priv.h"
@@ -9,14 +12,6 @@
9 12
10#include "els_box.h" 13#include "els_box.h"
11 14
12#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
13#include "elm_interface_atspi_accessible.h"
14#include "elm_interface_atspi_accessible.eo.h"
15
16#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
17#include "elm_interface_atspi_widget_action.h"
18#include "elm_interface_atspi_widget_action.eo.h"
19
20#define MY_CLASS ELM_PANEL_CLASS 15#define MY_CLASS ELM_PANEL_CLASS
21 16
22#define MY_CLASS_NAME "Elm_Panel" 17#define MY_CLASS_NAME "Elm_Panel"
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 5c0bc1ab3..0f8d2a422 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -2,16 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_layout.h" 10#include "elm_widget_layout.h"
9#include "elm_widget_panes.h" 11#include "elm_widget_panes.h"
10 12
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define MY_CLASS ELM_PANES_CLASS 13#define MY_CLASS ELM_PANES_CLASS
16 14
17#define MY_CLASS_NAME "Elm_Panes" 15#define MY_CLASS_NAME "Elm_Panes"
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index c14c3579b..d16a54cd1 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_photo.h" 10#include "elm_widget_photo.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_PHOTO_CLASS 12#define MY_CLASS ELM_PHOTO_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Photo" 14#define MY_CLASS_NAME "Elm_Photo"
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index efeca6697..dc88c0b06 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -2,20 +2,15 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6 9
7#include "elm_priv.h" 10#include "elm_priv.h"
8#include "elm_widget_photocam.h" 11#include "elm_widget_photocam.h"
9#include "elm_interface_scrollable.h" 12#include "elm_interface_scrollable.h"
10 13
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
16#include "elm_interface_atspi_widget_action.h"
17#include "elm_interface_atspi_widget_action.eo.h"
18
19#define MY_PAN_CLASS ELM_PHOTOCAM_PAN_CLASS 14#define MY_PAN_CLASS ELM_PHOTOCAM_PAN_CLASS
20 15
21#define MY_PAN_CLASS_NAME "Elm_Photocam_Pan" 16#define MY_PAN_CLASS_NAME "Elm_Photocam_Pan"
diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index a6680981e..68bcd8b04 100644
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_plug.h" 10#include "elm_widget_plug.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_PLUG_CLASS 12#define MY_CLASS ELM_PLUG_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Plug" 14#define MY_CLASS_NAME "Elm_Plug"
diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index 12e430293..822f7c958 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -2,6 +2,8 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
@@ -10,10 +12,6 @@
10 12
11#include "Eo.h" 13#include "Eo.h"
12 14
13#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
14#include "elm_interface_atspi_accessible.h"
15#include "elm_interface_atspi_accessible.eo.h"
16
17#define MY_CLASS ELM_PREFS_CLASS 15#define MY_CLASS ELM_PREFS_CLASS
18 16
19#define MY_CLASS_NAME "Elm_Prefs" 17#define MY_CLASS_NAME "Elm_Prefs"
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index fd85bc61c..27b7d3bb6 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -2,16 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_progressbar.h" 10#include "elm_widget_progressbar.h"
9#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
10 12
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define MY_CLASS ELM_PROGRESSBAR_CLASS 13#define MY_CLASS ELM_PROGRESSBAR_CLASS
16 14
17#define MY_CLASS_NAME "Elm_Progressbar" 15#define MY_CLASS_NAME "Elm_Progressbar"
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 0a4741e33..da253f1f3 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -2,20 +2,15 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6 9
7#include "elm_priv.h" 10#include "elm_priv.h"
8#include "elm_widget_radio.h" 11#include "elm_widget_radio.h"
9#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
10 13
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
16#include "elm_interface_atspi_widget_action.h"
17#include "elm_interface_atspi_widget_action.eo.h"
18
19#define MY_CLASS ELM_RADIO_CLASS 14#define MY_CLASS ELM_RADIO_CLASS
20 15
21#define MY_CLASS_NAME "Elm_Radio" 16#define MY_CLASS_NAME "Elm_Radio"
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index fc26e68d1..c59c0fbd3 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -2,6 +2,9 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6 9
7#include "elm_priv.h" 10#include "elm_priv.h"
@@ -9,14 +12,6 @@
9#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
10#include "elm_widget_scroller.h" 13#include "elm_widget_scroller.h"
11 14
12#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
13#include "elm_interface_atspi_accessible.h"
14#include "elm_interface_atspi_accessible.eo.h"
15
16#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
17#include "elm_interface_atspi_widget_action.h"
18#include "elm_interface_atspi_widget_action.eo.h"
19
20#define MY_CLASS ELM_SCROLLER_CLASS 15#define MY_CLASS ELM_SCROLLER_CLASS
21 16
22#define MY_CLASS_NAME "Elm_Scroller" 17#define MY_CLASS_NAME "Elm_Scroller"
diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index c256ceb2f..5b9522002 100644
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_segment_control.h" 10#include "elm_widget_segment_control.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_SEGMENT_CONTROL_CLASS 12#define MY_CLASS ELM_SEGMENT_CONTROL_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Segment_Control" 14#define MY_CLASS_NAME "Elm_Segment_Control"
diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c
index fd95d8a25..55d9a9b2a 100644
--- a/src/lib/elm_separator.c
+++ b/src/lib/elm_separator.c
@@ -2,16 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_separator.h" 10#include "elm_widget_separator.h"
9#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
10 12
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define MY_CLASS ELM_SEPARATOR_CLASS 13#define MY_CLASS ELM_SEPARATOR_CLASS
16 14
17#define MY_CLASS_NAME "Elm_Separator" 15#define MY_CLASS_NAME "Elm_Separator"
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index ea753d543..82707ec08 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -2,23 +2,16 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
8
5#include <Elementary.h> 9#include <Elementary.h>
6 10
7#include "elm_priv.h" 11#include "elm_priv.h"
8#include "elm_widget_slider.h" 12#include "elm_widget_slider.h"
9#include "elm_widget_layout.h" 13#include "elm_widget_layout.h"
10 14
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
16#include "elm_interface_atspi_widget_action.h"
17#include "elm_interface_atspi_widget_action.eo.h"
18
19#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
20#include "elm_interface_atspi_value.eo.h"
21
22#define MY_CLASS ELM_SLIDER_CLASS 15#define MY_CLASS ELM_SLIDER_CLASS
23 16
24#define MY_CLASS_NAME "Elm_Slider" 17#define MY_CLASS_NAME "Elm_Slider"
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index ae4d00bdc..7e930e2bc 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -2,19 +2,14 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6 9
7#include "elm_priv.h" 10#include "elm_priv.h"
8#include "elm_widget_slideshow.h" 11#include "elm_widget_slideshow.h"
9 12
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
15#include "elm_interface_atspi_widget_action.h"
16#include "elm_interface_atspi_widget_action.eo.h"
17
18#define MY_CLASS ELM_SLIDESHOW_CLASS 13#define MY_CLASS ELM_SLIDESHOW_CLASS
19 14
20#define MY_CLASS_NAME "Elm_Slideshow" 15#define MY_CLASS_NAME "Elm_Slideshow"
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 20b1c0cec..7043b3959 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -2,6 +2,10 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
8
5#include <Elementary.h> 9#include <Elementary.h>
6#include <ctype.h> 10#include <ctype.h>
7 11
@@ -10,17 +14,6 @@
10 14
11#include "Eo.h" 15#include "Eo.h"
12 16
13#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
14#include "elm_interface_atspi_accessible.h"
15#include "elm_interface_atspi_accessible.eo.h"
16
17#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
18#include "elm_interface_atspi_value.eo.h"
19
20#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
21#include "elm_interface_atspi_widget_action.h"
22#include "elm_interface_atspi_widget_action.eo.h"
23
24#define MY_CLASS ELM_SPINNER_CLASS 17#define MY_CLASS ELM_SPINNER_CLASS
25 18
26#define MY_CLASS_NAME "Elm_Spinner" 19#define MY_CLASS_NAME "Elm_Spinner"
diff --git a/src/lib/elm_table.c b/src/lib/elm_table.c
index b39db12b8..973c5b9a5 100644
--- a/src/lib/elm_table.c
+++ b/src/lib/elm_table.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_table.h" 10#include "elm_widget_table.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS ELM_TABLE_CLASS 12#define MY_CLASS ELM_TABLE_CLASS
15 13
16#define MY_CLASS_NAME "Elm_Table" 14#define MY_CLASS_NAME "Elm_Table"
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index 1b3749c53..ddc91345f 100644
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -2,15 +2,13 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
8#include "elm_widget_thumb.h" 10#include "elm_widget_thumb.h"
9 11
10#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
11#include "elm_interface_atspi_accessible.h"
12#include "elm_interface_atspi_accessible.eo.h"
13
14#define MY_CLASS_NAME "Elm_Thumb" 12#define MY_CLASS_NAME "Elm_Thumb"
15#define MY_CLASS_NAME_LEGACY "elm_thumb" 13#define MY_CLASS_NAME_LEGACY "elm_thumb"
16 14
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 82793e4c9..29e1171b4 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -2,20 +2,15 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6 9
7#include "elm_priv.h" 10#include "elm_priv.h"
8#include "elm_widget_toolbar.h" 11#include "elm_widget_toolbar.h"
9#include "els_box.h" 12#include "els_box.h"
10 13
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12#include "elm_interface_atspi_accessible.h"
13#include "elm_interface_atspi_accessible.eo.h"
14
15#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
16#include "elm_interface_atspi_widget_action.h"
17#include "elm_interface_atspi_widget_action.eo.h"
18
19#define MY_CLASS ELM_TOOLBAR_CLASS 14#define MY_CLASS ELM_TOOLBAR_CLASS
20 15
21#define MY_CLASS_NAME "Elm_Toolbar" 16#define MY_CLASS_NAME "Elm_Toolbar"
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index c4b25eea2..b589dd29d 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -4,6 +4,9 @@
4 4
5#include <Emotion.h> 5#include <Emotion.h>
6 6
7#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
8#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
9
7#include <Elementary.h> 10#include <Elementary.h>
8 11
9#include "elm_priv.h" 12#include "elm_priv.h"
@@ -13,14 +16,6 @@
13/* TODO: add buffering support to Emotion and display buffering 16/* TODO: add buffering support to Emotion and display buffering
14 * progress in the theme when needed */ 17 * progress in the theme when needed */
15 18
16#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
17#include "elm_interface_atspi_accessible.h"
18#include "elm_interface_atspi_accessible.eo.h"
19
20#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
21#include "elm_interface_atspi_widget_action.h"
22#include "elm_interface_atspi_widget_action.eo.h"
23
24#define MY_CLASS ELM_VIDEO_CLASS 19#define MY_CLASS ELM_VIDEO_CLASS
25 20
26#define MY_CLASS_NAME "Elm_Video" 21#define MY_CLASS_NAME "Elm_Video"
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index ad4aa3f6a..4106693ff 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -2,6 +2,8 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6
5#include <Elementary.h> 7#include <Elementary.h>
6 8
7#include "elm_priv.h" 9#include "elm_priv.h"
@@ -11,10 +13,6 @@
11#include <EWebKit2.h> 13#include <EWebKit2.h>
12#endif 14#endif
13 15
14#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
15#include "elm_interface_atspi_accessible.h"
16#include "elm_interface_atspi_accessible.eo.h"
17
18#define MY_CLASS ELM_WEB_CLASS 16#define MY_CLASS ELM_WEB_CLASS
19 17
20#define MY_CLASS_NAME "Elm_Web" 18#define MY_CLASS_NAME "Elm_Web"
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index d6af6ffbe..ab312b915 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -7,7 +7,6 @@
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_widget_container.h" 8#include "elm_widget_container.h"
9#include "elm_interface_scrollable.h" 9#include "elm_interface_scrollable.h"
10#include "elm_interface_atspi_widget.eo.h"
11 10
12#define MY_CLASS ELM_WIDGET_CLASS 11#define MY_CLASS ELM_WIDGET_CLASS
13 12
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index c7e346697..8945f54f9 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2,23 +2,15 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7
5#include <Elementary.h> 8#include <Elementary.h>
6#include <Elementary_Cursor.h> 9#include <Elementary_Cursor.h>
7 10
8#include "elm_priv.h" 11#include "elm_priv.h"
9#include "elm_widget_menu.h" 12#include "elm_widget_menu.h"
10 13
11#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
12
13#include "elm_interface_atspi_accessible.h"
14#include "elm_interface_atspi_accessible.eo.h"
15#include "elm_interface_atspi_window.eo.h"
16#include "elm_interface_atspi_widget.eo.h"
17
18#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
19#include "elm_interface_atspi_widget_action.h"
20#include "elm_interface_atspi_widget_action.eo.h"
21
22#define MY_CLASS ELM_WIN_CLASS 14#define MY_CLASS ELM_WIN_CLASS
23 15
24#define MY_CLASS_NAME "Elm_Win" 16#define MY_CLASS_NAME "Elm_Win"