Added missing widget argument to WINDOW-SET-GEOMETRY-HINTS

[clg] / gtk / gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 49b00ed21b0d8bc12510300963079d3ca41fe07e..5cf18f0a8e7a0fd04705d26ad3f296c09fa4ff4b 100644 (file)
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: gtk.lisp,v 1.75 2007/06/20 14:28:48 espen Exp $
+;; $Id: gtk.lisp,v 1.76 2007/06/25 10:36:43 espen Exp $

 
 
 (in-package "GTK")
 
 
 (in-package "GTK")


@@ -1402,13 +1402,14 @@ (defbinding window-set-default-size (window width height) int
 
 (defbinding %window-set-geometry-hints () nil
   (window window)
 
 (defbinding %window-set-geometry-hints () nil
   (window window)

+  (widget (or widget null))

   (geometry gdk:geometry)
   (geometry-mask gdk:window-hints))
 
   (geometry gdk:geometry)
   (geometry-mask gdk:window-hints))
 

-(defun window-set-geometry-hints (window &key min-width min-height
+(defun window-set-geometry-hints (window &key widget min-width min-height

                                   max-width max-height base-width base-height
                                   max-width max-height base-width base-height

-                                 width-inc height-inc min-aspect max-aspect
-                                 (gravity nil gravity-p) min-size max-size)
+                                 width-inc height-inc gravity
+                                 aspect (min-aspect aspect) (max-aspect aspect))

   (let ((geometry (make-instance 'gdk:geometry 
                   :min-width (or min-width -1)
                   :min-height (or min-height -1)
   (let ((geometry (make-instance 'gdk:geometry 
                   :min-width (or min-width -1)
                   :min-height (or min-height -1)


@@ -1419,12 +1420,11 @@ (defun window-set-geometry-hints (window &key min-width min-height
                   :width-inc (or width-inc 0)
                   :height-inc (or height-inc 0)
                   :min-aspect (or min-aspect 0)
                   :width-inc (or width-inc 0)
                   :height-inc (or height-inc 0)
                   :min-aspect (or min-aspect 0)

-                  :max-aspect (or max-aspect 0)
-                  :gravity gravity))
+                  :max-aspect (or max-aspect 0)))

        (mask ()))
        (mask ()))

-    (when (or min-size min-width min-height)
+    (when (or min-width min-height)

       (push :min-size mask))
       (push :min-size mask))

-    (when (or max-size max-width max-height)
+    (when (or max-width max-height)

       (push :max-size mask))
     (when (or base-width base-height)
       (push :base-size mask))
       (push :max-size mask))
     (when (or base-width base-height)
       (push :base-size mask))


@@ -1432,9 +1432,10 @@ (defun window-set-geometry-hints (window &key min-width min-height
       (push :resize-inc mask))
     (when (or min-aspect max-aspect)
       (push :aspect mask))
       (push :resize-inc mask))
     (when (or min-aspect max-aspect)
       (push :aspect mask))

-    (when gravity-p
-      (push :win-gravity mask))
-    (%window-set-geometry-hints window geometry mask)))
+    (when gravity
+      (push :win-gravity mask)
+      (setf (gdk:geometry-gravity geometry) gravity))
+    (%window-set-geometry-hints window widget geometry mask)))

 
 (defbinding window-list-toplevels () (glist (copy-of window))
   "Returns a list of all existing toplevel windows.")
 
 (defbinding window-list-toplevels () (glist (copy-of window))
   "Returns a list of all existing toplevel windows.")