X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui.cpp;h=c7dd4040f21879b3d7ad0f678dccadf8b89fb536;hb=272a4db4154e3970be1f0c619fa592d7b6b89f74;hp=313a83b2ef34487db5f5626fc821fca5d57bb511;hpb=55e6476fba279b10b7732170a72b31426f973ef5;p=guile-irrlicht.git

diff --git a/src/gui.cpp b/src/gui.cpp
index 313a83b..c7dd404 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -25,13 +25,16 @@
 #include "color.h"
 #include "gsubr.h"
 #include "gui.h"
+#include "gui-button.h"
 #include "gui-edit-box.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 "gui-toolbar.h"
 
 extern "C" {
 
@@ -39,18 +42,63 @@ extern "C" {
   init_gui (void)
   {
     // Init objects
+    init_gui_button ();
     init_gui_edit_box ();
     init_gui_element ();
     init_gui_environment ();
     init_gui_font ();
     init_gui_image ();
+    init_gui_scrollbar ();
     init_gui_skin ();
     init_gui_static_text ();
+    init_gui_toolbar ();
 
     // Shared procedures (used by two or more objects)
+    DEFINE_GSUBR ("add-button!", 1, 1, 1, irr_gui_addButton);
+    DEFINE_GSUBR ("get-font", 1, 1, 1, irr_gui_getFont);
     DEFINE_GSUBR ("set-override-color!", 2, 0, 0, irr_gui_setOverrideColor);
   }
 
+  SCM
+  irr_gui_addButton (SCM wrapped_obj,
+                     SCM rectangle,
+                     SCM rest)
+  {
+    if (gui_toolbar_p (wrapped_obj))
+      {
+        return irr_gui_IGUIToolBar_addButton (wrapped_obj, rest);
+      }
+    else if (gui_environment_p (wrapped_obj))
+      {
+        return irr_gui_IGUIEnvironment_addButton (wrapped_obj, rectangle, rest);
+      }
+    else
+      {
+        scm_error (scm_arg_type_key, NULL, "Cannot add button to object: ~S",
+                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
+      }
+  }
+
+  SCM
+  irr_gui_getFont (SCM wrapped_obj,
+                   SCM filename,
+                   SCM rest)
+  {
+    if (gui_environment_p (wrapped_obj))
+      {
+        return irr_gui_IGUIEnvironment_getFont (wrapped_obj, filename);
+      }
+    else if (gui_skin_p (wrapped_obj))
+      {
+        return irr_gui_IGUISkin_getFont (wrapped_obj, rest);
+      }
+    else
+      {
+        scm_error (scm_arg_type_key, NULL, "Cannot get font from object: ~S",
+                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
+      }
+  }
+
   SCM
   irr_gui_setOverrideColor (SCM wrapped_obj,
                             SCM color)