X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.window.lisp;h=6b090ea2506beed76e47e9ae399b9bf927596576;hb=804b4c8f24b3725eb90f29d7e6910b2598b68771;hp=311854e22c50daa8ac9b489408e0bfb50f242c8c;hpb=935353c2f3a0579fd33bb4631648dcaf90e5864e;p=cl-gtk2.git

diff --git a/gtk/gtk.window.lisp b/gtk/gtk.window.lisp
index 311854e..6b090ea 100644
--- a/gtk/gtk.window.lisp
+++ b/gtk/gtk.window.lisp
@@ -26,7 +26,7 @@
   (window (g-object gtk-window))
   (geometry-widget (g-object widget))
   (geometry (g-boxed-foreign geometry))
-  (geometry-mask window-hints))
+  (geometry-mask gdk-window-hints))
 
 (export 'gtk-window-set-geometry-hints)
 
@@ -67,72 +67,60 @@
 
 (export 'gtk-window-propagate-key-event)
 
-(defcfun (present-window "gtk_window_present") :void
+(defcfun (gtk-window-present "gtk_window_present") :void
   (window (g-object gtk-window)))
 
-(export 'present-window)
+(export 'gtk-window-present)
 
-(defcfun (present-window-with-time "gtk_window_present_with_time") :void
+(defcfun (gtk-window-present-with-time "gtk_window_present_with_time") :void
   (window (g-object gtk-window))
   (timestamp :uint32))
 
-(export 'present-window-with-time)
+(export 'gtk-window-present-with-time)
 
-(defcfun (iconify-window "gtk_window_iconify") :void
+(defcfun (gtk-window-iconify "gtk_window_iconify") :void
   (window (g-object gtk-window)))
 
-(export 'iconify-window)
+(export 'gtk-window-iconify)
 
-(defcfun (deiconify-window "gtk_window_deiconify") :void
+(defcfun (gtk-window-deiconify "gtk_window_deiconify") :void
   (window (g-object gtk-window)))
 
-(export 'deiconify-window)
+(export 'gtk-window-deiconify)
 
-(defcfun (stick-window "gtk_window_stick") :void
+(defcfun (gtk-window-stick "gtk_window_stick") :void
   (window (g-object gtk-window)))
 
-(export 'stick-window)
+(export 'gtk-window-stick)
 
-(defcfun (unstick-window "gtk_window_unstick") :void
+(defcfun (gtk-window-unstick "gtk_window_unstick") :void
   (window (g-object gtk-window)))
 
-(export 'unstick-window)
+(export 'gtk-window-unstick)
 
-(defcfun (maximize-window "gtk_window_maximize") :void
+(defcfun (gtk-window-maximize "gtk_window_maximize") :void
   (window (g-object gtk-window)))
 
-(export 'maximize-window)
+(export 'gtk-window-maximize)
 
-(defcfun (unmaximize-window "gtk_window_unmaximize") :void
+(defcfun (gtk-window-unmaximize "gtk_window_unmaximize") :void
   (window (g-object gtk-window)))
 
-(export 'unmaximize-window)
+(export 'gtk-window-unmaximize)
 
-(defcfun (fullscreen-window "gtk_window_fullscreen") :void
+(defcfun (gtk-window-fullscreen "gtk_window_fullscreen") :void
   (window (g-object gtk-window)))
 
-(export 'fullscreen-window)
+(export 'gtk-window-fullscreen)
 
-(defcfun (unfullscreen-window "gtk_window_unfullscreen") :void
+(defcfun (gtk-window-unfullscreen "gtk_window_unfullscreen") :void
   (window (g-object gtk-window)))
 
-(export 'unfullscreen-window)
-
-(defcfun (gtk-window-set-keep-above "gtk_window_set_keep_above") :void
-  (window (g-object gtk-window))
-  (setting :boolean))
-
-(export 'gtk-window-set-keep-above)
-
-(defcfun (gtk-window-set-keep-below "gtk_window_set_keep_below") :void
-  (window (g-object gtk-window))
-  (setting :boolean))
-
-(export 'gtk-window-set-keep-below)
+(export 'gtk-window-unfullscreen)
 
 (defcfun (gtk-window-begin-resize-drag "gtk_window_begin_resize_drag") :void
   (window (g-object gtk-window))
-  (edge window-edge)
+  (edge gdk-window-edge)
   (button :int)
   (root-x :int)
   (root-y :int)
@@ -158,18 +146,6 @@
 
 (export 'gtk-window-set-frame-dimensions)
 
-(defcfun (gtk-window-set-has-frame "gtk_window_set_has_frame") :void
-  (window (g-object gtk-window))
-  (setting :boolean))
-
-(export 'gtk-window-set-has-frame)
-
-(defcfun (gtk-window-set-mnemonic-modifier "gtk_window_set_mnemonic_modifier") :void
-  (window (g-object gtk-window))
-  (modifier modifier-type))
-
-(export 'gtk-window-set-mnemonic-modifier)
-
 (defcfun (%gtk-window-get-position "gtk_window_get_position") :void
   (window (g-object gtk-window))
   (root-x (:pointer :int))
@@ -196,12 +172,12 @@
 
 (export 'gtk-window-size)
 
-(defcfun (move-window "gtk_window_move") :void
+(defcfun (window-move "gtk_window_move") :void
   (window (g-object gtk-window))
   (x :int)
   (y :int))
 
-(export 'move-window)
+(export 'window-move)
 
 (defcfun (gtk-window-parse-geometry "gtk_window_parse_geometry") :boolean
   (window (g-object gtk-window))
@@ -209,41 +185,46 @@
 
 (export 'gtk-window-parse-geometry)
 
-(defcfun (reshow-window-with-initial-size "gtk_window_reshow_with_initial_size") :void
+(defcfun (gtk-window-reshow-with-initial-size "gtk_window_reshow_with_initial_size") :void
   (window (g-object gtk-window)))
 
-(export 'reshow-window-with-initial-size)
+(export 'gtk-window-reshow-with-initial-size)
 
-(defcfun (resize-window "gtk_window_resize") :void
+(defcfun (gtk-window-resize "gtk_window_resize") :void
   (window (g-object gtk-window))
   (width :int)
   (height :int))
 
-(export 'resize-window)
+(export 'gtk-window-resize)
 
-(defcfun (default-window-icon-list "gtk_window_get_default_icon_list") (glist pixbuf))
+(defcfun (gtk-window-default-icon-list "gtk_window_get_default_icon_list") (glist (g-object pixbuf)))
 
 (defcfun (set-default-window-icon-list "gtk_window_set_default_icon_list") :boolean
-  (icon-list (glist pixbuf)))
+  (icon-list (glist (g-object pixbuf))))
 
-(defun (setf default-window-icon-list) (icon-list)
+(defun (setf gkt-window-default-icon-list) (icon-list)
   (set-default-window-icon-list icon-list)
   icon-list)
 
-(export 'default-window-icon-list)
+(export 'gtk-window-default-icon-list)
 
-(defcfun (set-default-window-icon "gtk_window_set_default_icon") :void
+(defcfun (gtk-window-set-default-icon "gtk_window_set_default_icon") :void
   (icon (g-object pixbuf)))
 
+(defcfun (gtk-window-default-icon-name "gtk_window_get_default_icon_name") (:string :free-from-foreign nil))
+
 (defcfun (set-default-window-icon-name "gtk_window_set_default_icon_name") :void
   (icon-name :string))
 
-(defun (setf default-window-icon) (icon)
-  (etypecase icon
-    (pixbuf (set-default-window-icon icon))
-    (string (set-default-window-icon-name icon))))
+(defun (setf gtk-window-default-icon) (icon)
+  (gtk-window-set-default-icon icon))
+
+(defun (setf gtk-window-default-icon-name) (name)
+  (set-default-window-icon-name name))
 
-(export 'default-window-icon)
+(export 'window-default-icon)
+
+(export 'window-default-icon-name)
 
 (defcfun (set-window-auto-startup-notification "gtk_window_set_auto_startup_notification") :void
   (setting :boolean))
@@ -266,3 +247,10 @@
   (window-group (g-object window-group)))
 
 (export 'gtk-window-group-list-windows)
+
+(defcfun (gtk-window-mnemonic-activate "gtk_window_mnemonic_activate") :boolean
+  (window (g-object gtk-window))
+  (keyval :uint)
+  (modifier modifier-type))
+
+(export 'gtk-window-mnemonic-activate)