#include "position2d.h"
#include "rect.h"
#include "wchar.h"
+#include "wrapped.h"
using namespace irr;
SCM text,
SCM tooltiptext)
{
+ wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+ wchar_t* wtooltiptext = (wchar_t*) scm_to_utf32_string (tooltiptext);
+
gui::IGUIButton* button =
- ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+ ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
addButton (scm_to_rect_s32 (rectangle),
- (TParent)scm_to_pointer (parent),
+ (TParent)scm_to_irr_pointer (parent),
scm_to_int32 (id),
- scm_to_wide_char_string (text),
- scm_to_wide_char_string (tooltiptext));
- return scm_from_pointer ((void*)button, NULL);
+ wtext,
+ wtooltiptext);
+
+ free (wtext);
+ free (wtooltiptext);
+ return scm_from_irr_pointer ("<gui-button>", (void*) button);
}
template <typename TParent>
SCM parent,
SCM id)
{
+ wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+
gui::IGUIEditBox* editbox =
- ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
- addEditBox (scm_to_wide_char_string (text),
+ ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+ addEditBox (wtext,
scm_to_rect_s32 (rectangle),
scm_to_bool (border),
- (TParent)scm_to_pointer (parent),
+ (TParent)scm_to_irr_pointer (parent),
scm_to_int32 (id));
- return scm_from_pointer ((void*)editbox, NULL);
+
+ free (wtext);
+ return scm_from_irr_pointer ("<gui-editbox>", (void*) editbox);
+}
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addFileOpenDialog (SCM gui_environment,
+ SCM title,
+ SCM modal,
+ SCM parent,
+ SCM id,
+ SCM restore_cwd,
+ SCM start_dir)
+{
+ gui::IGUIEnvironment* guienv = (gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment);
+ wchar_t* wtitle = (wchar_t*) scm_to_utf32_string (title);
+ io::path::char_type* cstartDir = scm_to_utf8_string (start_dir);
+
+ gui::IGUIFileOpenDialog* dialog =
+ guienv->addFileOpenDialog (wtitle,
+ scm_to_bool (modal),
+ (TParent)scm_to_irr_pointer (parent),
+ scm_to_int32 (id),
+ scm_to_bool (restore_cwd),
+ cstartDir);
+
+ free (wtitle);
+ free (cstartDir);
+ return scm_from_irr_pointer ("<gui-file-open-dialog>", (void*) dialog);
}
template <typename TParent>
SCM id,
SCM text)
{
- gui::IGUIEnvironment* guienv = (gui::IGUIEnvironment*)scm_to_pointer (gui_environment);
+ gui::IGUIEnvironment* guienv = (gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment);
+ wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+
gui::IGUIImage* new_image =
- guienv->addImage ((video::ITexture*)scm_to_pointer (image),
+ guienv->addImage ((video::ITexture*)scm_to_irr_pointer (image),
scm_to_position2d_s32 (position),
scm_to_bool (use_alpha_channel),
- (TParent)scm_to_pointer (parent),
+ (TParent)scm_to_irr_pointer (parent),
scm_to_int32 (id),
- scm_to_wide_char_string (text));
- return scm_from_pointer ((void*) new_image, NULL);
+ wtext);
+
+ free (wtext);
+ return scm_from_irr_pointer ("<gui-image>", (void*) new_image);
}
template <typename TParent>
SCM draw_background)
{
gui::IGUIListBox* listbox =
- ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+ ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
addListBox (scm_to_rect_s32 (rectangle),
- (TParent)scm_to_pointer (parent),
+ (TParent)scm_to_irr_pointer (parent),
scm_to_int32 (id),
scm_to_bool (draw_background));
- return scm_from_pointer ((void*)listbox, NULL);
+ return scm_from_irr_pointer ("<gui-listbox>", (void*) listbox);
}
template <typename TParent>
SCM id)
{
gui::IGUIScrollBar* scrollbar =
- ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+ ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
addScrollBar (scm_to_bool (horizontal),
scm_to_rect_s32 (rectangle),
- (TParent)scm_to_pointer (parent),
+ (TParent)scm_to_irr_pointer (parent),
scm_to_int32 (id));
- return scm_from_pointer ((void*)scrollbar, NULL);
+ return scm_from_irr_pointer ("<gui-scrollbar>", (void*) scrollbar);
}
template <typename TParent>
SCM id,
SCM fill_background)
{
+ wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+
gui::IGUIStaticText* static_text =
- ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
- addStaticText (scm_to_wide_char_string (text),
+ ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+ addStaticText (wtext,
scm_to_rect_s32 (rectangle),
scm_to_bool (border),
scm_to_bool (word_wrap),
- (TParent)scm_to_pointer (parent),
+ (TParent)scm_to_irr_pointer (parent),
scm_to_int32 (id),
scm_to_bool (fill_background));
- return scm_from_pointer ((void*)static_text, NULL);
+
+ free (wtext);
+ return scm_from_irr_pointer ("<gui-static-text>", (void*) static_text);
}
template <typename TParent>
SCM parent,
SCM id)
{
+ wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+
gui::IGUIWindow* window =
- ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+ ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
addWindow (scm_to_rect_s32 (rectangle),
scm_to_bool (modal),
- scm_to_wide_char_string (text),
- (TParent)scm_to_pointer (parent),
+ wtext,
+ (TParent)scm_to_irr_pointer (parent),
scm_to_int32 (id));
- return scm_from_pointer ((void*)window, NULL);
+
+ free (wtext);
+ return scm_from_irr_pointer ("<gui-window>", (void*) window);
}
SCM
IGUIEnvironment_drawAll (SCM gui_environment)
{
- ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->drawAll ();
+ ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->drawAll ();
return SCM_UNSPECIFIED;
}
IGUIEnvironment_getBuiltInFont (SCM gui_environment)
{
gui::IGUIFont* font =
- ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->getBuiltInFont ();
- return scm_from_pointer ((void*)font, NULL);
+ ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->getBuiltInFont ();
+ return scm_from_irr_pointer ("<gui-font>", (void*) font);
}
SCM
IGUIEnvironment_getFont (SCM gui_environment,
SCM filename)
{
+ char* cfilename = scm_to_utf8_string (filename);
gui::IGUIFont* font =
- ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
- getFont (scm_to_utf8_stringn (filename, NULL));
- return scm_from_pointer ((void*)font, NULL);
+ ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->getFont (cfilename);
+ free (cfilename);
+ return scm_from_irr_pointer ("<gui-font>", (void*) font);
}
SCM
IGUIEnvironment_getSkin (SCM gui_environment)
{
gui::IGUISkin* skin =
- ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->getSkin ();
- return scm_from_pointer ((void*)skin, NULL);
+ ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->getSkin ();
+ return scm_from_irr_pointer ("<gui-skin>", (void*) skin);
}
void
IGUIEnvironment_addButton<gui::IGUIElement*>);
DEFINE_GSUBR ("IGUIEnvironment_addEditBox_IGUIElement", 6, 0, 0,
IGUIEnvironment_addEditBox<gui::IGUIElement*>);
+ DEFINE_GSUBR ("IGUIEnvironment_addFileOpenDialog_IGUIElement", 7, 0, 0,
+ IGUIEnvironment_addFileOpenDialog<gui::IGUIElement*>);
DEFINE_GSUBR ("IGUIEnvironment_addImage_IGUIElement", 7, 0, 0,
IGUIEnvironment_addImage<gui::IGUIElement*>);
DEFINE_GSUBR ("IGUIEnvironment_addListBox_IGUIElement", 5, 0, 0,
IGUIEnvironment_addScrollBar<gui::IGUIElement*>);
DEFINE_GSUBR ("IGUIEnvironment_addStaticText_IGUIElement", 8, 0, 0,
IGUIEnvironment_addStaticText<gui::IGUIElement*>);
+ DEFINE_GSUBR ("IGUIEnvironment_addStaticText_IGUIWindow", 8, 0, 0,
+ IGUIEnvironment_addStaticText<gui::IGUIWindow*>);
DEFINE_GSUBR ("IGUIEnvironment_addWindow_IGUIElement", 6, 0, 0,
IGUIEnvironment_addWindow<gui::IGUIElement*>);
DEFINE_GSUBR ("IGUIEnvironment_drawAll", 1, 0, 0, IGUIEnvironment_drawAll);
projects / guile-irrlicht.git / blobdiff