X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-environment.h;h=064cb5df6b3b1ab0c83b2cdb6b5a701c6dd40e60;hb=af95bcdb523274a0a768e173807958ffe16e020d;hp=5c6da7ecefdf66865915894219c8d6dcdb3327f3;hpb=5ae44925acf0d6905a62e28a09af184d9db655a1;p=guile-irrlicht.git

diff --git a/src/gui-environment.h b/src/gui-environment.h
index 5c6da7e..064cb5d 100644
--- a/src/gui-environment.h
+++ b/src/gui-environment.h
@@ -24,68 +24,87 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-#include "wrapped.h"
 
-extern "C" {
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addButton (SCM gui_environment,
+                                   SCM rectangle,
+                                   SCM parent,
+                                   SCM id,
+                                   SCM text,
+                                   SCM tooltiptext);
+
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addEditBox (SCM gui_environment,
+                                    SCM text,
+                                    SCM rectangle,
+                                    SCM border,
+                                    SCM parent,
+                                    SCM id);
+
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addImage (SCM gui_environment,
+                                  SCM image,
+                                  SCM position,
+                                  SCM use_alpha_channel,
+                                  SCM parent,
+                                  SCM id,
+                                  SCM text);
+
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addListBox (SCM gui_environment,
+                                    SCM rectangle,
+                                    SCM parent,
+                                    SCM id,
+                                    SCM draw_background);
+
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addScrollBar (SCM gui_environment,
+                                      SCM horizontal,
+                                      SCM rectangle,
+                                      SCM parent,
+                                      SCM id);
+
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addStaticText (SCM gui_environment,
+                                       SCM text,
+                                       SCM rectangle,
+                                       SCM border,
+                                       SCM word_wrap,
+                                       SCM parent,
+                                       SCM id,
+                                       SCM fill_background);
+
+template <typename TParent>
+SCM
+gui_IGUIEnvironment_addWindow (SCM gui_environment,
+                                   SCM rectangle,
+                                   SCM modal,
+                                   SCM text,
+                                   SCM parent,
+                                   SCM id);
+
+SCM
+gui_IGUIEnvironment_drawAll (SCM gui_environment);
+
+SCM
+gui_IGUIEnvironment_getBuiltInFont (SCM gui_environment);
+
+SCM
+gui_IGUIEnvironment_getFont (SCM gui_environment,
+                                 SCM filename);
+
+SCM
+gui_IGUIEnvironment_getSkin (SCM gui_environment);
 
+extern "C" {
   void
   init_gui_environment (void);
-
-  DECLARE_WRAPPED_TYPE (irr::gui::IGUIEnvironment*, init_gui_environment_type,
-                        gui_environment_p, wrap_gui_environment, unwrap_gui_environment);
-
-  SCM
-  irr_getGUIEnvironment (SCM wrapped_obj);
-
-  SCM
-  irr_gui_addImage (SCM wrapped_gui_environment,
-                    SCM image,
-                    SCM position,
-                    SCM rest);
-
-  SCM
-  irr_gui_addEditBox (SCM wrapped_gui_environment,
-                      SCM text,
-                      SCM rectangle,
-                      SCM rest);
-
-  SCM
-  irr_gui_addListBox (SCM wrapped_gui_environment,
-                      SCM rectangle,
-                      SCM rest);
-
-  SCM
-  irr_gui_addScrollBar (SCM wrapped_gui_environment,
-                        SCM horizontal,
-                        SCM rectangle,
-                        SCM rest);
-
-  SCM
-  irr_gui_addStaticText (SCM wrapped_gui_environment,
-                         SCM text,
-                         SCM rectangle,
-                         SCM rest);
-
-  SCM
-  irr_gui_addWindow (SCM wrapped_gui_environment,
-                     SCM rectangle,
-                     SCM rest);
-
-  SCM
-  irr_gui_getBuiltInFont (SCM wrapped_gui_environment);
-
-  SCM
-  irr_gui_getSkin (SCM wrapped_gui_environment);
-
-  SCM
-  irr_gui_IGUIEnvironment_addButton (SCM wrapped_gui_environment,
-                                     SCM rectangle,
-                                     SCM rest);
-
-  SCM
-  irr_gui_IGUIEnvironment_getFont (SCM wrapped_gui_environment,
-                                   SCM filename);
-
-  }
+}
 
 #endif