summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2019-10-03 12:19:03 +0200
committerXavi Artigas <xavierartigas@yahoo.es>2019-10-03 12:19:03 +0200
commitb8fd0c3b74d5a7c9db92c187daddfdf2a3add4c9 (patch)
tree61700070f602ca1e66370b9aa2679d6ed0ade666
parent0a23c904cbfd702d52e2cab260b40ad06d6b0f58 (diff)
Adapt examples to latest Unified API changes
Efl.Ui.Text headers have to be manually included for now, since they still depend on Legacy headers. Padding API has lost a parameter.
-rw-r--r--apps/c/texteditor/src/texteditor_main.c4
-rw-r--r--reference/c/ui/src/focus_main.c4
-rw-r--r--reference/c/ui/src/ui_container.c5
-rw-r--r--reference/csharp/ui/src/ui_container.cs2
-rw-r--r--tutorial/c/hello-gui/src/gui_main.c4
5 files changed, 13 insertions, 6 deletions
diff --git a/apps/c/texteditor/src/texteditor_main.c b/apps/c/texteditor/src/texteditor_main.c
index 7a5501b..bc70b61 100644
--- a/apps/c/texteditor/src/texteditor_main.c
+++ b/apps/c/texteditor/src/texteditor_main.c
@@ -1,8 +1,10 @@
1#define EFL_BETA_API_SUPPORT 1 1#define EFL_BETA_API_SUPPORT 1
2 2
3#include <Eina.h>
4#include <Elementary.h> 3#include <Elementary.h>
5#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5// Temporary workaround until Unified Text stops using Legacy classes internally
6#include <efl_ui_text.eo.h>
7#include <efl_text_interactive.eo.h>
6 8
7Efl_Ui_Text *_editor; 9Efl_Ui_Text *_editor;
8Efl_Ui_Button *_toolbar_new; 10Efl_Ui_Button *_toolbar_new;
diff --git a/reference/c/ui/src/focus_main.c b/reference/c/ui/src/focus_main.c
index 5bd14dd..d4f678e 100644
--- a/reference/c/ui/src/focus_main.c
+++ b/reference/c/ui/src/focus_main.c
@@ -1,8 +1,10 @@
1#define EFL_BETA_API_SUPPORT 1 1#define EFL_BETA_API_SUPPORT 1
2 2
3#include <Eina.h>
4#include <Elementary.h> 3#include <Elementary.h>
5#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5// Temporary workaround until Unified Text stops using Legacy classes internally
6#include <efl_ui_text.eo.h>
7#include <efl_text_interactive.eo.h>
6 8
7static void 9static void
8_gui_about_clicked_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 10_gui_about_clicked_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
diff --git a/reference/c/ui/src/ui_container.c b/reference/c/ui/src/ui_container.c
index 166a458..81288a8 100644
--- a/reference/c/ui/src/ui_container.c
+++ b/reference/c/ui/src/ui_container.c
@@ -1,8 +1,9 @@
1#define EFL_BETA_API_SUPPORT 1 1#define EFL_BETA_API_SUPPORT 1
2 2
3#include <Eina.h>
4#include <Elementary.h> 3#include <Elementary.h>
5#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5// Temporary workaround until Unified Text stops using Legacy classes internally
6#include <efl_ui_text.eo.h>
6 7
7/* 8/*
8 * Efl.UI container exmaples. 9 * Efl.UI container exmaples.
@@ -61,7 +62,7 @@ _ui_boxes_setup(Efl_Ui_Win *win)
61 int i; 62 int i;
62 63
63 box = efl_add(EFL_UI_BOX_CLASS, win, 64 box = efl_add(EFL_UI_BOX_CLASS, win,
64 efl_gfx_arrangement_content_padding_set(efl_added, 5, 0, EINA_TRUE)); 65 efl_gfx_arrangement_content_padding_set(efl_added, 5, 0));
65 66
66 for (i = 1; i <= 4; i++) 67 for (i = 1; i <= 4; i++)
67 { 68 {
diff --git a/reference/csharp/ui/src/ui_container.cs b/reference/csharp/ui/src/ui_container.cs
index 5379ee6..f52a5bd 100644
--- a/reference/csharp/ui/src/ui_container.cs
+++ b/reference/csharp/ui/src/ui_container.cs
@@ -14,7 +14,7 @@ public class Example : Efl.Csharp.Application
14 { 14 {
15 Efl.Ui.Box box = new Efl.Ui.Box(win); 15 Efl.Ui.Box box = new Efl.Ui.Box(win);
16 // Set distance between contained elements 16 // Set distance between contained elements
17 box.SetContentPadding(5, 0, true); 17 box.SetContentPadding(5, 0);
18 18
19 for (int i = 1; i <= 4; ++i) 19 for (int i = 1; i <= 4; ++i)
20 { 20 {
diff --git a/tutorial/c/hello-gui/src/gui_main.c b/tutorial/c/hello-gui/src/gui_main.c
index b67249b..882443f 100644
--- a/tutorial/c/hello-gui/src/gui_main.c
+++ b/tutorial/c/hello-gui/src/gui_main.c
@@ -1,8 +1,10 @@
1#define EFL_BETA_API_SUPPORT 1 1#define EFL_BETA_API_SUPPORT 1
2 2
3#include <Eina.h>
4#include <Elementary.h> 3#include <Elementary.h>
5#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5// Temporary workaround until Unified Text stops using Legacy classes internally
6#include <efl_ui_text.eo.h>
7#include <efl_text_interactive.eo.h>
6 8
7static void 9static void
8_gui_quit_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 10_gui_quit_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)