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

[CVS User rklochkov]

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

Modified Files:
	gtk-cffi.asd text-buffer.lisp text-tag.lisp text-view.lisp 
Added Files:
	scrollable.lisp 
Log Message:
Added GtkScrollable


--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/gtk-cffi.asd	2012/08/21 19:48:02	1.26
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/gtk-cffi.asd	2012/08/22 19:00:13	1.27
@@ -31,6 +31,7 @@
    (:file buildable :depends-on (loadlib))   
    (:file builder :depends-on (loadlib))
    (:file color-chooser :depends-on (loadlib))
+   (:file scrollable :depends-on (loadlib))
    (:file adjustment :depends-on (loadlib))))
 
 (defsystem gtk-cffi-widget
@@ -308,7 +309,7 @@
 (defsystem gtk-cffi-text-buffer
   :description "Interface to GTK/Glib via CFFI"
   :author "Roman Klochkov <kalimehtar at mail.ru>"
-  :version "0.1"
+  :version "0.99"
   :license "LLGPL"
   :depends-on (gtk-cffi-core)
   :components
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-buffer.lisp	2012/08/21 19:48:02	1.11
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-buffer.lisp	2012/08/22 19:00:13	1.12
@@ -1,5 +1,5 @@
 ;;;
-;;; text-buffer.lisp -- GtkTextTagTable, GtkTextBuffer
+;;; text-buffer.lisp -- GtkTextTagTable, GtkTextIter, GtkTextBuffer
 ;;;
 ;;; Copyright (C) 2012, Roman Klochkov <kalimehtar at mail.ru>
 ;;;
@@ -43,7 +43,7 @@
 (defmethod free-struct ((class (eql 'text-iter)) value)
   (gtk-text-iter-free value))
 
-(defgtkslots text-iter
+(defslots text-iter
   line :int
   offset :int
   line-offset :int
@@ -54,7 +54,7 @@
 (defbitfield text-search-flags
   :visible-only :text-only :case-insensitive)
 
-(defgtkfuns text-iter
+(deffuns text-iter
   ((text-iter-char . get-char) unichar)
   (:get slice :string (end pobject))
   ((text-iter-text . get-text) :string (end pobject))
@@ -174,15 +174,15 @@
                          &key tag-table &allow-other-keys)
   (gtk-text-buffer-new tag-table))
 
-(defgtkslots text-buffer
+(defslots text-buffer
   modified :boolean)
 
 (defcenum text-buffer-target-info
-  (:buffer-ocntent -1)
+  (:buffer-content -1)
   (:rich-text -2)
   (:info-text -3))
 
-(defgtkfuns text-buffer
+(deffuns text-buffer
   (:get line-count :int)
   (:get char-count :int)
   (:get tag-table pobject)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-tag.lisp	2011/09/21 12:03:47	1.4
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-tag.lisp	2012/08/22 19:00:13	1.5
@@ -10,9 +10,6 @@
 (defcenum wrap-mode
   :none :char :word :word-char)
 
-(defclass text-appearance (struct)
-  ())
-
 (defcstruct* text-appearance
   (bg-color pcolor)
   (fg-color pcolor)
@@ -27,9 +24,6 @@
   (is-text :boolean 1))
   
 
-(defclass text-attributes (struct)
-  ())
-
 (defcstruct* text-attributes
   (appearance (struct text-appearance))
   (justification justification)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-view.lisp	2012/02/20 16:51:37	1.5
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-view.lisp	2012/08/22 19:00:13	1.6
@@ -1,14 +1,22 @@
+;;;; -*- Mode: lisp; indent-tabs-mode: nil -*-
+;;;
+;;; text-view.lisp --- GtkTextView
+;;;
+;;; Copyright (C) 2012, Roman Klochkov <kalimehtar at mail.ru>
+;;;
+
 (in-package :gtk-cffi)
 
-(defclass text-view (container)
+(defclass text-view (container scrollable)
   ())
 
-(defcfun "gtk_text_view_new_with_buffer" :pointer (buffer pobject))
+(defcfun gtk-text-view-new-with-buffer :pointer (buffer pobject))
 
-(defcfun "gtk_text_view_new" :pointer)
+(defcfun gtk-text-view-new :pointer)
 
 (defmethod gconstructor ((text-view text-view)
                          &key buffer &allow-other-keys)
+  (initialize text-view 'buffer)
   (if buffer
       (gtk-text-view-new-with-buffer buffer)
     (gtk-text-view-new)))
@@ -17,7 +25,7 @@
   :private :widget :text
   :left :right :top :bottom)
 
-(defgtkslots text-view
+(defslots text-view
     buffer pobject
     wrap-mode wrap-mode
     editable :boolean
@@ -32,10 +40,9 @@
     indent :int
     tabs pango-cffi:tab-array
     accepts-tab :boolean)
-(remove-setter text-view buffer) ; already in gconstructor
 
 
-(defgtkfuns text-view
+(deffuns text-view
   (scroll-to-mark :void 
                   (text-mark pobject) (within-margin :double)
                   (use-align :boolean) (xalign :double) (yalign :double))

--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/scrollable.lisp	2012/08/22 19:00:14	NONE
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/scrollable.lisp	2012/08/22 19:00:14	1.1
;;;; -*- Mode: lisp; indent-tabs-mode: nil -*-
;;;
;;; text-view.lisp --- GtkTextView
;;;
;;; Copyright (C) 2012, Roman Klochkov <kalimehtar at mail.ru>
;;;

(in-package :gtk-cffi)

(defclass scrollable (object)
  ())

(defcenum scrollable-policy (:minimum 0) :natural)

(defslots scrollable
  hadjustment pobject
  vadjustment pobject
  hscroll-policy scrollable-policy
  vscroll-policy scrollable-policy)

(init-slots scrollable)