X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-toolbar.cpp;h=18a71f78f5d48255594cbf7933ae4f59b9a0e3b9;hb=357f279e004c6257a160205835c06c283d317ef7;hp=1f38bdbcdcba46fc6e8622cb8456645b4e08962e;hpb=19663b6c5766b06c73148fdf803ce3555052a23e;p=guile-irrlicht.git

diff --git a/src/gui-toolbar.cpp b/src/gui-toolbar.cpp
index 1f38bdb..18a71f7 100644
--- a/src/gui-toolbar.cpp
+++ b/src/gui-toolbar.cpp
@@ -23,41 +23,40 @@
 #include <libguile.h>
 #include "gsubr.h"
 #include "gui-toolbar.h"
-#include "wchar.h"
-
+#include "wrapped.h"
 
 using namespace irr;
 
-
 SCM
-irr_gui_IGUIToolBar_addButton (SCM gui_toolbar,
-                               SCM id,
-                               SCM text,
-                               SCM tooltiptext,
-                               SCM img,
-                               SCM pressedimg,
-                               SCM is_push_button,
-                               SCM use_alpha_channel)
+IGUIToolBar_addButton (SCM gui_toolbar,
+                       SCM id,
+                       SCM text,
+                       SCM tooltiptext,
+                       SCM img,
+                       SCM pressedimg,
+                       SCM is_push_button,
+                       SCM use_alpha_channel)
 {
-  gui::IGUIToolBar* toolbar = (gui::IGUIToolBar*) scm_to_pointer (gui_toolbar);
+  gui::IGUIToolBar* toolbar = (gui::IGUIToolBar*) scm_to_irr_pointer (gui_toolbar);
+  wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+  wchar_t* wtooltiptext = (wchar_t*) scm_to_utf32_string (tooltiptext);
+
   gui::IGUIButton* button =
     toolbar->addButton (scm_to_int32 (id),
-                        scm_to_wide_char_string (text),
-                        scm_to_wide_char_string (tooltiptext),
-                        (video::ITexture*) scm_to_pointer (img),
-                        (video::ITexture*) scm_to_pointer (pressedimg),
+                        wtext,
+                        wtooltiptext,
+                        (video::ITexture*) scm_to_irr_pointer (img),
+                        (video::ITexture*) scm_to_irr_pointer (pressedimg),
                         scm_to_bool (is_push_button),
                         scm_to_bool (use_alpha_channel));
+
+  free (wtext);
+  free (wtooltiptext);
   return scm_from_pointer ((void*) button, NULL);
 }
 
-
-extern "C" {
-
-  void
-  init_gui_toolbar (void)
-  {
-    DEFINE_GSUBR ("irr_gui_IGUIToolBar_addButton", 8, 0, 0, irr_gui_IGUIToolBar_addButton);
-  }
-
+void
+init_gui_toolbar (void)
+{
+  DEFINE_GSUBR ("IGUIToolBar_addButton", 8, 0, 0, IGUIToolBar_addButton);
 }