parent
9d162e6875
commit
57660de41e
|
@ -106,6 +106,7 @@ void Application::quit()
|
||||||
|
|
||||||
void Application::startTimer( double seconds )
|
void Application::startTimer( double seconds )
|
||||||
{
|
{
|
||||||
|
// FIXME: why is this needed? Who deletes this Timer object?
|
||||||
Timer* ecoretimer = new Timer( seconds );
|
Timer* ecoretimer = new Timer( seconds );
|
||||||
ecoretimer->timeout.connect( sigc::mem_fun( this, &Application::timerEvent ) );
|
ecoretimer->timeout.connect( sigc::mem_fun( this, &Application::timerEvent ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
/* EFL++ */
|
/* EFL++ */
|
||||||
#include <eflxx/Common.h>
|
#include <eflxx/Common.h>
|
||||||
#include <evasxx/Canvas.h>
|
#include <evasxx/Canvas.h>
|
||||||
#include <evasxx/Object.h>
|
#include <evasxx/Smart.h>
|
||||||
|
|
||||||
/* STD */
|
/* STD */
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
@ -21,7 +21,7 @@ using namespace std;
|
||||||
|
|
||||||
namespace Emotionxx {
|
namespace Emotionxx {
|
||||||
|
|
||||||
class Object : public Evasxx::Object
|
class Object : public Evasxx::Smart
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void setFile (const std::string &filename);
|
void setFile (const std::string &filename);
|
||||||
|
|
|
@ -97,10 +97,12 @@ public:
|
||||||
*/
|
*/
|
||||||
void setData (void *data);
|
void setData (void *data);
|
||||||
|
|
||||||
void addEventSignal (const std::string &event);
|
|
||||||
|
|
||||||
void delEventSignal (const std::string &event);
|
void delEventSignal (const std::string &event);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* Implicit add an event signal. So need to call delEventSignal()
|
||||||
|
* when not longer using it.
|
||||||
|
*/
|
||||||
sigc::signal <void, Object&, void*> *getEventSignal (const std::string &event);
|
sigc::signal <void, Object&, void*> *getEventSignal (const std::string &event);
|
||||||
|
|
||||||
void callEventSignal (const std::string &event, void *event_info);
|
void callEventSignal (const std::string &event, void *event_info);
|
||||||
|
@ -161,6 +163,8 @@ private:
|
||||||
Evas_Object *newEsmart( Canvas &canvas, const std::string &name );
|
Evas_Object *newEsmart( Canvas &canvas, const std::string &name );
|
||||||
|
|
||||||
static void wrapCustomEvent (void *data, Evas_Object *obj, void *event_info);
|
static void wrapCustomEvent (void *data, Evas_Object *obj, void *event_info);
|
||||||
|
|
||||||
|
void addEventSignal (const std::string &event);
|
||||||
|
|
||||||
static void wrap_add(Evas_Object *o);
|
static void wrap_add(Evas_Object *o);
|
||||||
static void wrap_del(Evas_Object *o);
|
static void wrap_del(Evas_Object *o);
|
||||||
|
|
Loading…
Reference in New Issue