X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-scrollbar.cpp;h=bf9bd1c62582fa7ff620516211cb51e5e993357c;hb=3bb58c2b45af12c0f9c9eac648e67ac6fa90e104;hp=b67413effe2317d3b8f7833fc8849f3626a1c393;hpb=490e119e587a59ec16dbad027580e882f0fc0abc;p=guile-irrlicht.git

diff --git a/src/gui-scrollbar.cpp b/src/gui-scrollbar.cpp
index b67413e..bf9bd1c 100644
--- a/src/gui-scrollbar.cpp
+++ b/src/gui-scrollbar.cpp
@@ -23,45 +23,37 @@
 #include <libguile.h>
 #include "gui-scrollbar.h"
 #include "gsubr.h"
-
+#include "wrapped.h"
 
 using namespace irr;
 
-
 SCM
-gui_IGUIScrollBar_getPos (SCM gui_scrollbar)
+IGUIScrollBar_getPos (SCM gui_scrollbar)
 {
   return scm_from_int32
-    (((gui::IGUIScrollBar*)scm_to_pointer (gui_scrollbar))->getPos ());
+    (((gui::IGUIScrollBar*)scm_to_irr_pointer (gui_scrollbar))->getPos ());
 }
 
-
 SCM
-gui_IGUIScrollBar_setMax (SCM gui_scrollbar,
-                          SCM max)
+IGUIScrollBar_setMax (SCM gui_scrollbar,
+                      SCM max)
 {
-  ((gui::IGUIScrollBar*) scm_to_pointer (gui_scrollbar))->setMax (scm_to_int32 (max));
+  ((gui::IGUIScrollBar*) scm_to_irr_pointer (gui_scrollbar))->setMax (scm_to_int32 (max));
   return SCM_UNSPECIFIED;
 }
 
-
 SCM
-gui_IGUIScrollBar_setPos (SCM gui_scrollbar,
-                          SCM pos)
+IGUIScrollBar_setPos (SCM gui_scrollbar,
+                      SCM pos)
 {
-  ((gui::IGUIScrollBar*) scm_to_pointer (gui_scrollbar))->setPos (scm_to_int32 (pos));
+  ((gui::IGUIScrollBar*) scm_to_irr_pointer (gui_scrollbar))->setPos (scm_to_int32 (pos));
   return SCM_UNSPECIFIED;
 }
 
-
-extern "C" {
-
-  void
-  init_gui_scrollbar (void)
-  {
-    DEFINE_GSUBR ("gui_IGUIScrollBar_getPos", 1, 0, 0, gui_IGUIScrollBar_getPos);
-    DEFINE_GSUBR ("gui_IGUIScrollBar_setMax", 2, 0, 0, gui_IGUIScrollBar_setMax);
-    DEFINE_GSUBR ("gui_IGUIScrollBar_setPos", 2, 0, 0, gui_IGUIScrollBar_setPos);
-  }
-
+void
+init_gui_scrollbar (void)
+{
+  DEFINE_GSUBR ("IGUIScrollBar_getPos", 1, 0, 0, IGUIScrollBar_getPos);
+  DEFINE_GSUBR ("IGUIScrollBar_setMax", 2, 0, 0, IGUIScrollBar_setMax);
+  DEFINE_GSUBR ("IGUIScrollBar_setPos", 2, 0, 0, IGUIScrollBar_setPos);
 }