Fixed global variables.

This commit is contained in:
Savio Sena 2014-08-24 23:09:00 -03:00
parent bab92da5cf
commit a4b7b0ba31
1 changed files with 6 additions and 6 deletions

View File

@ -13,9 +13,10 @@
#include "main.h" #include "main.h"
#define EXPEDITE_CXX_TEST_IMPL #define EXPEDITE_CXX_TEST_IMPL
#include "image_blend_border_cxx.h" #include "image_blend_border_cxx.c"
efl::eina::list<evas::image> images; efl::eina::list<evas::image> images;
evas::canvas *canvas;
/* standard var */ /* standard var */
static int done = 0; static int done = 0;
@ -25,15 +26,16 @@ static void _setup()
{ {
int i; int i;
Evas_Object *o; Evas_Object *o;
evas::canvas canvas(G_evas); canvas = new evas::canvas(::eo_ref(G_evas));
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
evas::image o(efl::eo::parent = canvas); evas::image o(efl::eo::parent = *canvas);
images.push_back(o); images.push_back(o);
o.file_set(::build_path("bar.png"), ""); // XXX o.file_set(::build_path("bar.png"), ""); // XXX
o.border_set(6, 6, 6, 6); o.border_set(6, 6, 6, 6);
o.visibility_set(true); o.visibility_set(true);
canvas->render();
} }
done = 0; done = 0;
} }
@ -42,6 +44,7 @@ static void _setup()
static void _cleanup() static void _cleanup()
{ {
images.clear(); images.clear();
delete canvas;
} }
/* loop - do things */ /* loop - do things */
@ -80,6 +83,3 @@ extern "C" void FNAME(void)
_setup(); _setup();
} }
#undef FNAME
#undef NAME
#undef ICON