X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-skin.cpp;h=6e4f66e8a88a4823316f08bca462ae49a4feed3d;hb=4f049544ec827a9f1f16a913d7241f29179fdde7;hp=f6628f1b4a1eeda6a67de1377910ef8738ee5da0;hpb=41a6ad96e81a8d8153c54877c4c12f61100677a9;p=guile-irrlicht.git

diff --git a/src/gui-skin.cpp b/src/gui-skin.cpp
index f6628f1..6e4f66e 100644
--- a/src/gui-skin.cpp
+++ b/src/gui-skin.cpp
@@ -24,6 +24,7 @@
 #include "color.h"
 #include "gsubr.h"
 #include "gui-skin.h"
+#include "wrapped.h"
 
 using namespace irr;
 
@@ -31,7 +32,7 @@ SCM
 IGUISkin_getColor (SCM gui_skin,
                    SCM color)
 {
-  gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_pointer (gui_skin);
+  gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_irr_pointer (gui_skin);
   video::SColor scolor = skin->getColor (scm_to_default_color (color));
   return scm_from_color (scolor);
 }
@@ -40,7 +41,7 @@ SCM
 IGUISkin_getFont (SCM gui_skin,
                   SCM which)
 {
-  gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_pointer (gui_skin);
+  gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_irr_pointer (gui_skin);
   gui::IGUIFont* font = skin->getFont (scm_to_default_font (which));
   return scm_from_pointer ((void*) font, NULL);
 }
@@ -50,7 +51,7 @@ IGUISkin_setColor (SCM gui_skin,
                    SCM which,
                    SCM new_color)
 {
-  gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_pointer (gui_skin);
+  gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_irr_pointer (gui_skin);
   skin->setColor (scm_to_default_color (which),
                   scm_to_color (new_color));
   return SCM_UNSPECIFIED;
@@ -61,8 +62,8 @@ IGUISkin_setFont (SCM gui_skin,
                   SCM font,
                   SCM which)
 {
-  gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_pointer (gui_skin);
-  skin->setFont ((gui::IGUIFont*) scm_to_pointer (font),
+  gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_irr_pointer (gui_skin);
+  skin->setFont ((gui::IGUIFont*) scm_to_irr_pointer (font),
                  scm_to_default_font (which));
   return SCM_UNSPECIFIED;
 }
@@ -79,7 +80,7 @@ init_gui_skin (void)
 gui::EGUI_DEFAULT_COLOR
 scm_to_default_color (SCM default_color)
 {
-  char* color = scm_to_utf8_stringn (scm_symbol_to_string (default_color), NULL);
+  char* color = scm_to_utf8_string (scm_symbol_to_string (default_color));
   if (!strcmp (color, "3d-dark-shadow"))
     {
       return gui::EGDC_3D_DARK_SHADOW;
@@ -190,7 +191,7 @@ scm_to_default_color (SCM default_color)
 gui::EGUI_DEFAULT_FONT
 scm_to_default_font (SCM default_font)
 {
-  char* font = scm_to_utf8_stringn (scm_symbol_to_string (default_font), NULL);
+  char* font = scm_to_utf8_string (scm_symbol_to_string (default_font));
   if (!strcmp (font, "default"))
     {
       return gui::EGDF_DEFAULT;