E CVS: proto/eflpp andreas

[Enlightenment CVS]

Enlightenment CVS committal

Author  : andreas
Project : e17
Module  : proto/eflpp

Dir     : e17/proto/eflpp/src/esmart


Modified Files:
        eflpp_esmart.cpp eflpp_esmart_group.cpp 


Log Message:
fixed some bugs that happen while wip on esmart

===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- eflpp_esmart.cpp    18 Aug 2007 18:28:00 -0000      1.5
+++ eflpp_esmart.cpp    18 Aug 2007 21:56:58 -0000      1.6
@@ -56,58 +56,65 @@
 void EvasEsmart::wrap_add( Evas_Object *o ) 
 {
   // FIXME: data not bound to object at this point. Think about new wrapper 
design...
-  //EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o));
-  //es->addHandler();
+  EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o));
+  if (es)
+    es->addHandler();
 }
 
 void EvasEsmart::wrap_del(Evas_Object *o) 
 {
-  EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(o));
-  es->delHandler();
+  EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o));
+  if (es)
+    es->delHandler();
 }
 
 void EvasEsmart::wrap_move(Evas_Object *o, Evas_Coord x, Evas_Coord y) 
 {
-  EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(sc));
-  es->moveHandler( x, y );
+  EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o));
+  if (es)
+    es->moveHandler( x, y );
 }
 
 void EvasEsmart::wrap_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h) 
 {
-  EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(o));
-  es->resizeHandler( w, h );
+  EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o));
+  if (es)
+    es->resizeHandler( w, h );
 }
 
 void EvasEsmart::wrap_show(Evas_Object *o) 
 {
-  cerr << "wrap_show" << endl;
-  EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(o));
+  cerr << "show" << endl;
+  EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o));
   es->showHandler();
 }
 
 void EvasEsmart::wrap_hide(Evas_Object *o) 
 {
-  cerr << "wrap_hide" << endl;
-  EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(o));
-  es->hideHandler();
+  EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o));
+  if (es)
+    es->hideHandler();
 }
 
 void EvasEsmart::wrap_color_set(Evas_Object *o, int r, int g, int b, int a) 
 {
-  EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(o));
-  es->colorSetHandler( r, g, b, a );
+  EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o));
+  if (es)
+    es->colorSetHandler( r, g, b, a );
 }
 
 void EvasEsmart::wrap_clip_set(Evas_Object *o, Evas_Object *clip) 
 {
-  EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(o));
-  es->clipSetHandler( clip );
+  EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o));
+  if (es)
+    es->clipSetHandler( clip );
 }
 
 void EvasEsmart::wrap_clip_unset(Evas_Object *o)
 {
   EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o));
-  es->clipUnsetHandler();
+  if (es)
+    es->clipUnsetHandler();
 }
 
 } // end namespace efl
===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart_group.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eflpp_esmart_group.cpp      14 Aug 2007 20:58:03 -0000      1.4
+++ eflpp_esmart_group.cpp      18 Aug 2007 21:56:58 -0000      1.5
@@ -83,7 +83,6 @@
        eol_it++)
   {
     EvasObject *eo = (*eol_it);
-    cerr << "show" << endl; 
     eo->show();
   }
 }
@@ -96,7 +95,6 @@
        eol_it++)
   {
     EvasObject *eo = (*eol_it);
-    cerr << "hide" << endl;
     eo->hide();
   } 
 }



-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs