Enlightenment CVS committal
Author : mickeyl
Project : e17
Module : proto/eflpp
Dir : e17/proto/eflpp/src/evas
Modified Files:
eflpp_evas.cpp
Log Message:
eflpp_evas: restore formatting (please use 4 spaces)
===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/evas/eflpp_evas.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eflpp_evas.cpp 14 Aug 2007 20:58:03 -0000 1.4
+++ eflpp_evas.cpp 8 Oct 2007 17:58:26 -0000 1.5
@@ -598,13 +598,13 @@
{
o = evas_object_line_add( canvas->obj() );
init( name ? name : "line" );
-
+
evas_object_line_xy_set( o, x1, y1, x2, y2 );
}
EvasLine::~EvasLine()
{
- evas_object_del( o );
+ evas_object_del( o );
}
void EvasLine::setGeometry( int x, int y, int width, int height )
@@ -617,33 +617,33 @@
//===============================================================================================
EvasRectangle::EvasRectangle( EvasCanvas* canvas, const char* name )
- :EvasObject( canvas )
+ :EvasObject( canvas )
{
- o = evas_object_rectangle_add( canvas->obj() );
- init( name ? name : "rectangle" );
+ o = evas_object_rectangle_add( canvas->obj() );
+ init( name ? name : "rectangle" );
}
EvasRectangle::EvasRectangle( int x, int y, int width, int height, EvasCanvas*
canvas, const char* name )
:EvasObject( canvas )
{
- o = evas_object_rectangle_add( canvas->obj() );
- init( name ? name : "rectangle" );
-
- setGeometry( x, y, width, height );
+ o = evas_object_rectangle_add( canvas->obj() );
+ init( name ? name : "rectangle" );
+
+ setGeometry( x, y, width, height );
}
EvasRectangle::EvasRectangle( const Rect& r, EvasCanvas* canvas, const char*
name )
-:EvasObject( canvas )
+ :EvasObject( canvas )
{
- o = evas_object_rectangle_add( canvas->obj() );
- init( name ? name : "rectangle" );
-
+ o = evas_object_rectangle_add( canvas->obj() );
+ init( name ? name : "rectangle" );
+
setGeometry( r );
}
EvasRectangle::~EvasRectangle()
{
- evas_object_del( o );
+ evas_object_del( o );
}
//===============================================================================================
@@ -651,7 +651,7 @@
//===============================================================================================
EvasPolygon::EvasPolygon( EvasCanvas* canvas, const char* name )
- :EvasObject( canvas )
+ :EvasObject( canvas )
{
o = evas_object_polygon_add( canvas->obj() );
init( name ? name : "polygon" );
@@ -659,7 +659,7 @@
EvasPolygon::~EvasPolygon()
{
- evas_object_del( o );
+ evas_object_del( o );
}
void EvasPolygon::addPoint( int x, int y )
@@ -678,31 +678,31 @@
//===============================================================================================
EvasText::EvasText( EvasCanvas* canvas, const char* name )
- :EvasObject( canvas )
+ :EvasObject( canvas )
{
- o = evas_object_text_add( canvas->obj() );
+ o = evas_object_text_add( canvas->obj() );
init( name ? name : "text" );
-
+
setFont( EvasFont() );
}
EvasText::EvasText( int x, int y, const char* text, EvasCanvas* canvas, const
char* name )
- :EvasObject( canvas )
+ :EvasObject( canvas )
{
- o = evas_object_text_add( canvas->obj() );
+ o = evas_object_text_add( canvas->obj() );
init( name ? name : "text" );;
-
+
move( x, y );
setFont( EvasFont() );
setText( text );
}
EvasText::EvasText( const char* font, int size, const char* text, EvasCanvas*
canvas, const char* name )
- :EvasObject( canvas )
+ :EvasObject( canvas )
{
- o = evas_object_text_add( canvas->obj() );
+ o = evas_object_text_add( canvas->obj() );
init( name ? name : "text" );
-
+
setFont( font, size );
setText( text );
}
@@ -710,21 +710,21 @@
EvasText::EvasText( const char* font, int size, int x, int y, const char*
text, EvasCanvas* canvas, const char* name )
:EvasObject( canvas )
{
- o = evas_object_text_add( canvas->obj() );
+ o = evas_object_text_add( canvas->obj() );
init( name ? name : "text" );
-
+
move( x, y );
setFont( font, size );
setText( text );
}
EvasText::EvasText( EvasText* ao )
- :EvasObject( ao->canvas() )
+ :EvasObject( ao->canvas() )
{
Dout( dc::notice, *this << " EvasText::EvasText copy constructor" );
- o = evas_object_text_add( ao->canvas()->obj() );
+ o = evas_object_text_add( ao->canvas()->obj() );
init( "text" );
-
+
setGeometry( ao->geometry() );
setLayer( ao->layer() );
setText( ao->text() );
@@ -814,7 +814,7 @@
EvasText::~EvasText()
{
- evas_object_del( o );
+ evas_object_del( o );
}
//===============================================================================================
@@ -824,16 +824,16 @@
EvasTextBlock::EvasTextBlock( EvasCanvas* canvas, const char* name )
:EvasObject( canvas )
{
- o = evas_object_textblock_add( canvas->obj() );
+ o = evas_object_textblock_add( canvas->obj() );
init( name ? name : "textblock" );
}
EvasTextBlock::EvasTextBlock( int x, int y, const char* text, EvasCanvas*
canvas, const char* name )
:EvasObject( canvas )
{
- o = evas_object_textblock_add( canvas->obj() );
+ o = evas_object_textblock_add( canvas->obj() );
init( name ? name : "textblock" );
-
+
move( x, y );
insertText( text );
//setFont( "Vera", 10 );
@@ -868,7 +868,7 @@
EvasTextBlock::~EvasTextBlock()
{
- evas_object_del( o );
+ evas_object_del( o );
}
//===============================================================================================
@@ -878,9 +878,9 @@
EvasImage::EvasImage( EvasCanvas* canvas, const char* name )
:EvasObject( canvas )
{
- o = evas_object_image_add( canvas->obj() );
+ o = evas_object_image_add( canvas->obj() );
init( name ? name : "image" );
-
+
_size = size ();
resize( _size );
}
@@ -888,9 +888,9 @@
EvasImage::EvasImage( const char* filename, EvasCanvas* canvas, const char*
name )
:EvasObject( canvas )
{
- o = evas_object_image_add( canvas->obj() );
+ o = evas_object_image_add( canvas->obj() );
init( name ? name : filename );
-
+
setFile( filename );
_size = size();
resize( _size );
@@ -899,9 +899,9 @@
EvasImage::EvasImage( int x, int y, const char* filename, EvasCanvas* canvas,
const char* name )
:EvasObject( canvas )
{
- o = evas_object_image_add( canvas->obj() );
+ o = evas_object_image_add( canvas->obj() );
init( name ? name : filename );
-
+
setFile( filename );
move( x, y );
_size = size();
@@ -913,9 +913,9 @@
EvasImage::EvasImage( Evas_Object* object, EvasCanvas* canvas, const char*
name )
:EvasObject( canvas, "<attach>", name )
{
- o = evas_object_image_add( canvas->obj() );
+ o = evas_object_image_add( canvas->obj() );
init( name ? name : type );
-
+
o = object;
_size = size();
}
@@ -923,7 +923,7 @@
EvasImage::~EvasImage()
{
- evas_object_del( o );
+ evas_object_del( o );
}
bool EvasImage::setFile( const char* path, const char* key )
@@ -1022,23 +1022,22 @@
EvasGradient::EvasGradient( EvasCanvas* canvas, const char* name )
: EvasObject( canvas )
{
- o = evas_object_gradient_add( canvas->obj() );
+ o = evas_object_gradient_add( canvas->obj() );
init( name ? name : "gradient" );
}
EvasGradient::EvasGradient( int x, int y, int width, int height, EvasCanvas*
canvas, const char* name )
:EvasObject( canvas )
{
- o = evas_object_gradient_add( canvas->obj() );
-
+ o = evas_object_gradient_add( canvas->obj() );
init( name ? name : "gradient" );
-
+
setGeometry( x, y, width, height );
}
EvasGradient::~EvasGradient()
{
- evas_object_del( o );
+ evas_object_del( o );
}
void EvasGradient::addColorStop( int r, int g, int b, int a, int distance )
-------------------------------------------------------------------------
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
