Exporting QUERY-ENUM-VALUES and TYPE-FROM-GLIB-NAME

[clg] / gtk / gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index cce4e9a771ba19271dc871261f42b9178b334bf7..05db25273c08c41f0610d343d54855933ebdc232 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.
 
-;; $Id: gtktypes.lisp,v 1.47 2006-04-26 20:31:12 espen Exp $
+;; $Id: gtktypes.lisp,v 1.50 2006-08-25 12:34:49 espen Exp $
 
 (in-package "GTK")
 
@@ -114,17 +114,12 @@ (defclass stock-item (struct)
   (:ref stock-item-copy)
   (:unref stock-item-free))
 
-;; We don't really need to access any slots in this class, so we just
-;; specify the total size
 (defclass tree-iter (boxed)  
-  (
-;;    (stamp :allocation :alien :type int)
-;;    (user-data :allocation :alien :type pointer)
-;;    (user-data2 :allocation :alien :type pointer)
-;;    (user-data3 :allocation :alien :type pointer)
-   )
-  (:metaclass boxed-class)
-  (:size #.(+ (size-of 'int) (* 3 (size-of 'pointer)))))
+  ((stamp :allocation :alien :type int)
+   (user-data :allocation :alien :type pointer)
+   (user-data2 :allocation :alien :type pointer)
+   (user-data3 :allocation :alien :type pointer))
+  (:metaclass boxed-class))
 
 
 ;; (defclass tree-path (boxed)
@@ -956,7 +951,7 @@     (default-height :merge t :unbound -1)))
      :allocation :virtual
      :getter "gtk_text_mark_get_name"
      :reader text-mark-name
-     :type string)
+     :type (copy-of string))
     (visible
      :allocation :virtual
      :getter "gtk_text_mark_get_visible"
@@ -1003,7 +998,7 @@     (default-height :merge t :unbound -1)))
      :allocation :virtual
      :getter "gtk_toggle_action_get_active"
      :setter "gtk_toggle_action_set_active"
-     :initarg :active
+;     :initarg :active
      :accessor toggle-action-active-p
      :type boolean)))