X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-skin.cpp;h=f6628f1b4a1eeda6a67de1377910ef8738ee5da0;hb=41a6ad96e81a8d8153c54877c4c12f61100677a9;hp=b6e0ae1dfcb71f3d5d7fff6a84f83c2f94b83a79;hpb=79089024921211289013205616d5706eb0132981;p=guile-irrlicht.git diff --git a/src/gui-skin.cpp b/src/gui-skin.cpp index b6e0ae1..f6628f1 100644 --- a/src/gui-skin.cpp +++ b/src/gui-skin.cpp @@ -25,34 +25,30 @@ #include "gsubr.h" #include "gui-skin.h" - using namespace irr; - SCM -irr_gui_IGUISkin_getColor (SCM gui_skin, - SCM color) +IGUISkin_getColor (SCM gui_skin, + SCM color) { gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_pointer (gui_skin); video::SColor scolor = skin->getColor (scm_to_default_color (color)); return scm_from_color (scolor); } - SCM -irr_gui_IGUISkin_getFont (SCM gui_skin, - SCM which) +IGUISkin_getFont (SCM gui_skin, + SCM which) { gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_pointer (gui_skin); gui::IGUIFont* font = skin->getFont (scm_to_default_font (which)); return scm_from_pointer ((void*) font, NULL); } - SCM -irr_gui_IGUISkin_setColor (SCM gui_skin, - SCM which, - SCM new_color) +IGUISkin_setColor (SCM gui_skin, + SCM which, + SCM new_color) { gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_pointer (gui_skin); skin->setColor (scm_to_default_color (which), @@ -60,11 +56,10 @@ irr_gui_IGUISkin_setColor (SCM gui_skin, return SCM_UNSPECIFIED; } - SCM -irr_gui_IGUISkin_setFont (SCM gui_skin, - SCM font, - SCM which) +IGUISkin_setFont (SCM gui_skin, + SCM font, + SCM which) { gui::IGUISkin* skin = (gui::IGUISkin*) scm_to_pointer (gui_skin); skin->setFont ((gui::IGUIFont*) scm_to_pointer (font), @@ -72,18 +67,13 @@ irr_gui_IGUISkin_setFont (SCM gui_skin, return SCM_UNSPECIFIED; } - -extern "C" { - - void - init_gui_skin (void) - { - DEFINE_GSUBR ("irr_gui_IGUISkin_getColor", 2, 0, 0, irr_gui_IGUISkin_getColor); - DEFINE_GSUBR ("irr_gui_IGUISkin_getFont", 2, 0, 0, irr_gui_IGUISkin_getFont); - DEFINE_GSUBR ("irr_gui_IGUISkin_setColor", 3, 0, 0, irr_gui_IGUISkin_setColor); - DEFINE_GSUBR ("irr_gui_IGUISkin_setFont", 3, 0, 0, irr_gui_IGUISkin_setFont); - } - +void +init_gui_skin (void) +{ + DEFINE_GSUBR ("IGUISkin_getColor", 2, 0, 0, IGUISkin_getColor); + DEFINE_GSUBR ("IGUISkin_getFont", 2, 0, 0, IGUISkin_getFont); + DEFINE_GSUBR ("IGUISkin_setColor", 3, 0, 0, IGUISkin_setColor); + DEFINE_GSUBR ("IGUISkin_setFont", 3, 0, 0, IGUISkin_setFont); } gui::EGUI_DEFAULT_COLOR @@ -197,7 +187,6 @@ scm_to_default_color (SCM default_color) } } - gui::EGUI_DEFAULT_FONT scm_to_default_font (SCM default_font) {