Refactored around a bit.

1 files changed, 3 insertions, 17 deletions

diff --git a/src/bin/cxx/image_blend_border.cc b/src/bin/cxx/image_blend_border.cc
index a9f63b4..b7cddde 100644
--- a/src/bin/cxx/image_blend_border.cc
+++ b/src/bin/cxx/image_blend_border.cc
@@ -16,7 +16,6 @@
 #include "image_blend_border_cxx.c"
 
 efl::eina::list<evas::image> images;
-evas::canvas *canvas;
 
 /* standard var */
 static int done = 0;
@@ -24,26 +23,14 @@ static int done = 0;
 /* setup */
 static void _setup()
 {
-   int i;
-   Evas_Object *o;
-   canvas = new evas::canvas(::eo_ref(G_evas));
-
-   for (i = 0; i < OBNUM; i++)
+   evas::canvas canvas(::eo_ref(G_evas));
+   for (int i = 0; i < OBNUM; i++)
      {
-        evas::image o(efl::eo::parent = *canvas);
-        /// XXX
-        if(!::eo_composite_is(o._eo_ptr()))
-          {
-             std::cout << "<< >> " << __FUNCTION__ << "() +" << __LINE__ 
-                       << " XXX " << std::endl;
-             abort();
-          }
-        /// XXX
+        evas::image o(efl::eo::parent = canvas);
         images.push_back(o);
         o.file_set(::build_path("bar.png"), ""); // XXX
         o.border_set(6, 6, 6, 6);
         o.visibility_set(true);
-        canvas->render();
      }
    done = 0;
 }
@@ -52,7 +39,6 @@ static void _setup()
 static void _cleanup()
 {
    images.clear();
-   delete canvas;
 }
 
 /* loop - do things */