Use SCM_UNDEFINED for undefined arguments

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

diff --git a/src/gui.cpp b/src/gui.cpp
index c507f1d73f73c49f1bb836e1fa5603bf369f896c..213397e38eaf921f1951fcc3ea93107be93ff0e3 100644 (file)
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -26,16 +26,18 @@
 #include "gsubr.h"
 #include "gui.h"
 #include "gui-button.h"
-#include "gui-edit-box.h"
+#include "gui-editbox.h"
 #include "gui-element.h"
 #include "gui-environment.h"
 #include "gui-font.h"
 #include "gui-image.h"
 #include "gui-in-out-fader.h"
+#include "gui-listbox.h"
 #include "gui-scrollbar.h"
 #include "gui-skin.h"
 #include "gui-static-text.h"
 #include "gui-toolbar.h"
+#include "gui-window.h"
 
 extern "C" {
 
@@ -44,16 +46,18 @@ extern "C" {
   {
     // Init objects
     init_gui_button ();
-    init_gui_edit_box ();
+    init_gui_editbox ();
     init_gui_element ();
     init_gui_environment ();
     init_gui_font ();
     init_gui_image ();
     init_gui_in_out_fader ();
+    init_gui_listbox ();
     init_gui_scrollbar ();
     init_gui_skin ();
     init_gui_static_text ();
     init_gui_toolbar ();
+    init_gui_window ();
 
     // Shared procedures (used by two or more objects)
     DEFINE_GSUBR ("add-button!", 1, 1, 1, irr_gui_addButton);
@@ -145,7 +149,7 @@ extern "C" {
         // Params: color and dest_color (optional)
         return irr_gui_IGUIInOutFader_setColor (wrapped_obj, color, dest_color);
       }
-    else if (gui_skin_p (wrapped_obj) && !scm_is_false (dest_color))
+    else if (gui_skin_p (wrapped_obj) && dest_color != SCM_UNDEFINED)
       {
         // Params: which and new_color
         return irr_gui_IGUISkin_setColor (wrapped_obj, color, dest_color);
@@ -163,9 +167,9 @@ extern "C" {
   {
 #define SET_MAX(OBJ) OBJ->setMax (scm_to_int32 (max));
 
-    if (gui_edit_box_p (wrapped_obj))
+    if (gui_editbox_p (wrapped_obj))
       {
-        SET_MAX (unwrap_gui_edit_box (wrapped_obj));
+        SET_MAX (unwrap_gui_editbox (wrapped_obj));
       }
     else if (gui_scrollbar_p (wrapped_obj))
       {
@@ -185,9 +189,9 @@ extern "C" {
   {
 #define SET_OVERRIDE_COLOR(OBJ) OBJ->setOverrideColor (scm_to_color (color));
 
-    if (gui_edit_box_p (wrapped_obj))
+    if (gui_editbox_p (wrapped_obj))
       {
-        SET_OVERRIDE_COLOR (unwrap_gui_edit_box (wrapped_obj));
+        SET_OVERRIDE_COLOR (unwrap_gui_editbox (wrapped_obj));
       }
     else if (gui_static_text_p (wrapped_obj))
       {