SCM booleans

[guile-irrlicht.git] / src / gui-environment.cpp

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index fb13f53d363f901f1e7b2692523c3daf4e7a4d70..011e9d7a70bd82f904e553f625f02f2bf7911599 100644 (file)
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -23,6 +23,7 @@
 #include <libguile.h>
 
 #include "device.h"
+#include "gsubr.h"
 #include "gui-element.h"
 #include "gui-environment.h"
 #include "gui-static-text.h"
@@ -36,9 +37,8 @@ extern "C" {
   init_gui_environment (void)
   {
     init_gui_environment_type ();
-    scm_c_define_gsubr ("add-static-text!", 3, 0, 1, (scm_t_subr)irr_gui_addStaticText);
-    scm_c_define_gsubr ("get-gui-environment", 1, 0, 0, (scm_t_subr)irr_getGUIEnvironment);
-    scm_c_export ("add-static-text!", "get-gui-environment", NULL);
+    DEFINE_GSUBR ("add-static-text!", 3, 0, 1, irr_gui_addStaticText);
+    DEFINE_GSUBR ("get-gui-environment", 1, 0, 0, irr_getGUIEnvironment);
   }
 
   DEFINE_WRAPPED_TYPE (irr::gui::IGUIEnvironment*, "gui-environment",
@@ -67,11 +67,11 @@ extern "C" {
                          SCM rectangle,
                          SCM rest)
   {
-    SCM border = scm_from_bool (0);
-    SCM word_wrap = scm_from_bool (1);
-    SCM parent = scm_from_bool (0);
+    SCM border = SCM_BOOL_F;
+    SCM word_wrap = SCM_BOOL_T;
+    SCM parent = SCM_BOOL_F;
     SCM id = scm_from_int32 (-1);
-    SCM fill_background = scm_from_bool (0);
+    SCM fill_background = SCM_BOOL_F;
 
     scm_c_bind_keyword_arguments ("add-static-text!", rest, (scm_t_keyword_arguments_flags)0,
                                   scm_from_utf8_keyword ("border"), &border,