get-built-in-font

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

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index 1ee3e5d9212c18009efab2fbdc222fbc5e04dee1..d29750ffa88e3a0c5be0d3bb92baa9124f7d5752 100644 (file)
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -39,14 +39,20 @@ IGUIEnvironment_addButton (SCM gui_environment,
                            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_irr_pointer (gui_environment))->
     addButton (scm_to_rect_s32 (rectangle),
                (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>
@@ -58,14 +64,18 @@ IGUIEnvironment_addEditBox (SCM gui_environment,
                             SCM parent,
                             SCM id)
 {
+  wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+
   gui::IGUIEditBox* editbox =
     ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
-    addEditBox (scm_to_wide_char_string (text),
+    addEditBox (wtext,
                 scm_to_rect_s32 (rectangle),
                 scm_to_bool (border),
                 (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>
@@ -79,14 +89,18 @@ IGUIEnvironment_addImage (SCM gui_environment,
                           SCM text)
 {
   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_irr_pointer (image),
                       scm_to_position2d_s32 (position),
                       scm_to_bool (use_alpha_channel),
                       (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>
@@ -103,7 +117,7 @@ IGUIEnvironment_addListBox (SCM gui_environment,
                 (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>
@@ -120,7 +134,7 @@ IGUIEnvironment_addScrollBar (SCM gui_environment,
                   scm_to_rect_s32 (rectangle),
                   (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>
@@ -134,16 +148,20 @@ IGUIEnvironment_addStaticText (SCM gui_environment,
                                SCM id,
                                SCM fill_background)
 {
+  wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+
   gui::IGUIStaticText* static_text =
     ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
-    addStaticText (scm_to_wide_char_string (text),
+    addStaticText (wtext,
                    scm_to_rect_s32 (rectangle),
                    scm_to_bool (border),
                    scm_to_bool (word_wrap),
                    (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>
@@ -155,14 +173,18 @@ IGUIEnvironment_addWindow (SCM gui_environment,
                            SCM parent,
                            SCM id)
 {
+  wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+
   gui::IGUIWindow* window =
     ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
     addWindow (scm_to_rect_s32 (rectangle),
                scm_to_bool (modal),
-               scm_to_wide_char_string (text),
+               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
@@ -177,17 +199,18 @@ IGUIEnvironment_getBuiltInFont (SCM gui_environment)
 {
   gui::IGUIFont* font =
     ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->getBuiltInFont ();
-  return scm_from_pointer ((void*)font, NULL);
+  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_irr_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
@@ -195,7 +218,7 @@ IGUIEnvironment_getSkin (SCM gui_environment)
 {
   gui::IGUISkin* skin =
     ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->getSkin ();
-  return scm_from_pointer ((void*)skin, NULL);
+  return scm_from_irr_pointer ("<gui-skin>", (void*) skin);
 }
 
 void