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

diff --git a/src/gui-scrollbar.cpp b/src/gui-scrollbar.cpp
index c5dbc8a..bf9bd1c 100644
--- a/src/gui-scrollbar.cpp
+++ b/src/gui-scrollbar.cpp
@@ -21,54 +21,39 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-
-#include "gui-element.h"
 #include "gui-scrollbar.h"
 #include "gsubr.h"
 #include "wrapped.h"
 
-extern "C" {
-
-  void
-  init_gui_scrollbar (void)
-  {
-    init_gui_scrollbar_type ();
-    DEFINE_GSUBR ("get-pos", 1, 0, 0, irr_gui_getPos);
-    DEFINE_GSUBR ("set-pos!", 2, 0, 0, irr_gui_setPos);
-  }
+using namespace irr;
 
-  DEFINE_WRAPPED_TYPE (irr::gui::IGUIScrollBar*, "gui-scrollbar",
-                       init_gui_scrollbar_type, gui_scrollbar_p,
-                       wrap_gui_scrollbar, unwrap_gui_scrollbar);
+SCM
+IGUIScrollBar_getPos (SCM gui_scrollbar)
+{
+  return scm_from_int32
+    (((gui::IGUIScrollBar*)scm_to_irr_pointer (gui_scrollbar))->getPos ());
+}
 
-  SCM
-  irr_gui_getPos (SCM wrapped_scrollbar)
-  {
-    irr::gui::IGUIScrollBar* scrollbar;
-    if (gui_element_p (wrapped_scrollbar))
-      {
-        scrollbar = (irr::gui::IGUIScrollBar*)unwrap_gui_element (wrapped_scrollbar);
-      }
-    else {
-      scrollbar = unwrap_gui_scrollbar (wrapped_scrollbar);
-    }
-    return scm_from_int32 (scrollbar->getPos ());
-  }
+SCM
+IGUIScrollBar_setMax (SCM gui_scrollbar,
+                      SCM max)
+{
+  ((gui::IGUIScrollBar*) scm_to_irr_pointer (gui_scrollbar))->setMax (scm_to_int32 (max));
+  return SCM_UNSPECIFIED;
+}
 
-  SCM
-  irr_gui_setPos (SCM wrapped_scrollbar,
-                  SCM pos)
-  {
-    irr::gui::IGUIScrollBar* scrollbar;
-    if (gui_element_p (wrapped_scrollbar))
-      {
-        scrollbar = (irr::gui::IGUIScrollBar*)unwrap_gui_element (wrapped_scrollbar);
-      }
-    else {
-      scrollbar = unwrap_gui_scrollbar (wrapped_scrollbar);
-    }
-    scrollbar->setPos (scm_to_int32 (pos));
-    return SCM_UNSPECIFIED;
-  }
+SCM
+IGUIScrollBar_setPos (SCM gui_scrollbar,
+                      SCM pos)
+{
+  ((gui::IGUIScrollBar*) scm_to_irr_pointer (gui_scrollbar))->setPos (scm_to_int32 (pos));
+  return SCM_UNSPECIFIED;
+}
 
+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);
 }