Some refactoring, moved C++ allocation into the *_Alloc function instead of directly in new, removed new in most of classes too. Cloning should work on all copyable classes now.
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1802 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
parent
0a2abc6933
commit
7d7c4c999f
26 changed files with 235 additions and 301 deletions
|
@ -156,17 +156,10 @@ static VALUE Font_InitializeCopy( VALUE self, VALUE aSource )
|
|||
*object = *source;
|
||||
}
|
||||
|
||||
/* call-seq:
|
||||
* Font.new() -> font
|
||||
*
|
||||
* Creates an empty font
|
||||
*/
|
||||
static VALUE Font_New( int argc, VALUE *args, VALUE aKlass )
|
||||
static VALUE Font_Alloc( VALUE aKlass )
|
||||
{
|
||||
sf::Font *object = new sf::Font();
|
||||
VALUE rbData = Data_Wrap_Struct( aKlass, 0, Font_Free, object );
|
||||
rb_obj_call_init( rbData, argc, args );
|
||||
return rbData;
|
||||
return Data_Wrap_Struct( aKlass, 0, Font_Free, object );
|
||||
}
|
||||
|
||||
/* call-seq:
|
||||
|
@ -241,7 +234,8 @@ void Init_Font( void )
|
|||
globalFontClass = rb_define_class_under( sfml, "Font", rb_cObject );
|
||||
|
||||
// Class methods
|
||||
rb_define_singleton_method( globalFontClass, "new", Font_New, -1 );
|
||||
//rb_define_singleton_method( globalFontClass, "new", Font_New, -1 );
|
||||
rb_define_alloc_func( globalFontClass, Font_Alloc );
|
||||
rb_define_singleton_method( globalFontClass, "getDefaultFont", Font_GetDefaultFont, 0 );
|
||||
|
||||
// Instance methods
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue