X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-environment.cpp;h=87fe38d4939005940102e743d99d5d06d9bc9cb3;hb=a079c41de6a7504e579b425820beef21579e530e;hp=aa1ccdef70e767d7d6750fadcb22de3cd1c5206a;hpb=5ae44925acf0d6905a62e28a09af184d9db655a1;p=guile-irrlicht.git

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index aa1ccde..87fe38d 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -85,9 +85,9 @@ extern "C" {
                     SCM rest)
   {
     SCM use_alpha_channel = SCM_BOOL_T;
-    SCM parent = SCM_BOOL_F;
+    SCM parent = SCM_UNDEFINED;
     SCM id = scm_from_int32 (-1);
-    SCM text = SCM_BOOL_F;
+    SCM text = SCM_UNDEFINED;
 
     scm_c_bind_keyword_arguments ("add-image!", rest, (scm_t_keyword_arguments_flags)0,
                                   scm_from_utf8_keyword ("use_alpha_channel"), &use_alpha_channel,
@@ -101,9 +101,9 @@ extern "C" {
       guienv->addImage (unwrap_texture (image),
                         scm_to_position2d_s32 (position),
                         scm_to_bool (use_alpha_channel),
-                        scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                        parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
                         scm_to_int32 (id),
-                        scm_is_false (text) ? 0 : scm_to_wide_char_string (text));
+                        text == SCM_UNDEFINED ? 0 : scm_to_wide_char_string (text));
     return wrap_gui_image (guiImage);
   }
 
@@ -114,7 +114,7 @@ extern "C" {
                       SCM rest)
   {
     SCM border = SCM_BOOL_T;
-    SCM parent = SCM_BOOL_F;
+    SCM parent = SCM_UNDEFINED;
     SCM id = scm_from_int32 (-1);
 
     scm_c_bind_keyword_arguments ("add-editbox!", rest, (scm_t_keyword_arguments_flags)0,
@@ -128,7 +128,7 @@ extern "C" {
       guienv->addEditBox (scm_to_wide_char_string (text),
                           scm_to_rect_s32 (rectangle),
                           scm_to_bool (border),
-                          scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                          parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
                           scm_to_int32 (id));
     return wrap_gui_editbox (editbox);
   }
@@ -138,7 +138,7 @@ extern "C" {
                       SCM rectangle,
                       SCM rest)
   {
-    SCM parent = SCM_BOOL_F;
+    SCM parent = SCM_UNDEFINED;
     SCM id = scm_from_int32 (-1);
     SCM draw_background = SCM_BOOL_F;
 
@@ -151,7 +151,7 @@ extern "C" {
     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),
+                          parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
                           scm_to_int32 (id),
                           scm_to_bool (draw_background));
     return wrap_gui_listbox (listbox);
@@ -163,7 +163,7 @@ extern "C" {
                         SCM rectangle,
                         SCM rest)
   {
-    SCM parent = SCM_BOOL_F;
+    SCM parent = SCM_UNDEFINED;
     SCM id = scm_from_int32 (-1);
 
     scm_c_bind_keyword_arguments ("add-scrollbar!", rest, (scm_t_keyword_arguments_flags)0,
@@ -175,7 +175,7 @@ extern "C" {
     irr::gui::IGUIScrollBar* scrollbar =
       guienv->addScrollBar (scm_to_bool (horizontal),
                             scm_to_rect_s32 (rectangle),
-                            scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                            parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
                             scm_to_int32 (id));
     return wrap_gui_scrollbar (scrollbar);
   }
@@ -188,7 +188,7 @@ extern "C" {
   {
     SCM border = SCM_BOOL_F;
     SCM word_wrap = SCM_BOOL_T;
-    SCM parent = SCM_BOOL_F;
+    SCM parent = SCM_UNDEFINED;
     SCM id = scm_from_int32 (-1);
     SCM fill_background = SCM_BOOL_F;
 
@@ -206,7 +206,7 @@ extern "C" {
                              scm_to_rect_s32 (rectangle),
                              scm_to_bool (border),
                              scm_to_bool (word_wrap),
-                             scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                             parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
                              scm_to_int32 (id),
                              scm_to_bool (fill_background));
     return wrap_gui_static_text (staticText);
@@ -218,8 +218,8 @@ extern "C" {
                      SCM rest)
   {
     SCM modal = SCM_BOOL_F;
-    SCM text = SCM_BOOL_F;
-    SCM parent = SCM_BOOL_F;
+    SCM text = SCM_UNDEFINED;
+    SCM parent = SCM_UNDEFINED;
     SCM id = scm_from_int32 (-1);
 
     scm_c_bind_keyword_arguments ("add-window!", rest, (scm_t_keyword_arguments_flags)0,
@@ -233,8 +233,8 @@ extern "C" {
     irr::gui::IGUIWindow* window =
       guienv->addWindow (scm_to_rect_s32 (rectangle),
                          scm_to_bool (modal),
-                         scm_is_false (text) ? 0 : scm_to_wide_char_string (text),
-                         scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                         text == SCM_UNDEFINED ? 0 : scm_to_wide_char_string (text),
+                         parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
                          scm_to_int32 (id));
     return wrap_gui_window (window);
   }
@@ -260,10 +260,10 @@ extern "C" {
                                      SCM rectangle,
                                      SCM rest)
   {
-    SCM parent = SCM_BOOL_F;
+    SCM parent = SCM_UNDEFINED;
     SCM id = scm_from_int32 (-1);
-    SCM text = SCM_BOOL_F;
-    SCM tooltiptext = SCM_BOOL_F;
+    SCM text = SCM_UNDEFINED;
+    SCM tooltiptext = SCM_UNDEFINED;
 
     scm_c_bind_keyword_arguments ("add-button!", rest, (scm_t_keyword_arguments_flags)0,
                                   scm_from_utf8_keyword ("parent"), &parent,
@@ -275,10 +275,10 @@ extern "C" {
     irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
     irr::gui::IGUIButton* button =
       guienv->addButton (scm_to_rect_s32 (rectangle),
-                         scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                         parent == SCM_UNDEFINED ? 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));
+                         text == SCM_UNDEFINED ? 0 : scm_to_wide_char_string (text),
+                         tooltiptext == SCM_UNDEFINED ? 0 : scm_to_wide_char_string (tooltiptext));
     return wrap_gui_button (button);
   }