From: Dmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Date: Thu, 10 Sep 2009 20:03:57 +0000 (+0400)
Subject: Added GtkDialog properties
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=2cd8c33ca0f5f579753e90b6e7c5910401f48495;p=cl-gtk2.git

Added GtkDialog properties
---

diff --git a/generating.lisp b/generating.lisp
index 3c30c40..51c147f 100644
--- a/generating.lisp
+++ b/generating.lisp
@@ -179,7 +179,11 @@
         (:cffi gtk::accessible gtk::widget-accessible g-object "gtk_widget_get_accessible" nil)
         (:cffi gtk::tooltip-window gtk::widget-tooltip-window g-object "gtk_widget_get_tooltip_window" "gtk_widget_set_tooltip_window"))
        ("GtkTextTag"
-        (:cffi gtk::priority gtk::text-tag-priority :int "gtk_text_tag_get_priority" "gtk_text_tag_set_priority"))))))
+        (:cffi gtk::priority gtk::text-tag-priority :int "gtk_text_tag_get_priority" "gtk_text_tag_set_priority"))
+       ("GtkDialog"
+        (:cffi gtk::content-area gtk::dialog-content-area (g-object gtk::v-box) "gtk_dialog_get_content_area" nil)
+        (:cffi gtk::action-area gtk::dialog-action-area (g-object gtk::widget) "gtk_dialog_get_action_area" nil)
+        (:cffi gtk::default-response gtk::dialog-default-response gtk::response-type nil "gtk_dialog_set_default_response"))))))
 
 (defun gtk-generate-child-properties (filename)
   (with-open-file (stream filename :direction :output :if-exists :supersede)
diff --git a/gtk/gtk.dialog.lisp b/gtk/gtk.dialog.lisp
index 7c22b7a..5991e33 100644
--- a/gtk/gtk.dialog.lisp
+++ b/gtk/gtk.dialog.lisp
@@ -25,37 +25,19 @@
 
 (export 'dialog-add-action-widget)
 
-(defcfun (dialog-set-default-response "gtk_dialog_set_default_response") :void
-  (dialog (g-object dialog))
-  (response response-type))
-
-(defun (setf dialog-default-response) (response dialog)
-  (dialog-set-default-response dialog response)
-  response)
-
-(export 'dialog-default-response)
-
 (defcfun (dialog-set-response-sensitive "gtk_dialog_set_response_sensitive") :void
   (dialog (g-object dialog))
   (response response-type)
   (setting :boolean))
 
+(export 'dialog-set-response-sensitive)
+
 (defcfun (dialog-response-for-widget "gtk_dialog_get_response_for_widget") :int
   (dialog (g-object dialog))
   (widget (g-object widget)))
 
 (export 'dialog-response-for-widget)
 
-(defcfun (dialog-action-area "gtk_dialog_get_action_area") (g-object widget)
-  (dialog (g-object dialog)))
-
-(export 'dialog-action-area)
-
-(defcfun (dialog-content-area "gtk_dialog_get_content_area") (g-object widget)
-  (dialog (g-object dialog)))
-
-(export 'dialog-content-area)
-
 (defcfun (dialog-alternative-button-order-on-screen "gtk_alternative_dialog_button_order") :boolean
   (screen (g-object screen)))
 
@@ -66,7 +48,7 @@
   (n-params :int)
   (new-order (:pointer response-type)))
 
-(defun (setf dialog-alternative-button-order) (response-list dialog)
+(defun set-dialog-alternative-button-order (dialog response-list)
   (with-foreign-object (new-order 'response-type (length response-list))
     (loop
        for i from 0
@@ -75,8 +57,6 @@
     (dialog-set-alternative-button-order-from-array dialog (length response-list) new-order))
   response-list)
 
-(export 'dialog-alternative-button-order)
-
 (defmacro with-gtk-message-error-handler (&body body)
   (let ((dialog (gensym))
         (e (gensym)))
diff --git a/gtk/gtk.generated-classes.lisp b/gtk/gtk.generated-classes.lisp
index b1009d0..13afc11 100644
--- a/gtk/gtk.generated-classes.lisp
+++ b/gtk/gtk.generated-classes.lisp
@@ -1505,7 +1505,13 @@
                         ("AtkImplementorIface" "GtkBuildable")
                         :type-initializer "gtk_dialog_get_type")
                        ((has-separator dialog-has-separator "has-separator"
-                         "gboolean" t t)))
+                         "gboolean" t t)
+                        (:cffi content-area dialog-content-area
+                         (g-object v-box) "gtk_dialog_get_content_area" nil)
+                        (:cffi action-area dialog-action-area (g-object widget)
+                         "gtk_dialog_get_action_area" nil)
+                        (:cffi default-response dialog-default-response
+                         response-type nil "gtk_dialog_set_default_response")))
 
 (define-g-object-class "GtkAboutDialog" about-dialog
                        (:superclass dialog :export t :interfaces