Enlightenment CVS committal
Author : andreas
Project : e17
Module : proto/eflpp
Dir : e17/proto/eflpp/src/esmart
Modified Files:
eflpp_esmart.cpp eflpp_esmart_container.cpp
eflpp_esmart_container.h eflpp_esmart_group.cpp
eflpp_esmart_textentry.cpp
Log Message:
- changed object creation from father to child
===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- eflpp_esmart.cpp 8 Aug 2007 19:32:03 -0000 1.3
+++ eflpp_esmart.cpp 14 Aug 2007 20:58:03 -0000 1.4
@@ -10,7 +10,7 @@
// EvasEsmart
//===============================================================================================
EvasEsmart::EvasEsmart(EvasCanvas *canvas, const char *type, const char *name )
- :EvasObject( canvas, type, name )
+ :EvasObject( canvas )
{
printf ("EvasEsmart constructor\n");
//selfEsmartPointer = this;
===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart_container.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eflpp_esmart_container.cpp 15 Jul 2007 10:38:07 -0000 1.1
+++ eflpp_esmart_container.cpp 14 Aug 2007 20:58:03 -0000 1.2
@@ -11,33 +11,46 @@
//===============================================================================================
EvasEsmartContainer::EvasEsmartContainer( EvasCanvas* canvas, const char* name
)
- :EvasEsmart( canvas, "esmart_container", name )
+ :EvasEsmart( canvas )
{
+ o = esmart_container_new( canvas->obj() );
+ init( name ? name : "esmart_container" );
}
EvasEsmartContainer::EvasEsmartContainer( Direction dir, EvasCanvas* canvas,
const char* name )
- :EvasEsmart( canvas, "esmart_container", name )
+ :EvasEsmart( canvas )
{
- setDirection( dir );
+ o = esmart_container_new( canvas->obj() );
+ init( name ? name : "esmart_container" );
+
+ setDirection( dir );
}
EvasEsmartContainer::EvasEsmartContainer( int x, int y, Direction dir,
EvasCanvas* canvas, const char* name )
- :EvasEsmart( canvas, "esmart_container", name )
+ :EvasEsmart( canvas )
{
- setDirection( dir );
- move( x, y );
+ o = esmart_container_new( canvas->obj() );
+
+ init( name ? name : "esmart_container" );
+
+ setDirection( dir );
+ move( x, y );
}
EvasEsmartContainer::EvasEsmartContainer( int x, int y, int width, int height,
Direction dir, EvasCanvas* canvas, const char* name )
- :EvasEsmart( canvas, "esmart_container", name )
+ :EvasEsmart( canvas )
{
- setDirection( dir );
- move( x, y );
- resize( width, height );
+ o = esmart_container_new( canvas->obj() );
+ init( name ? name : "esmart_container" );
+
+ setDirection( dir );
+ move( x, y );
+ resize( width, height );
}
EvasEsmartContainer::~EvasEsmartContainer()
{
+ evas_object_del( o );
}
void EvasEsmartContainer::setDirection( Direction dir )
===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart_container.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eflpp_esmart_container.h 15 Jul 2007 10:38:07 -0000 1.1
+++ eflpp_esmart_container.h 14 Aug 2007 20:58:03 -0000 1.2
@@ -90,7 +90,7 @@
protected:
-virtual void addHandler() {};
+ virtual void addHandler() {};
virtual void delHandler() {};
virtual void moveHandler( Evas_Coord x, Evas_Coord y ) {};
virtual void resizeHandler( Evas_Coord w, Evas_Coord h ) {};
===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart_group.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- eflpp_esmart_group.cpp 8 Aug 2007 19:32:03 -0000 1.3
+++ eflpp_esmart_group.cpp 14 Aug 2007 20:58:03 -0000 1.4
@@ -12,28 +12,34 @@
//===========================================================================//
EvasEsmartGroup::EvasEsmartGroup( EvasCanvas* canvas, const char* name )
- :EvasEsmart( canvas, "<attach>", name )
+ :EvasEsmart( canvas )
{
- o = newEsmart( name );
+ o = newEsmart( name );
+ init( name ? name : "esmart_group" );
}
EvasEsmartGroup::EvasEsmartGroup( int x, int y, EvasCanvas* canvas, const
char* name )
- :EvasEsmart( canvas, "<attach>", name )
+ :EvasEsmart( canvas )
{
- o = newEsmart( name );
- move( x, y );
+ o = newEsmart( name );
+ init( name ? name : "esmart_group" );
+
+ move( x, y );
}
EvasEsmartGroup::EvasEsmartGroup( int x, int y, int width, int height,
EvasCanvas* canvas, const char* name )
- :EvasEsmart( canvas, "<attach>", name )
+ :EvasEsmart( canvas )
{
- o = newEsmart( name );
- move( x, y );
- resize( width, height );
+ o = newEsmart( name );
+ init( name ? name : "esmart_group" );
+
+ move( x, y );
+ resize( width, height );
}
EvasEsmartGroup::~EvasEsmartGroup()
{
+ evas_object_del( o );
}
void EvasEsmartGroup::add (EvasObject *object)
===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart_textentry.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eflpp_esmart_textentry.cpp 15 Jul 2007 10:38:07 -0000 1.1
+++ eflpp_esmart_textentry.cpp 14 Aug 2007 20:58:03 -0000 1.2
@@ -11,28 +11,34 @@
//===========================================================================//
EvasEsmartTextEntry::EvasEsmartTextEntry( EvasCanvas* canvas, const char* name
)
- :EvasEsmart( canvas, "esmart_textentry", name )
+ :EvasEsmart( canvas )
{
+ o = esmart_text_entry_new( canvas->obj() );
+ init( name ? name : "esmart_textentry" );
}
EvasEsmartTextEntry::EvasEsmartTextEntry( int x, int y, EvasCanvas* canvas,
const char* name )
- :EvasEsmart( canvas, "esmart_textentry", name )
+ :EvasEsmart( canvas )
{
- move( x, y );
+ o = esmart_text_entry_new( canvas->obj() );
+ init( name ? name : "esmart_textentry" );
+
+ move( x, y );
}
EvasEsmartTextEntry::EvasEsmartTextEntry( int x, int y, int width, int height,
EvasCanvas* canvas, const char* name )
- :EvasEsmart( canvas, "esmart_textentry", name )
+ :EvasEsmart( canvas )
{
- //esmart_text_entry_max_chars_set(o, 32);
- //esmart_text_entry_is_password_set(o, true);
+ o = esmart_text_entry_new( canvas->obj() );
+ init( name ? name : "esmart_textentry" );
- move( x, y );
- resize( width, height );
+ move( x, y );
+ resize( width, height );
}
EvasEsmartTextEntry::~EvasEsmartTextEntry()
{
+ evas_object_del( o );
}
void EvasEsmartTextEntry::setText (const char *str)
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
