X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-environment.cpp;h=cc5e0c51a1cfff898169c98a642a85ca7e83014b;hb=7006c85b72b5eff7cfc935624711cf0bfdaa1508;hp=1ea86258b4534f89379393e819b78632fac1119a;hpb=15be0323f62a228707f616c25c4b87cd1d68766f;p=guile-irrlicht.git

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index 1ea8625..cc5e0c5 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -29,6 +29,8 @@
 #include "gui-environment.h"
 #include "gui-font.h"
 #include "gui-image.h"
+#include "gui-listbox.h"
+#include "gui-scrollbar.h"
 #include "gui-skin.h"
 #include "gui-static-text.h"
 #include "position2d.h"
@@ -44,6 +46,8 @@ extern "C" {
   {
     init_gui_environment_type ();
     DEFINE_GSUBR ("add-image!", 3, 0, 1, irr_gui_addImage);
+    DEFINE_GSUBR ("add-listbox!", 2, 0, 1, irr_gui_addListBox);
+    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-gui-environment", 1, 0, 0, irr_getGUIEnvironment);
@@ -99,6 +103,53 @@ extern "C" {
     return wrap_gui_image (guiImage);
   }
 
+  SCM
+  irr_gui_addListBox (SCM wrapped_gui_environment,
+                      SCM rectangle,
+                      SCM rest)
+  {
+    SCM parent = SCM_BOOL_F;
+    SCM id = scm_from_int32 (-1);
+    SCM draw_background = SCM_BOOL_F;
+
+    scm_c_bind_keyword_arguments ("add-listbox!", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("parent"), &parent,
+                                  scm_from_utf8_keyword ("id"), &id,
+                                  scm_from_utf8_keyword ("draw-background"), &draw_background,
+                                  SCM_UNDEFINED);
+
+    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
+    irr::gui::IGUIListBox* listbox =
+      guienv->addListBox (scm_to_rect_s32 (rectangle),
+                          scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                          scm_to_int32 (id),
+                          scm_to_bool (draw_background));
+    return wrap_gui_listbox (listbox);
+  }
+
+  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,