jackdanielz pushed a commit to branch master.
commit 6c522dc5d330f3f72a7fb218c770e18d543c5f08
Author: Daniel Zaoui <[email protected]>
Date: Sun Apr 28 09:57:48 2013 +0300
Elementary: Conform header split.
---
src/lib/elm_conform.h | 30 ++++++------------------------
src/lib/elm_conform_eo.h | 10 ++++++++++
src/lib/elm_conform_legacy.h | 13 +++++++++++++
3 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/src/lib/elm_conform.h b/src/lib/elm_conform.h
index cf073c3..a491b95 100644
--- a/src/lib/elm_conform.h
+++ b/src/lib/elm_conform.h
@@ -45,35 +45,17 @@
* @ref conformant_example
*/
-#define ELM_OBJ_CONFORMANT_CLASS elm_obj_conformant_class_get()
-
-const Eo_Class *elm_obj_conformant_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_CONFORMANT_BASE_ID;
-
-enum
-{
- ELM_OBJ_CONFORMANT_SUB_ID_LAST
-};
-
/**
* @addtogroup Conformant
* @{
*/
-/**
- * Add a new conformant widget to the given parent Elementary
- * (container) object.
- *
- * @param parent The parent object.
- * @return A new conformant widget handle or @c NULL, on errors.
- *
- * This function inserts a new conformant widget on the canvas.
- *
- * @ingroup Conformant
- */
-EAPI Evas_Object *elm_conformant_add(Evas_Object *parent);
-
+#ifdef EFL_EO_API_SUPPORT
+#include "elm_conform_eo.h"
+#endif
+#ifndef EFL_NOLEGACY_API_SUPPORT
+#include "elm_conform_legacy.h"
+#endif
/**
* @}
*/
diff --git a/src/lib/elm_conform_eo.h b/src/lib/elm_conform_eo.h
new file mode 100644
index 0000000..1ceb3c4
--- /dev/null
+++ b/src/lib/elm_conform_eo.h
@@ -0,0 +1,10 @@
+#define ELM_OBJ_CONFORMANT_CLASS elm_obj_conformant_class_get()
+
+const Eo_Class *elm_obj_conformant_class_get(void) EINA_CONST;
+
+extern EAPI Eo_Op ELM_OBJ_CONFORMANT_BASE_ID;
+
+enum
+{
+ ELM_OBJ_CONFORMANT_SUB_ID_LAST
+};
diff --git a/src/lib/elm_conform_legacy.h b/src/lib/elm_conform_legacy.h
new file mode 100644
index 0000000..e47991a
--- /dev/null
+++ b/src/lib/elm_conform_legacy.h
@@ -0,0 +1,13 @@
+/**
+ * Add a new conformant widget to the given parent Elementary
+ * (container) object.
+ *
+ * @param parent The parent object.
+ * @return A new conformant widget handle or @c NULL, on errors.
+ *
+ * This function inserts a new conformant widget on the canvas.
+ *
+ * @ingroup Conformant
+ */
+EAPI Evas_Object *elm_conformant_add(Evas_Object *parent);
+
--
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr