X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui.cpp;h=5a192ec9d1b0754898621756078ad657e3e4f81d;hb=b298e30f299d7c0b91c00f2455b4bc1efabe62e3;hp=c507f1d73f73c49f1bb836e1fa5603bf369f896c;hpb=65527be1c7ad3f05ba651c25249fd8300f5f4fad;p=guile-irrlicht.git diff --git a/src/gui.cpp b/src/gui.cpp index c507f1d..5a192ec 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -25,16 +25,12 @@ #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-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" { @@ -43,16 +39,12 @@ 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_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) @@ -145,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); @@ -163,9 +155,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 +177,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)) {