[gtk-cffi-cvs] CVS gtk-cffi/gtk

CVS User rklochkov rklochkov at common-lisp.net
Mon Feb 20 18:50:28 UTC 2012


Update of /project/gtk-cffi/cvsroot/gtk-cffi/gtk
In directory tiger.common-lisp.net:/tmp/cvs-serv18060/gtk

Modified Files:
	gtk-cffi.asd message-dialog.lisp package.lisp widget.lisp 
Added Files:
	about-dialog.lisp invisible.lisp window-group.lisp 
Log Message:
Added GtkAboutDialog


--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/gtk-cffi.asd	2012/02/20 16:51:37	1.14
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/gtk-cffi.asd	2012/02/20 18:50:28	1.15
@@ -14,7 +14,7 @@
   :author "Roman Klochkov <kalimehtar at mail.ru>"
   :version "0.5"
   :license "LLGPL"
-  :depends-on (gdk-cffi g-object-cffi g-lib-cffi gtk-cffi-utils gio-cffi)
+  :depends-on (gdk-cffi gtk-cffi-utils gio-cffi)
   :components
   ((:file package)
    (:file enums :depends-on (package))
@@ -25,7 +25,8 @@
    (:file style-context :depends-on (loadlib enums icon css-provider))
    (:file style-provider :depends-on (loadlib))
    (:file css-provider :depends-on (style-provider))
-   (:file icon :depends-on (loadlib enums))))
+   (:file icon :depends-on (loadlib enums))
+   (:file window-group :depends-on (loadlib))))
 
 (defsystem gtk-cffi-widget
   :description "Interface to GTK/Glib via CFFI"
@@ -82,7 +83,7 @@
   :license "LLGPL"
   :depends-on (gtk-cffi-bin)
   :components
-  ((:file :window)))
+  ((:file window)))
 
 (defsystem gtk-cffi-dialog
   :description "Interface to GTK/Glib via CFFI"
@@ -91,7 +92,8 @@
   :license "LLGPL"
   :depends-on (gtk-cffi-window gtk-cffi-vbox gtk-cffi-hbuttonbox)
   :components
-  ((:file :dialog)))
+  ((:file dialog)
+   (:file about-dialog :depends-on (dialog))))
 
 (defsystem gtk-cffi-entry
   :description "Interface to GTK/Glib via CFFI"
@@ -100,7 +102,7 @@
   :license "LLGPL"
   :depends-on (gtk-cffi-widget)
   :components
-  ((:file :entry)))
+  ((:file entry)))
 
 (defsystem gtk-cffi-button
   :description "Interface to GTK/Glib via CFFI"
@@ -118,7 +120,7 @@
   :license "LLGPL"
   :depends-on (gtk-cffi-container)
   :components
-  ((:file :box)))
+  ((:file box)))
 
 (defsystem gtk-cffi-hbox
   :description "Interface to GTK/Glib via CFFI"
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/message-dialog.lisp	2012/02/20 16:51:37	1.3
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/message-dialog.lisp	2012/02/20 18:50:28	1.4
@@ -11,11 +11,11 @@
 
 (defcfun gtk-message-dialog-new :pointer (parent pobject)
   (flags dialog-flags) (type message-type) (buttons buttons-type)
-  (message :string) (null :pointer))
+  (message :string))
 
 (defcfun gtk-message-dialog-new-with-markup :pointer (parent pobject)
   (flags dialog-flags) (type message-type) (buttons buttons-type)
-  (message :string) (null :pointer))
+  (message :string))
 
 
 (defmethod gconstructor ((message-dialog message-dialog)
@@ -25,7 +25,7 @@
   (funcall
    (if markup #'gtk-message-dialog-new-with-markup
      #'gtk-message-dialog-new)
-   parent flags type buttons message (null-pointer)))
+   parent flags type buttons message))
 
 (defun show-message (parent message &key (type :info) (buttons :ok) markup)
   (run (make-instance 'message-dialog :parent parent
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp	2012/02/20 16:51:37	1.14
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp	2012/02/20 18:50:28	1.15
@@ -254,6 +254,14 @@
    #:auto-startup-notification
    #:resize-grip-is-visible
 
+   #:window-group
+   ;; methods
+   #:add-window
+   #:remove-window
+   #:list-windows
+   #:current-grab
+   #:current-device-grab
+
    #:dialog
    ;;methods
    #:run
@@ -268,6 +276,23 @@
    #:alternative-button-order
    #:alternative-dialog-button-order
 
+   #:about-dialog
+   ;;slots
+   #:program-name
+   #:version
+   #:copyright
+   #:comments
+   #:license
+   #:license-type
+   #:website
+   #:website-label
+   #:authors
+   #:artists
+   #:documenters
+   #:translator-credits
+   #:logo
+   #:logo-icon-name 
+
    #:entry
    ;; entry slots
    #:text
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/widget.lisp	2012/02/20 16:51:37	1.10
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/widget.lisp	2012/02/20 18:50:28	1.11
@@ -11,6 +11,12 @@
   ((%style-properties :accessor %style-properties 
                       :initform nil :allocation :class)))
 
+(defcfun gtk-widget-new :pointer (g-type g-type) (null :pointer))
+
+(defmethod gconstructor ((wideget widget)
+                         &key type &allow-other-keys)
+  (gtk-widget-new type (null-pointer)))
+
 (defclass requisition (struct)
   ())
 
@@ -502,5 +508,4 @@
           style-property-type
           widget-class find-style-property %style-properties)
 
-(defgeneric text (widget &key))
 

--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/about-dialog.lisp	2012/02/20 18:50:28	NONE
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/about-dialog.lisp	2012/02/20 18:50:28	1.1
;;;
;;; about-dialog.lisp --- GtkAboutDialog
;;;
;;; Copyright (C) 2012, Roman Klochkov <kalimehtar at mail.ru>
;;;

(in-package :gtk-cffi)

(defclass about-dialog (dialog)
  ())

(defcfun gtk-about-dialog-new :pointer)

(defmethod gconstructor ((about-dialog about-dialog) &key &allow-other-keys)
  (gtk-window-group-new))

(defcenum license :unknown :custom :gpl-2-0 :gpl-3-0 :lgpl-2-0 :lgpl-3-0
          :bsd :mit-x11 :artistic)

(defslots about-dialog
  program-name :string
  version :string
  copyright :string
  comments :string
  license :string
  license-type license
  website :string
  website-label :string
  authors string-array
  artists string-array
  documenters string-array
  translator-credits :string
  logo pobject
  logo-icon-name :string)


(init-slots about-dialog)--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/invisible.lisp	2012/02/20 18:50:28	NONE
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/invisible.lisp	2012/02/20 18:50:28	1.1
(in-package :gtk-cffi)

(defclass invisible (widget)
  ())

(defcfun gtk-invisible-new :pointer)
(defcfun gtk-invisible-new-for-screen :pointer (screen pobject))

(defmethod gconstructor ((invisible invisible) &key screen &allow-other-keys) 
  (if screen (gtk-invisible-new-for-screen screen) (gtk-invisible-new)))

(defslot invisible screen pobject)--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/window-group.lisp	2012/02/20 18:50:28	NONE
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/window-group.lisp	2012/02/20 18:50:28	1.1
;;;
;;; window-group.lisp --- GtkWindowGroup
;;;
;;; Copyright (C) 2012, Roman Klochkov <kalimehtar at mail.ru>
;;;

(in-package :gtk-cffi)

(defclass window-group (g-object)
  ())

(defcfun gtk-window-group-new :pointer)

(defmethod gconstructor ((window-group window-group) &key &allow-other-keys)
  (gtk-window-group-new))

(deffuns window-group
  (add-window :void (window pobject))
  (remove-window :void (window pobject))
  (list-windows g-list-object)
  (:get current-grab pobject)
  (:get current-device-grab pobject (device pobject)))

(init-slots window-group)




More information about the gtk-cffi-cvs mailing list