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:
groogy 2011-02-27 14:07:10 +00:00
parent 0a2abc6933
commit 7d7c4c999f
26 changed files with 235 additions and 301 deletions

View file

@ -620,12 +620,10 @@ static VALUE Window_Initialize( int argc, VALUE *args, VALUE self )
return self;
}
static VALUE Window_New( int argc, VALUE *args, VALUE aKlass )
static VALUE Window_Alloc( VALUE aKlass )
{
sf::Window *object = new sf::Window();
VALUE rbData = Data_Wrap_Struct( aKlass, 0, Window_Free, object );
rb_obj_call_init( rbData, argc, args );
return rbData;
return Data_Wrap_Struct( aKlass, 0, Window_Free, object );
}
void Init_Window( void )
@ -680,7 +678,8 @@ void Init_Window( void )
rb_include_module( globalWindowClass, globalNonCopyableModule );
// Class methods
rb_define_singleton_method( globalWindowClass, "new", Window_New , -1 );
//rb_define_singleton_method( globalWindowClass, "new", Window_New , -1 );
rb_define_alloc_func( globalWindowClass, Window_Alloc );
// Instance methods
rb_define_method( globalWindowClass, "initialize", Window_Initialize, -1 );