diff options
author | Xavi Artigas <xavierartigas@yahoo.es> | 2019-03-05 09:30:09 +0100 |
---|---|---|
committer | Xavi Artigas <xavierartigas@yahoo.es> | 2019-03-05 09:30:09 +0100 |
commit | aad5b641c89c5bbe92ef8c3d83ea1cbc887c4034 (patch) | |
tree | d994463c45a6ce6377257cb3732441d21f9562ef | |
parent | 3e1aefa7ea74750cd6b1669c61fe02ef2aef8a90 (diff) |
More fixes to adapt to latest API changes
EFL_UI_WIN_BASIC -> EFL_UI_WIN_TYPE_BASIC
-rw-r--r-- | apps/c/life/src/life_main.c | 2 | ||||
-rw-r--r-- | apps/c/texteditor/src/texteditor_main.c | 2 | ||||
-rw-r--r-- | reference/c/ui/src/focus_main.c | 2 | ||||
-rw-r--r-- | reference/c/ui/src/ui_container.c | 2 | ||||
-rw-r--r-- | reference/c/ui/src/ui_sizing.c | 2 | ||||
-rw-r--r-- | reference/c/ui/src/ui_translation.c | 2 | ||||
-rw-r--r-- | tutorial/c/hello-gui/src/gui_main.c | 2 | ||||
-rw-r--r-- | tutorial/c/lifecycle_ui/src/lifecycle_main.c | 2 | ||||
-rw-r--r-- | tutorial/csharp/hello-gui/src/gui_main.cs | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/apps/c/life/src/life_main.c b/apps/c/life/src/life_main.c index e8bc6616..9027640b 100644 --- a/apps/c/life/src/life_main.c +++ b/apps/c/life/src/life_main.c | |||
@@ -61,7 +61,7 @@ _life_win_setup(void) | |||
61 | Evas_Coord h; | 61 | Evas_Coord h; |
62 | 62 | ||
63 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), | 63 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), |
64 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), | 64 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), |
65 | efl_text_set(efl_added, "EFL Life"), | 65 | efl_text_set(efl_added, "EFL Life"), |
66 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 66 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
67 | if (!win) return NULL; | 67 | if (!win) return NULL; |
diff --git a/apps/c/texteditor/src/texteditor_main.c b/apps/c/texteditor/src/texteditor_main.c index 66bcc42d..a300145f 100644 --- a/apps/c/texteditor/src/texteditor_main.c +++ b/apps/c/texteditor/src/texteditor_main.c | |||
@@ -89,7 +89,7 @@ _gui_setup() | |||
89 | Eo *win, *box; | 89 | Eo *win, *box; |
90 | 90 | ||
91 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), | 91 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), |
92 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), | 92 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), |
93 | efl_text_set(efl_added, "Text Editor"), | 93 | efl_text_set(efl_added, "Text Editor"), |
94 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 94 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
95 | 95 | ||
diff --git a/reference/c/ui/src/focus_main.c b/reference/c/ui/src/focus_main.c index 676add73..af7872a5 100644 --- a/reference/c/ui/src/focus_main.c +++ b/reference/c/ui/src/focus_main.c | |||
@@ -31,7 +31,7 @@ _gui_setup() | |||
31 | Eo *win, *box, *hbox, *about; | 31 | Eo *win, *box, *hbox, *about; |
32 | 32 | ||
33 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), | 33 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), |
34 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), | 34 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), |
35 | efl_text_set(efl_added, "Hello World"), | 35 | efl_text_set(efl_added, "Hello World"), |
36 | efl_event_callback_add(efl_added, | 36 | efl_event_callback_add(efl_added, |
37 | EFL_UI_WIN_EVENT_DELETE_REQUEST, | 37 | EFL_UI_WIN_EVENT_DELETE_REQUEST, |
diff --git a/reference/c/ui/src/ui_container.c b/reference/c/ui/src/ui_container.c index 3775b5f2..098645fc 100644 --- a/reference/c/ui/src/ui_container.c +++ b/reference/c/ui/src/ui_container.c | |||
@@ -108,7 +108,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) | |||
108 | Eo *win; | 108 | Eo *win; |
109 | 109 | ||
110 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), | 110 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), |
111 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), | 111 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), |
112 | efl_text_set(efl_added, "Hello World"), | 112 | efl_text_set(efl_added, "Hello World"), |
113 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 113 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
114 | 114 | ||
diff --git a/reference/c/ui/src/ui_sizing.c b/reference/c/ui/src/ui_sizing.c index 129a7e56..e1987a82 100644 --- a/reference/c/ui/src/ui_sizing.c +++ b/reference/c/ui/src/ui_sizing.c | |||
@@ -28,7 +28,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) | |||
28 | Efl_Ui_Win *win, *box; | 28 | Efl_Ui_Win *win, *box; |
29 | 29 | ||
30 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), | 30 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), |
31 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), | 31 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), |
32 | efl_text_set(efl_added, "Size Control"), | 32 | efl_text_set(efl_added, "Size Control"), |
33 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 33 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
34 | 34 | ||
diff --git a/reference/c/ui/src/ui_translation.c b/reference/c/ui/src/ui_translation.c index 91cafc06..202097f6 100644 --- a/reference/c/ui/src/ui_translation.c +++ b/reference/c/ui/src/ui_translation.c | |||
@@ -34,7 +34,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) | |||
34 | Efl_Ui_Win *win, *box; | 34 | Efl_Ui_Win *win, *box; |
35 | 35 | ||
36 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), | 36 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), |
37 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), | 37 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), |
38 | efl_text_set(efl_added, "Translations"), | 38 | efl_text_set(efl_added, "Translations"), |
39 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 39 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
40 | 40 | ||
diff --git a/tutorial/c/hello-gui/src/gui_main.c b/tutorial/c/hello-gui/src/gui_main.c index db03a6a6..b7352d0e 100644 --- a/tutorial/c/hello-gui/src/gui_main.c +++ b/tutorial/c/hello-gui/src/gui_main.c | |||
@@ -17,7 +17,7 @@ _gui_setup() | |||
17 | Eo *win, *box; | 17 | Eo *win, *box; |
18 | 18 | ||
19 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), | 19 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), |
20 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), | 20 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), |
21 | efl_text_set(efl_added, "Hello World"), | 21 | efl_text_set(efl_added, "Hello World"), |
22 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 22 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
23 | 23 | ||
diff --git a/tutorial/c/lifecycle_ui/src/lifecycle_main.c b/tutorial/c/lifecycle_ui/src/lifecycle_main.c index 72dff4cc..7bdf149c 100644 --- a/tutorial/c/lifecycle_ui/src/lifecycle_main.c +++ b/tutorial/c/lifecycle_ui/src/lifecycle_main.c | |||
@@ -17,7 +17,7 @@ _gui_setup() | |||
17 | Eo *win; | 17 | Eo *win; |
18 | 18 | ||
19 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), | 19 | win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), |
20 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), | 20 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), |
21 | efl_ui_win_name_set(efl_added, "Lifecycle Example"), | 21 | efl_ui_win_name_set(efl_added, "Lifecycle Example"), |
22 | efl_text_set(efl_added, "Hello World"), | 22 | efl_text_set(efl_added, "Hello World"), |
23 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 23 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
diff --git a/tutorial/csharp/hello-gui/src/gui_main.cs b/tutorial/csharp/hello-gui/src/gui_main.cs index 2f50745e..f27b8ac2 100644 --- a/tutorial/csharp/hello-gui/src/gui_main.cs +++ b/tutorial/csharp/hello-gui/src/gui_main.cs | |||
@@ -31,7 +31,7 @@ public class Example | |||
31 | // Create a box container | 31 | // Create a box container |
32 | var box = new Efl.Ui.Box(win); | 32 | var box = new Efl.Ui.Box(win); |
33 | // Set its minimum size | 33 | // Set its minimum size |
34 | box.SetHintSizeMin(new Eina.Size2D(360, 540)); | 34 | box.SetHintSizeMin(new Eina.Size2D(360, 240)); |
35 | // Set the box as the content for the window | 35 | // Set the box as the content for the window |
36 | // The window size will adapt to the box size | 36 | // The window size will adapt to the box size |
37 | win.SetContent(box); | 37 | win.SetContent(box); |