X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-toolbar.cpp;h=997de689b6cc1ac84e3584fb7c3bd320c2189ef4;hb=41a6ad96e81a8d8153c54877c4c12f61100677a9;hp=3eac3772beddb973413e924528d5f8ef888375e9;hpb=63b5eb2539286acf8f8961c342363f7e14319c89;p=guile-irrlicht.git

diff --git a/src/gui-toolbar.cpp b/src/gui-toolbar.cpp
index 3eac377..997de68 100644
--- a/src/gui-toolbar.cpp
+++ b/src/gui-toolbar.cpp
@@ -21,22 +21,21 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
+#include "gsubr.h"
 #include "gui-toolbar.h"
 #include "wchar.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::IGUIButton* button =
@@ -50,13 +49,8 @@ irr_gui_IGUIToolBar_addButton (SCM gui_toolbar,
   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);
 }