X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fgui.scm;h=4708d371a3c706f0ca65f439e9d33c809830235f;hb=7611ebfeeae5ed59751f108214ee7a00aea20b7b;hp=7d1819e021712f7fb94fbf9aa9123880cef1b5a9;hpb=475c98ea7a30a647cc4a8f3ba6734560f7033a72;p=guile-irrlicht.git

diff --git a/irrlicht/gui.scm b/irrlicht/gui.scm
index 7d1819e..4708d37 100644
--- 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,20 @@
          (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 (add-window! (gui-environment <gui-environment>) rectangle . rest)
+  (let-keywords rest #f
+        ((modal #f)
+         (text "")
+         (parent (make <gui-element>))
+         (id -1))
+    (let* ((addWindow (get-irrlicht-proc "addWindow" gui-environment parent))
+           (window (addWindow gui-environment rectangle modal text parent id)))
+      (mem-wrapped window))))
 
 (define-method (draw-all (gui-environment <gui-environment>))
   ((get-irrlicht-proc "drawAll" gui-environment)
@@ -110,15 +130,18 @@
     (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)))
     (getSkin gui-environment)))
 
 (export <gui-environment> add-button! add-editbox! add-image! add-listbox! add-scrollbar!
-        add-static-text! draw-all get-built-in-font get-font get-skin)
+        add-static-text! add-window! draw-all get-built-in-font get-font get-skin)
 
 
 ;; IGUIStaticText
@@ -197,7 +220,11 @@
 (define-class <gui-listbox> (<gui-element>)
   (irr-class #:init-value "IGUIListBox"))
 
-(export <gui-listbox>)
+(define-method (add-item! (listbox <gui-listbox>) text)
+  (let ((addItem (get-irrlicht-proc "addItem" listbox)))
+    (addItem listbox text)))
+
+(export <gui-listbox> add-item!)
 
 
 ;; IGUIEditBox
@@ -205,3 +232,10 @@
   (irr-class #:init-value "IGUIEditBox"))
 
 (export <gui-editbox>)
+
+
+;; IGUIWindow
+(define-class <gui-window> (<gui-element>)
+  (irr-class #:init-value "IGUIWindow"))
+
+(export <gui-window>)