summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-05-23 15:04:26 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-05-23 16:00:47 -0300
commitedb93113f075e948ec417c1d0e008d73a03f2ef0 (patch)
tree9094790042337e9eb425bf6f8dd952c19f29a7c3
parentb613d6f1d98a511daf6524778ccadf8fadf75e3d (diff)
elementary-cxx: Fix C++ examplesdevs/felipealmeida/cxx-examples
Fix C++ examples with new API
-rw-r--r--configure.ac1
-rw-r--r--src/examples/elementary/Makefile.am238
-rw-r--r--src/examples/elementary/popup_cxx_example_01.cc6
-rw-r--r--src/examples/elementary/radio_cxx_example_01.cc10
-rw-r--r--src/examples/elementary/separator_cxx_example_01.cc6
-rw-r--r--src/examples/elementary/slider_cxx_example.cc6
-rw-r--r--src/examples/elementary/spinner_cxx_example.cc24
-rw-r--r--src/examples/elementary/table_cxx_example_01.cc18
-rw-r--r--src/examples/elementary/table_cxx_example_02.cc6
-rw-r--r--src/examples/elementary/thumb_cxx_example_01.cc11
10 files changed, 187 insertions, 139 deletions
diff --git a/configure.ac b/configure.ac
index a3753201a7..1ce30b302c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5416,6 +5416,7 @@ EFL_LIB_START([Elementary_Cxx])
5416EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eina_Cxx]) 5416EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eina_Cxx])
5417EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eet_Cxx]) 5417EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eet_Cxx])
5418EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Ecore_Cxx]) 5418EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Ecore_Cxx])
5419EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eo_Cxx])
5419EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Ecore]) 5420EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Ecore])
5420EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eina]) 5421EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eina])
5421EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eo]) 5422EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eo])
diff --git a/src/examples/elementary/Makefile.am b/src/examples/elementary/Makefile.am
index e36408079e..8e7c11913c 100644
--- a/src/examples/elementary/Makefile.am
+++ b/src/examples/elementary/Makefile.am
@@ -18,14 +18,14 @@ AM_CPPFLAGS = \
18-I$(top_builddir)/src/lib/efl/interfaces \ 18-I$(top_builddir)/src/lib/efl/interfaces \
19-I$(top_srcdir)/src/lib/eina \ 19-I$(top_srcdir)/src/lib/eina \
20-I$(top_builddir)/src/lib/eina \ 20-I$(top_builddir)/src/lib/eina \
21-I$(top_srcdir)/src/bindings/eina_cxx \ 21-I$(top_srcdir)/src/bindings/cxx/eina_cxx \
22-I$(top_builddir)/src/bindings/eina_cxx \ 22-I$(top_builddir)/src/bindings/cxx/eina_cxx \
23-I$(top_srcdir)/src/lib/eo \ 23-I$(top_srcdir)/src/lib/eo \
24-I$(top_builddir)/src/lib/eo \ 24-I$(top_builddir)/src/lib/eo \
25-I$(top_srcdir)/src/bindings/eo_cxx \ 25-I$(top_srcdir)/src/bindings/cxx/eo_cxx \
26-I$(top_builddir)/src/bindings/eo_cxx \ 26-I$(top_builddir)/src/bindings/cxx/eo_cxx \
27-I$(top_srcdir)/src/bindings/eldbus_cxx \ 27-I$(top_srcdir)/src/bindings/cxx/eldbus_cxx \
28-I$(top_builddir)/src/bindings/eldbus_cxx \ 28-I$(top_builddir)/src/bindings/cxx/eldbus_cxx \
29-I$(top_srcdir)/src/lib/ector \ 29-I$(top_srcdir)/src/lib/ector \
30-I$(top_builddir)/src/lib/ector \ 30-I$(top_builddir)/src/lib/ector \
31-I$(top_srcdir)/src/lib/evas \ 31-I$(top_srcdir)/src/lib/evas \
@@ -177,35 +177,35 @@ evas3d_map_example.c \
177track_example_01.c \ 177track_example_01.c \
178twitter_example_01.edc 178twitter_example_01.edc
179 179
180# if HAVE_CXX11 180if HAVE_CXX11
181# SRCS += \ 181SRCS += \
182# thumb_cxx_example_01.cc \ 182thumb_cxx_example_01.cc \
183# table_cxx_example_02.cc \ 183table_cxx_example_02.cc \
184# table_cxx_example_01.cc \ 184table_cxx_example_01.cc \
185# spinner_cxx_example.cc \ 185spinner_cxx_example.cc \
186# slider_cxx_example.cc \ 186slider_cxx_example.cc \
187# separator_cxx_example_01.cc \ 187separator_cxx_example_01.cc \
188# radio_cxx_example_01.cc \ 188radio_cxx_example_01.cc \
189# popup_cxx_example_01.cc \ 189popup_cxx_example_01.cc \
190# menu_cxx_example_01.cc \ 190menu_cxx_example_01.cc \
191# location_cxx_example_01.cc \ 191location_cxx_example_01.cc \
192# icon_cxx_example_01.cc \ 192icon_cxx_example_01.cc \
193# hoversel_cxx_example_01.cc \ 193hoversel_cxx_example_01.cc \
194# glview_cxx_example_01.cc \ 194glview_cxx_example_01.cc \
195# datetime_cxx_example.cc \ 195datetime_cxx_example.cc \
196# clock_cxx_example.cc \ 196clock_cxx_example.cc \
197# calendar_cxx_example_05.cc \ 197calendar_cxx_example_05.cc \
198# calendar_cxx_example_04.cc \ 198calendar_cxx_example_04.cc \
199# calendar_cxx_example_03.cc \ 199calendar_cxx_example_03.cc \
200# calendar_cxx_example_02.cc \ 200calendar_cxx_example_02.cc \
201# calendar_cxx_example_01.cc \ 201calendar_cxx_example_01.cc \
202# button_cxx_example_01.cc \ 202button_cxx_example_01.cc \
203# button_cxx_example_00.cc \ 203button_cxx_example_00.cc \
204# bubble_cxx_example_01.cc \ 204bubble_cxx_example_01.cc \
205# box_cxx_example_02.cc \ 205box_cxx_example_02.cc \
206# bg_cxx_example_02.cc \ 206bg_cxx_example_02.cc \
207# bg_cxx_example_01.cc 207bg_cxx_example_01.cc
208# endif 208endif
209 209
210.edc.edj: 210.edc.edj:
211 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@ 211 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
@@ -382,35 +382,35 @@ sphere_hunter/sphere_hunter.edj: sphere_hunter/sphere_hunter.edc
382 $(MKDIR_P) sphere_hunter/; \ 382 $(MKDIR_P) sphere_hunter/; \
383 $(EDJE_CC) $(EDJE_CC_FLAGS) -id sphere_hunter/ -id $(top_srcdir)/data/elementary/themes $< $@ 383 $(EDJE_CC) $(EDJE_CC_FLAGS) -id sphere_hunter/ -id $(top_srcdir)/data/elementary/themes $< $@
384 384
385# if HAVE_CXX11 385if HAVE_CXX11
386# examples_PROGRAMS += \ 386examples_PROGRAMS += \
387# thumb_cxx_example_01 \ 387thumb_cxx_example_01 \
388# table_cxx_example_02 \ 388table_cxx_example_02 \
389# table_cxx_example_01 \ 389table_cxx_example_01 \
390# spinner_cxx_example \ 390spinner_cxx_example \
391# slider_cxx_example \ 391slider_cxx_example \
392# separator_cxx_example_01 \ 392separator_cxx_example_01 \
393# radio_cxx_example_01 \ 393radio_cxx_example_01 \
394# popup_cxx_example_01 \ 394popup_cxx_example_01 \
395# menu_cxx_example_01 \ 395menu_cxx_example_01 \
396# location_cxx_example_01 \ 396location_cxx_example_01 \
397# icon_cxx_example_01 \ 397icon_cxx_example_01 \
398# hoversel_cxx_example_01 \ 398hoversel_cxx_example_01 \
399# glview_cxx_example_01 \ 399glview_cxx_example_01 \
400# datetime_cxx_example \ 400datetime_cxx_example \
401# clock_cxx_example \ 401clock_cxx_example \
402# calendar_cxx_example_05 \ 402calendar_cxx_example_05 \
403# calendar_cxx_example_04 \ 403calendar_cxx_example_04 \
404# calendar_cxx_example_03 \ 404calendar_cxx_example_03 \
405# calendar_cxx_example_02 \ 405calendar_cxx_example_02 \
406# calendar_cxx_example_01 \ 406calendar_cxx_example_01 \
407# button_cxx_example_01 \ 407button_cxx_example_01 \
408# button_cxx_example_00 \ 408button_cxx_example_00 \
409# bubble_cxx_example_01 \ 409bubble_cxx_example_01 \
410# box_cxx_example_02 \ 410box_cxx_example_02 \
411# bg_cxx_example_02 \ 411bg_cxx_example_02 \
412# bg_cxx_example_01 412bg_cxx_example_01
413# endif 413endif
414 414
415if HAVE_WINDOWS 415if HAVE_WINDOWS
416efl_thread_1_SOURCES = efl_thread_win32_1.c 416efl_thread_1_SOURCES = efl_thread_win32_1.c
@@ -424,34 +424,34 @@ efl_thread_3_SOURCES = efl_thread_3.c
424efl_thread_4_SOURCES = efl_thread_4.c 424efl_thread_4_SOURCES = efl_thread_4.c
425endif 425endif
426 426
427# if HAVE_CXX11 427if HAVE_CXX11
428# thumb_cxx_example_01_SOURCES = thumb_cxx_example_01.cc 428thumb_cxx_example_01_SOURCES = thumb_cxx_example_01.cc
429# table_cxx_example_02_SOURCES = table_cxx_example_02.cc 429table_cxx_example_02_SOURCES = table_cxx_example_02.cc
430# table_cxx_example_01_SOURCES = table_cxx_example_01.cc 430table_cxx_example_01_SOURCES = table_cxx_example_01.cc
431# spinner_cxx_example_SOURCES = spinner_cxx_example.cc 431spinner_cxx_example_SOURCES = spinner_cxx_example.cc
432# slider_cxx_example_SOURCES = slider_cxx_example.cc 432slider_cxx_example_SOURCES = slider_cxx_example.cc
433# separator_cxx_example_01_SOURCES = separator_cxx_example_01.cc 433separator_cxx_example_01_SOURCES = separator_cxx_example_01.cc
434# radio_cxx_example_01_SOURCES = radio_cxx_example_01.cc 434radio_cxx_example_01_SOURCES = radio_cxx_example_01.cc
435# popup_cxx_example_01_SOURCES = popup_cxx_example_01.cc 435popup_cxx_example_01_SOURCES = popup_cxx_example_01.cc
436# menu_cxx_example_01_SOURCES = menu_cxx_example_01.cc 436menu_cxx_example_01_SOURCES = menu_cxx_example_01.cc
437# location_cxx_example_01_SOURCES = location_cxx_example_01.cc 437location_cxx_example_01_SOURCES = location_cxx_example_01.cc
438# icon_cxx_example_01_SOURCES = icon_cxx_example_01.cc 438icon_cxx_example_01_SOURCES = icon_cxx_example_01.cc
439# hoversel_cxx_example_01_SOURCES = hoversel_cxx_example_01.cc 439hoversel_cxx_example_01_SOURCES = hoversel_cxx_example_01.cc
440# glview_cxx_example_01_SOURCES = glview_cxx_example_01.cc 440glview_cxx_example_01_SOURCES = glview_cxx_example_01.cc
441# datetime_cxx_example_SOURCES = datetime_cxx_example.cc 441datetime_cxx_example_SOURCES = datetime_cxx_example.cc
442# clock_cxx_example_SOURCES = clock_cxx_example.cc 442clock_cxx_example_SOURCES = clock_cxx_example.cc
443# calendar_cxx_example_05_SOURCES = calendar_cxx_example_05.cc 443calendar_cxx_example_05_SOURCES = calendar_cxx_example_05.cc
444# calendar_cxx_example_04_SOURCES = calendar_cxx_example_04.cc 444calendar_cxx_example_04_SOURCES = calendar_cxx_example_04.cc
445# calendar_cxx_example_03_SOURCES = calendar_cxx_example_03.cc 445calendar_cxx_example_03_SOURCES = calendar_cxx_example_03.cc
446# calendar_cxx_example_02_SOURCES = calendar_cxx_example_02.cc 446calendar_cxx_example_02_SOURCES = calendar_cxx_example_02.cc
447# calendar_cxx_example_01_SOURCES = calendar_cxx_example_01.cc 447calendar_cxx_example_01_SOURCES = calendar_cxx_example_01.cc
448# button_cxx_example_01_SOURCES = button_cxx_example_01.cc 448button_cxx_example_01_SOURCES = button_cxx_example_01.cc
449# button_cxx_example_00_SOURCES = button_cxx_example_00.cc 449button_cxx_example_00_SOURCES = button_cxx_example_00.cc
450# bubble_cxx_example_01_SOURCES = bubble_cxx_example_01.cc 450bubble_cxx_example_01_SOURCES = bubble_cxx_example_01.cc
451# box_cxx_example_02_SOURCES = box_cxx_example_02.cc 451box_cxx_example_02_SOURCES = box_cxx_example_02.cc
452# bg_cxx_example_02_SOURCES = bg_cxx_example_02.cc 452bg_cxx_example_02_SOURCES = bg_cxx_example_02.cc
453# bg_cxx_example_01_SOURCES = bg_cxx_example_01.cc 453bg_cxx_example_01_SOURCES = bg_cxx_example_01.cc
454# endif 454endif
455 455
456# This variable will hold the list of screenshots that will be made 456# This variable will hold the list of screenshots that will be made
457# by "make screenshots". Each item in the list is of the form: 457# by "make screenshots". Each item in the list is of the form:
@@ -539,33 +539,33 @@ table_example_01:table_example_01.png:0.0 \
539table_example_02:table_example_02.png:0.0 \ 539table_example_02:table_example_02.png:0.0 \
540menu_example_01:menu_example_01.png:0.5 540menu_example_01:menu_example_01.png:0.5
541 541
542# if HAVE_CXX11 542if HAVE_CXX11
543# SCREENSHOTS += \ 543SCREENSHOTS += \
544# bg_cxx_example_02:bg_cxx_example_02.png:0.0 \ 544bg_cxx_example_02:bg_cxx_example_02.png:0.0 \
545# box_cxx_example_02:box_cxx_example_02.png:1.3 \ 545box_cxx_example_02:box_cxx_example_02.png:1.3 \
546# bubble_cxx_example_01:bubble_cxx_example_01.png:0.0 \ 546bubble_cxx_example_01:bubble_cxx_example_01.png:0.0 \
547# button_cxx_example_00:button_cxx_example_00.png:0.0 \ 547button_cxx_example_00:button_cxx_example_00.png:0.0 \
548# button_cxx_example_01:button_cxx_example_01.png:0.0 \ 548button_cxx_example_01:button_cxx_example_01.png:0.0 \
549# calendar_cxx_example_01:calendar_cxx_example_01.png:0.0 \ 549calendar_cxx_example_01:calendar_cxx_example_01.png:0.0 \
550# calendar_cxx_example_02:calendar_cxx_example_02.png:0.0 \ 550calendar_cxx_example_02:calendar_cxx_example_02.png:0.0 \
551# calendar_cxx_example_03:calendar_cxx_example_03.png:0.0 \ 551calendar_cxx_example_03:calendar_cxx_example_03.png:0.0 \
552# calendar_cxx_example_04:calendar_cxx_example_04.png:0.0 \ 552calendar_cxx_example_04:calendar_cxx_example_04.png:0.0 \
553# calendar_cxx_example_05:calendar_cxx_example_05.png:0.0 \ 553calendar_cxx_example_05:calendar_cxx_example_05.png:0.0 \
554# clock_cxx_example:clock_cxx_example.png:0.5 \ 554clock_cxx_example:clock_cxx_example.png:0.5 \
555# datetime_cxx_example:datetime_cxx_example.png:0.0 \ 555datetime_cxx_example:datetime_cxx_example.png:0.0 \
556# hoversel_cxx_example_01:hoversel_cxx_example_01.png:0.0 \ 556hoversel_cxx_example_01:hoversel_cxx_example_01.png:0.0 \
557# icon_cxx_example_01:icon_cxx_example_01.png:0.0 \ 557icon_cxx_example_01:icon_cxx_example_01.png:0.0 \
558# menu_cxx_example_01:menu_cxx_example_01.png:0.5 \ 558menu_cxx_example_01:menu_cxx_example_01.png:0.5 \
559# popup_cxx_example_01:popup_cxx_example_01.png:1.0 \ 559popup_cxx_example_01:popup_cxx_example_01.png:1.0 \
560# popup_cxx_example_01:popup_cxx_example_01_a.png:6.0 \ 560popup_cxx_example_01:popup_cxx_example_01_a.png:6.0 \
561# radio_cxx_example_01:radio_cxx_example_01.png:0.0 \ 561radio_cxx_example_01:radio_cxx_example_01.png:0.0 \
562# separator_cxx_example_01:separator_cxx_example_01.png:0.0 \ 562separator_cxx_example_01:separator_cxx_example_01.png:0.0 \
563# slider_cxx_example:slider_cxx_example.png:0.0 \ 563slider_cxx_example:slider_cxx_example.png:0.0 \
564# spinner_cxx_example:spinner_cxx_example.png:0.0 \ 564spinner_cxx_example:spinner_cxx_example.png:0.0 \
565# table_cxx_example_01:table_cxx_example_01.png:0.0 \ 565table_cxx_example_01:table_cxx_example_01.png:0.0 \
566# table_cxx_example_02:table_cxx_example_02.png:0.0 \ 566table_cxx_example_02:table_cxx_example_02.png:0.0 \
567# thumb_cxx_example_01:thumb_cxx_example_01.png:0.5 567thumb_cxx_example_01:thumb_cxx_example_01.png:0.5
568# endif 568endif
569 569
570HTML_SS_DIR=$(top_builddir)/doc/html/screenshots 570HTML_SS_DIR=$(top_builddir)/doc/html/screenshots
571LATEX_SS_DIR=$(top_builddir)/doc/latex/screenshots 571LATEX_SS_DIR=$(top_builddir)/doc/latex/screenshots
diff --git a/src/examples/elementary/popup_cxx_example_01.cc b/src/examples/elementary/popup_cxx_example_01.cc
index a678533114..119e982f62 100644
--- a/src/examples/elementary/popup_cxx_example_01.cc
+++ b/src/examples/elementary/popup_cxx_example_01.cc
@@ -1,3 +1,9 @@
1
2#ifdef HAVE_CONFIG_H
3# include "config.h"
4# include "elementary_config.h"
5#endif
6
1#include <Elementary.hh> 7#include <Elementary.hh>
2 8
3EAPI_MAIN int 9EAPI_MAIN int
diff --git a/src/examples/elementary/radio_cxx_example_01.cc b/src/examples/elementary/radio_cxx_example_01.cc
index 34a9f09abe..f6e8800e8e 100644
--- a/src/examples/elementary/radio_cxx_example_01.cc
+++ b/src/examples/elementary/radio_cxx_example_01.cc
@@ -1,3 +1,9 @@
1
2#ifdef HAVE_CONFIG_H
3# include "config.h"
4# include "elementary_config.h"
5#endif
6
1#include <Elementary.hh> 7#include <Elementary.hh>
2 8
3EAPI_MAIN int 9EAPI_MAIN int
@@ -7,11 +13,11 @@ elm_main (int argc, char *argv[])
7 13
8 static int val = 1; 14 static int val = 1;
9 15
10 ::elm::win_standard win; 16 ::elm::win::Standard win;
11 win.title_set("Radio"); 17 win.title_set("Radio");
12 win.autohide_set(true); 18 win.autohide_set(true);
13 19
14 ::elm::box bx(efl::eo::parent = win); 20 ::elm::Box bx(efl::eo::parent = win);
15 bx.horizontal_set(true); 21 bx.horizontal_set(true);
16 bx.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 22 bx.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
17 win.resize_object_add(bx); 23 win.resize_object_add(bx);
diff --git a/src/examples/elementary/separator_cxx_example_01.cc b/src/examples/elementary/separator_cxx_example_01.cc
index 98bf264f16..7ad0923282 100644
--- a/src/examples/elementary/separator_cxx_example_01.cc
+++ b/src/examples/elementary/separator_cxx_example_01.cc
@@ -1,3 +1,9 @@
1
2#ifdef HAVE_CONFIG_H
3# include "config.h"
4# include "elementary_config.h"
5#endif
6
1#include <Elementary.hh> 7#include <Elementary.hh>
2#include <Evas.hh> 8#include <Evas.hh>
3 9
diff --git a/src/examples/elementary/slider_cxx_example.cc b/src/examples/elementary/slider_cxx_example.cc
index 273abea1eb..abdb9f9119 100644
--- a/src/examples/elementary/slider_cxx_example.cc
+++ b/src/examples/elementary/slider_cxx_example.cc
@@ -1,3 +1,9 @@
1
2#ifdef HAVE_CONFIG_H
3# include "config.h"
4# include "elementary_config.h"
5#endif
6
1#include <Elementary.hh> 7#include <Elementary.hh>
2 8
3EAPI_MAIN int 9EAPI_MAIN int
diff --git a/src/examples/elementary/spinner_cxx_example.cc b/src/examples/elementary/spinner_cxx_example.cc
index 561c6adfa2..ea43f9161f 100644
--- a/src/examples/elementary/spinner_cxx_example.cc
+++ b/src/examples/elementary/spinner_cxx_example.cc
@@ -1,3 +1,9 @@
1
2#ifdef HAVE_CONFIG_H
3# include "config.h"
4# include "elementary_config.h"
5#endif
6
1#include <Elementary.hh> 7#include <Elementary.hh>
2 8
3EAPI_MAIN int 9EAPI_MAIN int
@@ -5,28 +11,28 @@ elm_main (int argc, char *argv[])
5{ 11{
6 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN); 12 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
7 13
8 ::elm::win win(elm_win_util_standard_add("spinner", "Spinner Example")); 14 ::elm::win::Standard win(elm_win_util_standard_add("spinner", "Spinner Example"));
9 win.autohide_set(true); 15 win.autohide_set(true);
10 16
11 ::elm::box bx(efl::eo::parent = win); 17 ::elm::Box bx(efl::eo::parent = win);
12 bx.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 18 bx.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
13 win.resize_object_add(bx); 19 win.resize_object_add(bx);
14 bx.visible_set(true); 20 bx.visible_set(true);
15 21
16 ::elm::spinner sp(efl::eo::parent = win); 22 ::elm::Spinner sp(efl::eo::parent = win);
17 sp.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 23 sp.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
18 sp.size_hint_align_set(EVAS_HINT_FILL, 0.5); 24 sp.size_hint_align_set(EVAS_HINT_FILL, 0.5);
19 bx.pack_end(sp); 25 bx.pack_end(sp);
20 sp.visible_set(true); 26 sp.visible_set(true);
21 27
22 ::elm::spinner sp2(efl::eo::parent = win); 28 ::elm::Spinner sp2(efl::eo::parent = win);
23 sp2.label_format_set("Percentage %%%1.2f something"); 29 sp2.label_format_set("Percentage %%%1.2f something");
24 sp2.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 30 sp2.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
25 sp2.size_hint_align_set(EVAS_HINT_FILL, 0.5); 31 sp2.size_hint_align_set(EVAS_HINT_FILL, 0.5);
26 bx.pack_end(sp2); 32 bx.pack_end(sp2);
27 sp2.visible_set(true); 33 sp2.visible_set(true);
28 34
29 ::elm::spinner sp3(efl::eo::parent = win); 35 ::elm::Spinner sp3(efl::eo::parent = win);
30 sp3.label_format_set("%1.1f units"); 36 sp3.label_format_set("%1.1f units");
31 sp3.step_set(1.5); 37 sp3.step_set(1.5);
32 sp3.wrap_set(true); 38 sp3.wrap_set(true);
@@ -36,7 +42,7 @@ elm_main (int argc, char *argv[])
36 bx.pack_end(sp3); 42 bx.pack_end(sp3);
37 sp3.visible_set(true); 43 sp3.visible_set(true);
38 44
39 ::elm::spinner sp4(efl::eo::parent = win); 45 ::elm::Spinner sp4(efl::eo::parent = win);
40 sp4.style_set("vertical"); 46 sp4.style_set("vertical");
41 sp4.interval_set(0.2); 47 sp4.interval_set(0.2);
42 sp4.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 48 sp4.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -44,14 +50,14 @@ elm_main (int argc, char *argv[])
44 bx.pack_end(sp4); 50 bx.pack_end(sp4);
45 sp4.visible_set(true); 51 sp4.visible_set(true);
46 52
47 ::elm::spinner sp5(efl::eo::parent = win); 53 ::elm::Spinner sp5(efl::eo::parent = win);
48 sp5.editable_set(false); 54 sp5.editable_set(false);
49 sp5.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 55 sp5.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
50 sp5.size_hint_align_set(EVAS_HINT_FILL, 0.5); 56 sp5.size_hint_align_set(EVAS_HINT_FILL, 0.5);
51 bx.pack_end(sp5); 57 bx.pack_end(sp5);
52 sp5.visible_set(true); 58 sp5.visible_set(true);
53 59
54 ::elm::spinner sp6(efl::eo::parent = win); 60 ::elm::Spinner sp6(efl::eo::parent = win);
55 sp6.editable_set(false); 61 sp6.editable_set(false);
56 sp6.min_max_set(1, 12); 62 sp6.min_max_set(1, 12);
57 sp6.special_value_add(1, "January"); 63 sp6.special_value_add(1, "January");
@@ -71,7 +77,7 @@ elm_main (int argc, char *argv[])
71 bx.pack_end(sp6); 77 bx.pack_end(sp6);
72 sp6.visible_set(true); 78 sp6.visible_set(true);
73 79
74 ::elm::spinner sp7(efl::eo::parent = win); 80 ::elm::Spinner sp7(efl::eo::parent = win);
75 sp7.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 81 sp7.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
76 sp7.size_hint_align_set(EVAS_HINT_FILL, 0.5); 82 sp7.size_hint_align_set(EVAS_HINT_FILL, 0.5);
77 bx.pack_end(sp7); 83 bx.pack_end(sp7);
diff --git a/src/examples/elementary/table_cxx_example_01.cc b/src/examples/elementary/table_cxx_example_01.cc
index 1af3b45b28..040193da5d 100644
--- a/src/examples/elementary/table_cxx_example_01.cc
+++ b/src/examples/elementary/table_cxx_example_01.cc
@@ -1,3 +1,9 @@
1
2#ifdef HAVE_CONFIG_H
3# include "config.h"
4# include "elementary_config.h"
5#endif
6
1#include <Elementary.hh> 7#include <Elementary.hh>
2 8
3EAPI_MAIN int 9EAPI_MAIN int
@@ -5,31 +11,31 @@ elm_main (int argc, char *argv[])
5{ 11{
6 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN); 12 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
7 13
8 ::elm::win win(elm_win_util_standard_add("table", "Table")); 14 ::elm::win::Standard win(elm_win_util_standard_add("table", "Table"));
9 win.autohide_set(true); 15 win.autohide_set(true);
10 16
11 ::elm::table table(efl::eo::parent = win); 17 ::efl::ui::Grid table(efl::eo::parent = win);
12 win.resize_object_add(table); 18 win.resize_object_add(table);
13 table.visible_set(true); 19 table.visible_set(true);
14 table.padding_set(5, 5); 20 table.padding_set(5, 5);
15 table.homogeneous_set(true); 21 table.homogeneous_set(true);
16 22
17 ::elm::label label(efl::eo::parent = win); 23 ::elm::Label label(efl::eo::parent = win);
18 label.text_set(nullptr, "label 0"); 24 label.text_set(nullptr, "label 0");
19 label.visible_set(true); 25 label.visible_set(true);
20 table.pack(label, 0, 0, 1, 1); 26 table.pack(label, 0, 0, 1, 1);
21 27
22 ::elm::label label1(efl::eo::parent = win); 28 ::elm::Label label1(efl::eo::parent = win);
23 label1.text_set(nullptr, "label 1"); 29 label1.text_set(nullptr, "label 1");
24 label1.visible_set(true); 30 label1.visible_set(true);
25 table.pack(label1, 1, 0, 1, 1); 31 table.pack(label1, 1, 0, 1, 1);
26 32
27 ::elm::label label2(efl::eo::parent = win); 33 ::elm::Label label2(efl::eo::parent = win);
28 label2.text_set(nullptr, "label 2"); 34 label2.text_set(nullptr, "label 2");
29 label2.visible_set(true); 35 label2.visible_set(true);
30 table.pack(label2, 0, 1, 1, 1); 36 table.pack(label2, 0, 1, 1, 1);
31 37
32 ::elm::label label3(efl::eo::parent = win); 38 ::elm::Label label3(efl::eo::parent = win);
33 label3.text_set(nullptr, "label 3"); 39 label3.text_set(nullptr, "label 3");
34 label3.visible_set(true); 40 label3.visible_set(true);
35 table.pack(label3, 1, 1, 1, 1); 41 table.pack(label3, 1, 1, 1, 1);
diff --git a/src/examples/elementary/table_cxx_example_02.cc b/src/examples/elementary/table_cxx_example_02.cc
index 9ab119c077..77324e5933 100644
--- a/src/examples/elementary/table_cxx_example_02.cc
+++ b/src/examples/elementary/table_cxx_example_02.cc
@@ -1,3 +1,9 @@
1
2#ifdef HAVE_CONFIG_H
3# include "config.h"
4# include "elementary_config.h"
5#endif
6
1#include <Elementary.hh> 7#include <Elementary.hh>
2#include <Evas.hh> 8#include <Evas.hh>
3 9
diff --git a/src/examples/elementary/thumb_cxx_example_01.cc b/src/examples/elementary/thumb_cxx_example_01.cc
index abca9acc75..8bf1186150 100644
--- a/src/examples/elementary/thumb_cxx_example_01.cc
+++ b/src/examples/elementary/thumb_cxx_example_01.cc
@@ -1,3 +1,9 @@
1
2#ifdef HAVE_CONFIG_H
3# include "config.h"
4# include "elementary_config.h"
5#endif
6
1#include <Elementary.hh> 7#include <Elementary.hh>
2 8
3#include <iostream> 9#include <iostream>
@@ -11,11 +17,11 @@ elm_main(int argc, char *argv[])
11 elm_app_info_set(reinterpret_cast<void*>(elm_main), "elementary", "images/plant_01.jpg"); 17 elm_app_info_set(reinterpret_cast<void*>(elm_main), "elementary", "images/plant_01.jpg");
12 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN); 18 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
13 19
14 ::elm::win_standard win; 20 ::elm::win::Standard win;
15 win.title_set("Thumbnailer"); 21 win.title_set("Thumbnailer");
16 win.autohide_set(true); 22 win.autohide_set(true);
17 23
18 ::elm::thumb thumb(efl::eo::parent = win); 24 ::elm::Thumb thumb(efl::eo::parent = win);
19 25
20 auto generation_started = std::bind([] { std::cout << "thumbnail generation started." << std::endl; }); 26 auto generation_started = std::bind([] { std::cout << "thumbnail generation started." << std::endl; });
21 27
@@ -28,7 +34,6 @@ elm_main(int argc, char *argv[])
28 thumb.callback_generate_error_add( generation_error ); 34 thumb.callback_generate_error_add( generation_error );
29 35
30 thumb.size_set(160, 160); 36 thumb.size_set(160, 160);
31 thumb.editable_set(false);
32 std::stringstream ss; 37 std::stringstream ss;
33 ss << elm_app_data_dir_get() << "/images/plant_01.jpg"; 38 ss << elm_app_data_dir_get() << "/images/plant_01.jpg";
34 thumb.file_set(ss.str(), "image"); 39 thumb.file_set(ss.str(), "image");