X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=blobdiff_plain;f=src%2Fgui-environment.cpp;h=9c45b3574aac9058947a7ffe97b217eefa9f6363;hp=92e4a7b5b6a08a0e3d3d2096f11d1c1547d9236d;hb=41a6ad96e81a8d8153c54877c4c12f61100677a9;hpb=bf2cb00e2ef19e2eb33557f900405f836ebe65a3

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index 92e4a7b..9c45b35 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -27,10 +27,8 @@
 #include "rect.h"
 #include "wchar.h"
 
-
 using namespace irr;
 
-
 template <typename TParent>
 SCM
 IGUIEnvironment_addButton (SCM gui_environment,
@@ -50,7 +48,6 @@ IGUIEnvironment_addButton (SCM gui_environment,
   return scm_from_pointer ((void*)button, NULL);
 }
 
-
 template <typename TParent>
 SCM
 IGUIEnvironment_addEditBox (SCM gui_environment,
@@ -70,7 +67,6 @@ IGUIEnvironment_addEditBox (SCM gui_environment,
   return scm_from_pointer ((void*)editbox, NULL);
 }
 
-
 template <typename TParent>
 SCM
 IGUIEnvironment_addImage (SCM gui_environment,
@@ -92,7 +88,6 @@ IGUIEnvironment_addImage (SCM gui_environment,
   return scm_from_pointer ((void*) new_image, NULL);
 }
 
-
 template <typename TParent>
 SCM
 IGUIEnvironment_addListBox (SCM gui_environment,
@@ -110,7 +105,6 @@ IGUIEnvironment_addListBox (SCM gui_environment,
   return scm_from_pointer ((void*)listbox, NULL);
 }
 
-
 template <typename TParent>
 SCM
 IGUIEnvironment_addScrollBar (SCM gui_environment,
@@ -128,7 +122,6 @@ IGUIEnvironment_addScrollBar (SCM gui_environment,
   return scm_from_pointer ((void*)scrollbar, NULL);
 }
 
-
 template <typename TParent>
 SCM
 IGUIEnvironment_addStaticText (SCM gui_environment,
@@ -152,7 +145,6 @@ IGUIEnvironment_addStaticText (SCM gui_environment,
   return scm_from_pointer ((void*)static_text, NULL);
 }
 
-
 template <typename TParent>
 SCM
 IGUIEnvironment_addWindow (SCM gui_environment,
@@ -172,7 +164,6 @@ IGUIEnvironment_addWindow (SCM gui_environment,
   return scm_from_pointer ((void*)window, NULL);
 }
 
-
 SCM
 IGUIEnvironment_drawAll (SCM gui_environment)
 {
@@ -180,7 +171,6 @@ IGUIEnvironment_drawAll (SCM gui_environment)
   return SCM_UNSPECIFIED;
 }
 
-
 SCM
 IGUIEnvironment_getBuiltInFont (SCM gui_environment)
 {
@@ -189,7 +179,6 @@ IGUIEnvironment_getBuiltInFont (SCM gui_environment)
   return scm_from_pointer ((void*)font, NULL);
 }
 
-
 SCM
 IGUIEnvironment_getFont (SCM gui_environment,
                          SCM filename)
@@ -200,7 +189,6 @@ IGUIEnvironment_getFont (SCM gui_environment,
   return scm_from_pointer ((void*)font, NULL);
 }
 
-
 SCM
 IGUIEnvironment_getSkin (SCM gui_environment)
 {
@@ -209,30 +197,25 @@ IGUIEnvironment_getSkin (SCM gui_environment)
   return scm_from_pointer ((void*)skin, NULL);
 }
 
-
-extern "C" {
-
-  void
-  init_gui_environment (void)
-  {
-    DEFINE_GSUBR ("IGUIEnvironment_addButton_IGUIElement", 6, 0, 0,
-                  IGUIEnvironment_addButton<gui::IGUIElement*>);
-    DEFINE_GSUBR ("IGUIEnvironment_addEditBox_IGUIElement", 6, 0, 0,
-                  IGUIEnvironment_addEditBox<gui::IGUIElement*>);
-    DEFINE_GSUBR ("IGUIEnvironment_addImage_IGUIElement", 7, 0, 0,
-                  IGUIEnvironment_addImage<gui::IGUIElement*>);
-    DEFINE_GSUBR ("IGUIEnvironment_addListBox_IGUIElement", 5, 0, 0,
-                  IGUIEnvironment_addListBox<gui::IGUIElement*>);
-    DEFINE_GSUBR ("IGUIEnvironment_addScrollBar_IGUIElement", 5, 0, 0,
-                  IGUIEnvironment_addScrollBar<gui::IGUIElement*>);
-    DEFINE_GSUBR ("IGUIEnvironment_addStaticText_IGUIElement", 8, 0, 0,
-                  IGUIEnvironment_addStaticText<gui::IGUIElement*>);
-    DEFINE_GSUBR ("IGUIEnvironment_addWindow_IGUIElement", 6, 0, 0,
-                  IGUIEnvironment_addWindow<gui::IGUIElement*>);
-    DEFINE_GSUBR ("IGUIEnvironment_drawAll", 1, 0, 0, IGUIEnvironment_drawAll);
-    DEFINE_GSUBR ("IGUIEnvironment_getBuiltInFont", 1, 0, 0, IGUIEnvironment_getBuiltInFont);
-    DEFINE_GSUBR ("IGUIEnvironment_getFont", 2, 0, 0, IGUIEnvironment_getFont);
-    DEFINE_GSUBR ("IGUIEnvironment_getSkin", 1, 0, 0, IGUIEnvironment_getSkin);
-  }
-
+void
+init_gui_environment (void)
+{
+  DEFINE_GSUBR ("IGUIEnvironment_addButton_IGUIElement", 6, 0, 0,
+                IGUIEnvironment_addButton<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addEditBox_IGUIElement", 6, 0, 0,
+                IGUIEnvironment_addEditBox<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addImage_IGUIElement", 7, 0, 0,
+                IGUIEnvironment_addImage<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addListBox_IGUIElement", 5, 0, 0,
+                IGUIEnvironment_addListBox<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addScrollBar_IGUIElement", 5, 0, 0,
+                IGUIEnvironment_addScrollBar<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addStaticText_IGUIElement", 8, 0, 0,
+                IGUIEnvironment_addStaticText<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addWindow_IGUIElement", 6, 0, 0,
+                IGUIEnvironment_addWindow<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_drawAll", 1, 0, 0, IGUIEnvironment_drawAll);
+  DEFINE_GSUBR ("IGUIEnvironment_getBuiltInFont", 1, 0, 0, IGUIEnvironment_getBuiltInFont);
+  DEFINE_GSUBR ("IGUIEnvironment_getFont", 2, 0, 0, IGUIEnvironment_getFont);
+  DEFINE_GSUBR ("IGUIEnvironment_getSkin", 1, 0, 0, IGUIEnvironment_getSkin);
 }