X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-environment.cpp;h=3f85f8b8cbb31e04d6e7fff7337454854052e9ef;hb=272a4db4154e3970be1f0c619fa592d7b6b89f74;hp=6244147d6757dccdd7dc80fb7e9a1d1e9283f035;hpb=5780991d786b994724112c97f691d9e2b9f2f1c5;p=guile-irrlicht.git

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index 6244147..3f85f8b 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -24,10 +24,12 @@
 
 #include "device.h"
 #include "gsubr.h"
+#include "gui-button.h"
 #include "gui-element.h"
 #include "gui-environment.h"
 #include "gui-font.h"
 #include "gui-image.h"
+#include "gui-scrollbar.h"
 #include "gui-skin.h"
 #include "gui-static-text.h"
 #include "position2d.h"
@@ -43,9 +45,9 @@ extern "C" {
   {
     init_gui_environment_type ();
     DEFINE_GSUBR ("add-image!", 3, 0, 1, irr_gui_addImage);
+    DEFINE_GSUBR ("add-scrollbar!", 3, 0, 1, irr_gui_addScrollBar);
     DEFINE_GSUBR ("add-static-text!", 3, 0, 1, irr_gui_addStaticText);
     DEFINE_GSUBR ("get-built-in-font", 1, 0, 0, irr_gui_getBuiltInFont);
-    DEFINE_GSUBR ("get-font", 2, 0, 0, irr_gui_getFont);
     DEFINE_GSUBR ("get-gui-environment", 1, 0, 0, irr_getGUIEnvironment);
     DEFINE_GSUBR ("get-skin", 1, 0, 0, irr_gui_getSkin);
   }
@@ -99,6 +101,29 @@ extern "C" {
     return wrap_gui_image (guiImage);
   }
 
+  SCM
+  irr_gui_addScrollBar (SCM wrapped_gui_environment,
+                        SCM horizontal,
+                        SCM rectangle,
+                        SCM rest)
+  {
+    SCM parent = SCM_BOOL_F;
+    SCM id = scm_from_int32 (-1);
+
+    scm_c_bind_keyword_arguments ("add-scrollbar!", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("parent"), &parent,
+                                  scm_from_utf8_keyword ("id"), &id,
+                                  SCM_UNDEFINED);
+
+    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
+    irr::gui::IGUIScrollBar* scrollbar =
+      guienv->addScrollBar (scm_to_bool (horizontal),
+                            scm_to_rect_s32 (rectangle),
+                            scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                            scm_to_int32 (id));
+    return wrap_gui_scrollbar (scrollbar);
+  }
+
   SCM
   irr_gui_addStaticText (SCM wrapped_gui_environment,
                          SCM text,
@@ -140,20 +165,47 @@ extern "C" {
   }
 
   SCM
-  irr_gui_getFont (SCM wrapped_gui_environment,
-                   SCM filename)
+  irr_gui_getSkin (SCM wrapped_gui_environment)
   {
     irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    irr::gui::IGUIFont* font = guienv->getFont (scm_to_utf8_stringn (filename, NULL));
-    return wrap_gui_font (font);
+    irr::gui::IGUISkin* skin = guienv->getSkin ();
+    return wrap_gui_skin (skin);
   }
 
   SCM
-  irr_gui_getSkin (SCM wrapped_gui_environment)
+  irr_gui_IGUIEnvironment_addButton (SCM wrapped_gui_environment,
+                                     SCM rectangle,
+                                     SCM rest)
   {
+    SCM parent = SCM_BOOL_F;
+    SCM id = scm_from_int32 (-1);
+    SCM text = SCM_BOOL_F;
+    SCM tooltiptext = SCM_BOOL_F;
+
+    scm_c_bind_keyword_arguments ("add-button!", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("parent"), &parent,
+                                  scm_from_utf8_keyword ("id"), &id,
+                                  scm_from_utf8_keyword ("text"), &text,
+                                  scm_from_utf8_keyword ("tooltiptext"), &tooltiptext,
+                                  SCM_UNDEFINED);
+
     irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    irr::gui::IGUISkin* skin = guienv->getSkin ();
-    return wrap_gui_skin (skin);
+    irr::gui::IGUIButton* button =
+      guienv->addButton (scm_to_rect_s32 (rectangle),
+                         scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                         scm_to_int32 (id),
+                         scm_is_false (text) ? 0 : scm_to_wide_char_string (text),
+                         scm_is_false (tooltiptext) ? 0 : scm_to_wide_char_string (tooltiptext));
+    return wrap_gui_button (button);
+  }
+
+  SCM
+  irr_gui_IGUIEnvironment_getFont (SCM wrapped_gui_environment,
+                                   SCM filename)
+  {
+    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
+    irr::gui::IGUIFont* font = guienv->getFont (scm_to_utf8_stringn (filename, NULL));
+    return wrap_gui_font (font);
   }
 
 }