Cast to the proper wrapped object when a gui event is raised

[guile-irrlicht.git] / irrlicht / gui.scm

diff --git a/irrlicht/gui.scm b/irrlicht/gui.scm
index 7d1819e021712f7fb94fbf9aa9123880cef1b5a9..597032a7f89dd4da2f0382a6a5e8922ec2e39a08 100644 (file)
--- a/irrlicht/gui.scm
+++ b/irrlicht/gui.scm
@@ -42,7 +42,11 @@
 (define-class <gui-element> (<attribute-exchanging-object> <event-receiver>)
   (irr-class #:init-value "IGUIElement"))
 
-(export <gui-element>)
+(define-method (get-id (element <gui-element>))
+  (let ((getID (get-irrlicht-proc "getID" element)))
+    (getID element)))
+
+(export <gui-element> get-id)
 
 
 ;; IGUIEnvironment
@@ -55,16 +59,18 @@
          (id -1)
          (text "")
          (tooltiptext ""))
-    (let ((addButton (get-irrlicht-proc "addButton" gui-environment parent)))
-      (addButton gui-environment rectangle parent id text tooltiptext))))
+    (let* ((addButton (get-irrlicht-proc "addButton" gui-environment parent))
+           (button (addButton gui-environment rectangle parent id text tooltiptext)))
+      (mem-wrapped button))))
 
 (define-method (add-editbox! (gui-environment <gui-environment>) text rectangle . rest)
   (let-keywords rest #f
         ((border #t)
          (parent (make <gui-element>))
          (id -1))
-    (let ((addEditBox (get-irrlicht-proc "addEditBox" gui-environment parent)))
-      (addEditBox gui-environment text rectangle border parent id))))
+    (let* ((addEditBox (get-irrlicht-proc "addEditBox" gui-environment parent))
+           (editbox (addEditBox gui-environment text rectangle border parent id)))
+      (mem-wrapped editbox))))
 
 (define-method (add-image! (gui-environment <gui-environment>) image pos . rest)
   (let-keywords rest #f
@@ -72,23 +78,26 @@
          (parent (make <gui-element>))
          (id -1)
          (text ""))
-    (let ((addImage (get-irrlicht-proc "addImage" gui-environment parent)))
-      (addImage gui-environment image pos use-alpha-channel parent id text))))
+    (let* ((addImage (get-irrlicht-proc "addImage" gui-environment parent))
+           (img (addImage gui-environment image pos use-alpha-channel parent id text)))
+      (mem-wrapped img))))
 
 (define-method (add-listbox! (gui-environment <gui-environment>) rectangle . rest)
   (let-keywords rest #f
         ((parent (make <gui-element>))
          (id -1)
          (draw-background #f))
-    (let ((addListBox (get-irrlicht-proc "addListBox" gui-environment parent)))
-      (addListBox gui-environment rectangle parent id draw-background))))
+    (let* ((addListBox (get-irrlicht-proc "addListBox" gui-environment parent))
+           (listbox (addListBox gui-environment rectangle parent id draw-background)))
+      (mem-wrapped listbox))))
 
 (define-method (add-scrollbar! (gui-environment <gui-environment>) horizontal rectangle . rest)
   (let-keywords rest #f
         ((parent (make <gui-element>))
          (id -1))
-    (let ((addScrollBar (get-irrlicht-proc "addScrollBar" gui-environment parent)))
-      (addScrollBar gui-environment horizontal rectangle parent id))))
+    (let* ((addScrollBar (get-irrlicht-proc "addScrollBar" gui-environment parent))
+           (scrollbar (addScrollBar gui-environment horizontal rectangle parent id)))
+      (mem-wrapped scrollbar))))
 
 (define-method (add-static-text! (gui-environment <gui-environment>) text rectangle . rest)
   (let-keywords rest #f
@@ -97,9 +106,10 @@
          (parent (make <gui-element>))
          (id -1)
          (fill-background #f))
-    (let ((addStaticText (get-irrlicht-proc "addStaticText" gui-environment parent)))
-      (addStaticText gui-environment text rectangle border word-wrap parent
-                     id fill-background))))
+    (let* ((addStaticText (get-irrlicht-proc "addStaticText" gui-environment parent))
+           (static-text (addStaticText gui-environment text rectangle border word-wrap parent
+                                       id fill-background)))
+      (mem-wrapped static-text))))
 
 (define-method (draw-all (gui-environment <gui-environment>))
   ((get-irrlicht-proc "drawAll" gui-environment)
@@ -110,8 +120,11 @@
     (getBuiltInFont gui-environment)))
 
 (define-method (get-font (gui-environment <gui-environment>) filename)
-  (let ((getFont (get-irrlicht-proc "getFont" gui-environment)))
-    (getFont gui-environment filename)))
+  (let* ((getFont (get-irrlicht-proc "getFont" gui-environment))
+         (font (getFont gui-environment filename)))
+    (if (null-object? font)
+        (error "In procedure get-font: Font unavailable")
+        font)))
 
 (define-method (get-skin (gui-environment <gui-environment>))
   (let ((getSkin (get-irrlicht-proc "getSkin" gui-environment)))