X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fdevice.cpp;h=dbd251cc390b65d733bae8416f38446383ff62a8;hb=bf17a313e03b695ec0d138e83ef183fdec764764;hp=503f11c2b54becab87f90b112d558e225abb5429;hpb=c4d9e46f268b4f7f738dd77685c632991125cec9;p=guile-irrlicht.git

diff --git a/src/device.cpp b/src/device.cpp
index 503f11c..dbd251c 100644
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -25,7 +25,6 @@
 #include "dimension2d.h"
 #include "driver-types.h"
 #include "gsubr.h"
-#include "wchar.h"
 #include "wrapped.h"
 
 using namespace irr;
@@ -47,7 +46,7 @@ irr_createDevice (SCM device_type,
                   scm_to_bool (stencilbuffer),
                   scm_to_bool (vsync),
                   (IEventReceiver*)scm_to_irr_pointer (receiver));
-  return scm_from_pointer ((void*)device, NULL);
+  return scm_from_irr_pointer ("<irrlicht-device>", (void*) device);
 }
 
 SCM
@@ -55,7 +54,7 @@ IrrlichtDevice_getCursorControl (SCM device)
 {
   gui::ICursorControl* cursor_control =
     ((IrrlichtDevice*)scm_to_irr_pointer (device))->getCursorControl ();
-  return scm_from_pointer ((void*)cursor_control, NULL);
+  return scm_from_irr_pointer ("<cursor-control>", (void*) cursor_control);
 }
 
 SCM
@@ -63,7 +62,7 @@ IrrlichtDevice_getFileSystem (SCM device)
 {
   io::IFileSystem* file_system =
     ((IrrlichtDevice*)scm_to_irr_pointer (device))->getFileSystem ();
-  return scm_from_pointer ((void*)file_system, NULL);
+  return scm_from_irr_pointer ("<file-system>", (void*) file_system);
 }
 
 SCM
@@ -71,7 +70,7 @@ IrrlichtDevice_getGUIEnvironment (SCM device)
 {
   gui::IGUIEnvironment* gui_env =
     ((IrrlichtDevice*)scm_to_irr_pointer (device))->getGUIEnvironment ();
-  return scm_from_pointer ((void*)gui_env, NULL);
+  return scm_from_irr_pointer ("<gui-environment>", (void*) gui_env);
 }
 
 SCM
@@ -79,7 +78,7 @@ IrrlichtDevice_getSceneManager (SCM device)
 {
   scene::ISceneManager* manager =
     ((IrrlichtDevice*)scm_to_irr_pointer (device))->getSceneManager ();
-  return scm_from_pointer ((void*)manager, NULL);
+  return scm_from_irr_pointer ("<scene-manager>", (void*) manager);
 }
 
 SCM
@@ -87,7 +86,7 @@ IrrlichtDevice_getTimer (SCM device)
 {
   ITimer* timer =
     ((IrrlichtDevice*)scm_to_irr_pointer (device))->getTimer ();
-  return scm_from_pointer ((void*)timer, NULL);
+  return scm_from_irr_pointer ("<timer>", (void*) timer);
 }
 
 SCM
@@ -95,7 +94,7 @@ IrrlichtDevice_getVideoDriver (SCM device)
 {
   video::IVideoDriver* driver =
     ((IrrlichtDevice*)scm_to_irr_pointer (device))->getVideoDriver ();
-  return scm_from_pointer ((void*)driver, NULL);
+  return scm_from_irr_pointer ("<video-driver>", (void*) driver);
 }
 
 SCM
@@ -135,8 +134,9 @@ SCM
 IrrlichtDevice_setWindowCaption (SCM device,
                                  SCM text)
 {
-  ((IrrlichtDevice*)scm_to_irr_pointer (device))->
-    setWindowCaption (scm_to_wide_char_string (text));
+  wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+  ((IrrlichtDevice*)scm_to_irr_pointer (device))->setWindowCaption (wtext);
+  free (wtext);
   return SCM_UNSPECIFIED;
 }