Add a boundp-function slot, which is required by virtual slot getter.

[clg] / gtk / gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 908eb0b4a1609f5c3887c3e9bee0615d9a3660e7..1155977335ed41716f7fdbe2158537d53e8e8528 100644 (file)
--- a/gtk/gtktypes.lisp
+++ b/gtk/gtktypes.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: gtktypes.lisp,v 1.62 2008-01-10 22:11:15 espen Exp $
+;; $Id: gtktypes.lisp,v 1.65 2008-10-27 18:42:01 espen Exp $

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


@@ -145,6 +145,11 @@ (define-type-method reader-function ((type position) &optional ref)
   (declare (ignore type ref))
   (reader-function 'int))
 
   (declare (ignore type ref))
   (reader-function 'int))
 

+;; Register GtkObject in advance so that eg GtkTooltips, which inherits from it,
+;; gets a proper supertype. TODO: This is a hack. Where is it supposed to
+;; happen?
+(register-type '%object "GtkObject")
+

 (define-types-by-introspection "Gtk"
   ;; Manually defined
   ("GtkObject" :ignore t)
 (define-types-by-introspection "Gtk"
   ;; Manually defined
   ("GtkObject" :ignore t)


@@ -154,6 +159,8 @@ (define-types-by-introspection "Gtk"
   ("GtkTreePath" :ignore t)
 ;  ("GtkStyle" :ignore t)
 
   ("GtkTreePath" :ignore t)
 ;  ("GtkStyle" :ignore t)
 

+  ("GtkMountOperation" :ignore t) ; Needs GIO
+

   ;; Manual override
   ("GtkWidget"
    :slots
   ;; Manual override
   ("GtkWidget"
    :slots


@@ -572,7 +579,7 @@     (default-height :merge t :unbound -1)))
    ((active
      :allocation :virtual
      :getter "gtk_toggle_tool_button_get_active"
    ((active
      :allocation :virtual
      :getter "gtk_toggle_tool_button_get_active"

-     :setter "gtk_toggle_tool_button_get_active"
+     :setter "gtk_toggle_tool_button_set_active"

      :accessor toggle-tool-button-active-p
      :initarg :active
      :type boolean)))
      :accessor toggle-tool-button-active-p
      :initarg :active
      :type boolean)))


@@ -849,7 +856,7 @@     (default-height :merge t :unbound -1)))
     (current-folder
      :allocation :virtual
      :setter "gtk_file_chooser_set_current_folder"
     (current-folder
      :allocation :virtual
      :setter "gtk_file_chooser_set_current_folder"

-     :setter "gtk_file_chooser_get_current_folder"
+     :getter "gtk_file_chooser_get_current_folder"

      :accessor file-chooser-current-folder
      :initarg :current-folder
      :type string)
      :accessor file-chooser-current-folder
      :initarg :current-folder
      :type string)


@@ -863,7 +870,7 @@     (default-height :merge t :unbound -1)))
     (current-folder-uri
      :allocation :virtual
      :setter "gtk_file_chooser_set_current_folder_uri"
     (current-folder-uri
      :allocation :virtual
      :setter "gtk_file_chooser_set_current_folder_uri"

-     :setter "gtk_file_chooser_get_current_folder_uri"
+     :getter "gtk_file_chooser_get_current_folder_uri"

      :accessor file-chooser-current-folder-uri
      :initarg :current-folder-uri
      :type string)))
      :accessor file-chooser-current-folder-uri
      :initarg :current-folder-uri
      :type string)))


@@ -884,7 +891,7 @@     (default-height :merge t :unbound -1)))
      :allocation :virtual
      :getter "gtk_tree_view_get_columns"
      :reader tree-view-columns 
      :allocation :virtual
      :getter "gtk_tree_view_get_columns"
      :reader tree-view-columns 

-     :type (glist tree-view-column))
+     :type (glist (copy-of tree-view-column)))

     (selection
      :allocation :virtual
      :getter "gtk_tree_view_get_selection"
     (selection
      :allocation :virtual
      :getter "gtk_tree_view_get_selection"


@@ -1096,7 +1103,7 @@     (default-height :merge t :unbound -1)))
     (markup-column
      :allocation :virtual
      :getter %icon-view-get-markup-column
     (markup-column
      :allocation :virtual
      :getter %icon-view-get-markup-column

-     :setter %icon-view-set-tmarkup-column
+     :setter %icon-view-set-markup-column

      :boundp %icon-view-markup-column-boundp
      :initarg :markup-column
      :accessor icon-view-markup-column)
      :boundp %icon-view-markup-column-boundp
      :initarg :markup-column
      :accessor icon-view-markup-column)