X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-toolbar.cpp;h=ace658cf6ca423f20bca76d3294b83081da18caf;hb=1a76862e831371dd0a7eb74b460c93b5932165c1;hp=3eac3772beddb973413e924528d5f8ef888375e9;hpb=63b5eb2539286acf8f8961c342363f7e14319c89;p=guile-irrlicht.git diff --git a/src/gui-toolbar.cpp b/src/gui-toolbar.cpp index 3eac377..ace658c 100644 --- a/src/gui-toolbar.cpp +++ b/src/gui-toolbar.cpp @@ -21,42 +21,37 @@ #include #include +#include "gsubr.h" #include "gui-toolbar.h" #include "wchar.h" - +#include "wrapped.h" using namespace irr; - SCM -irr_gui_IGUIToolBar_addButton (SCM gui_toolbar, - SCM id, - SCM text, - SCM tooltiptext, - SCM img, - SCM pressedimg, - SCM is_push_button, - SCM use_alpha_channel) +IGUIToolBar_addButton (SCM gui_toolbar, + SCM id, + SCM text, + SCM tooltiptext, + SCM img, + SCM pressedimg, + SCM is_push_button, + SCM use_alpha_channel) { - gui::IGUIToolBar* toolbar = (gui::IGUIToolBar*) scm_to_pointer (gui_toolbar); + gui::IGUIToolBar* toolbar = (gui::IGUIToolBar*) scm_to_irr_pointer (gui_toolbar); gui::IGUIButton* button = toolbar->addButton (scm_to_int32 (id), scm_to_wide_char_string (text), scm_to_wide_char_string (tooltiptext), - (video::ITexture*) scm_to_pointer (img), - (video::ITexture*) scm_to_pointer (pressedimg), + (video::ITexture*) scm_to_irr_pointer (img), + (video::ITexture*) scm_to_irr_pointer (pressedimg), scm_to_bool (is_push_button), scm_to_bool (use_alpha_channel)); return scm_from_pointer ((void*) button, NULL); } - -extern "C" { - - void - init_gui_toolbar (void) - { - DEFINE_GSUBR ("irr_gui_IGUIToolBar_addButton", 8, 0, 0, irr_gui_IGUIToolBar_addButton); - } - +void +init_gui_toolbar (void) +{ + DEFINE_GSUBR ("IGUIToolBar_addButton", 8, 0, 0, IGUIToolBar_addButton); }