tasn pushed a commit to branch master.
http://git.enlightenment.org/bindings/cxx/eflxx.git/commit/?id=70eae1544b9c5e89f46791c60615132c81cd4b44
commit 70eae1544b9c5e89f46791c60615132c81cd4b44
Author: Andreas Volz <li...@brachttal.net>
Date: Sun Jul 4 19:57:57 2010 +0000
compiles again
SVN revision: 50030
---
ecorexx/include/ecorexx/Animator.h | 2 +-
ecorexx/include/ecorexx/Timer.h | 2 +-
ecorexx/src/Animator.cpp | 2 +-
ecorexx/src/EvasWindow.cpp | 8 ++++----
ecorexx/src/Timer.cpp | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ecorexx/include/ecorexx/Animator.h
b/ecorexx/include/ecorexx/Animator.h
index 7e86540..58c42c4 100644
--- a/ecorexx/include/ecorexx/Animator.h
+++ b/ecorexx/include/ecorexx/Animator.h
@@ -19,7 +19,7 @@ public:
private:
Ecore_Animator* _ea;
- static int __dispatcher( void* data );
+ static Eina_Bool __dispatcher( void* data );
};
} // end namespace Ecorexx
diff --git a/ecorexx/include/ecorexx/Timer.h b/ecorexx/include/ecorexx/Timer.h
index af8899d..301bac3 100644
--- a/ecorexx/include/ecorexx/Timer.h
+++ b/ecorexx/include/ecorexx/Timer.h
@@ -50,7 +50,7 @@ private:
Ecore_Timer* _et;
bool _ss;
- static int __dispatcher( void* data );
+ static Eina_Bool __dispatcher( void* data );
};
} // end namespace Ecorexx
diff --git a/ecorexx/src/Animator.cpp b/ecorexx/src/Animator.cpp
index 96f6fba..b7d6f5b 100644
--- a/ecorexx/src/Animator.cpp
+++ b/ecorexx/src/Animator.cpp
@@ -34,7 +34,7 @@ bool Animator::tick()
return true;
}
-int Animator::__dispatcher( void* data )
+Eina_Bool Animator::__dispatcher( void* data )
{
Animator* object = reinterpret_cast<Animator*>( data );
int result = object->tick();
diff --git a/ecorexx/src/EvasWindow.cpp b/ecorexx/src/EvasWindow.cpp
index 1588f18..cc4c2b0 100644
--- a/ecorexx/src/EvasWindow.cpp
+++ b/ecorexx/src/EvasWindow.cpp
@@ -462,7 +462,7 @@ EvasWindowSoftwareX11::EvasWindowSoftwareX11( const
Eflxx::Size &size, const cha
ecore_evas_title_set( _ee, Application::getInstance()->getName().c_str() );
ecore_evas_borderless_set( _ee, 0 );
- _canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) );
+ _canvas = Evasxx::Canvas::wrap ( ecore_evas_get( _ee ) );
/* Set up magic object back link */
ecore_evas_data_set( _ee, "obj_c++", this );
@@ -501,7 +501,7 @@ EvasWindowGLX11::EvasWindowGLX11( const Eflxx::Size &size,
const char* display )
ecore_evas_title_set( _ee, Application::getInstance()->getName().c_str() );
ecore_evas_borderless_set( _ee, 0 );
- _canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) );
+ _canvas = Evasxx::Canvas::wrap (ecore_evas_get( _ee ));
/* Set up magic object back link */
ecore_evas_data_set( _ee, "obj_c++", this );
@@ -541,7 +541,7 @@ EvasWindowXRenderX11::EvasWindowXRenderX11( const
Eflxx::Size &size, const char*
ecore_evas_title_set( _ee, Application::getInstance()->getName().c_str() );
ecore_evas_borderless_set( _ee, 0 );
- _canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) );
+ _canvas = Evasxx::Canvas::wrap (ecore_evas_get( _ee ));
/* Set up magic object back link */
ecore_evas_data_set( _ee, "obj_c++", this );
@@ -622,7 +622,7 @@ EvasWindowFB::EvasWindowFB( const Eflxx::Size &size, const
char* display, int ro
ecore_evas_title_set( _ee, Application::getInstance()->getName().c_str() );
ecore_evas_borderless_set( _ee, 0 );
- _canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) );
+ _canvas = Evasxx::Canvas::wrap (ecore_evas_get( _ee ));
/* Set up magic object back link */
ecore_evas_data_set( _ee, "obj_c++", this );
diff --git a/ecorexx/src/Timer.cpp b/ecorexx/src/Timer.cpp
index 6691ea0..e4a788b 100644
--- a/ecorexx/src/Timer.cpp
+++ b/ecorexx/src/Timer.cpp
@@ -81,7 +81,7 @@ void Timer::setPrecision (double precision)
Dout( dc::notice, "Timer[ " << this << " ]::tick()" );
}*/
-int Timer::__dispatcher( void* data )
+Eina_Bool Timer::__dispatcher( void* data )
{
Timer* object = reinterpret_cast<Timer*>( data );
assert( object );
--
