animated-mesh-scene-node

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

diff --git a/src/gui.cpp b/src/gui.cpp
index 997d28b08a74140809cec5d68020a34ec2afc8a7..5a192ec9d1b0754898621756078ad657e3e4f81d 100644 (file)
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -25,17 +25,12 @@
 #include "color.h"
 #include "gsubr.h"
 #include "gui.h"
-#include "gui-button.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"
 
 extern "C" {
@@ -44,17 +39,12 @@ extern "C" {
   init_gui (void)
   {
     // Init objects
-    init_gui_button ();
-    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 ();
 
     // Shared procedures (used by two or more objects)
@@ -147,7 +137,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);