~mdw
/
clg
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure that BORDER is defined at compile time.
[clg]
/
gtk
/
gtktypes.lisp
diff --git
a/gtk/gtktypes.lisp
b/gtk/gtktypes.lisp
index
a26a0cd
..
2bd3f9b
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.6
1 2008-01-02 16:00:22
espen Exp $
+;; $Id: gtktypes.lisp,v 1.6
5 2008-10-27 18:42:01
espen Exp $
(in-package "GTK")
(in-package "GTK")
@@
-84,6
+84,9
@@
:type int))
(:metaclass boxed-class))
:type int))
(:metaclass boxed-class))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (register-type 'border '|gtk_border_get_type|))
+
(defclass stock-item (struct)
((id
:allocation :alien
(defclass stock-item (struct)
((id
:allocation :alien
@@
-145,6
+148,11
@@
(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
+162,8
@@
("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
+582,7
@@
((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_
g
et_active"
+ :setter "gtk_toggle_tool_button_
s
et_active"
:accessor toggle-tool-button-active-p
:initarg :active
:type boolean)))
:accessor toggle-tool-button-active-p
:initarg :active
:type boolean)))
@@
-849,7
+859,7
@@
(current-folder
:allocation :virtual
:setter "gtk_file_chooser_set_current_folder"
(current-folder
:allocation :virtual
:setter "gtk_file_chooser_set_current_folder"
- :
s
etter "gtk_file_chooser_get_current_folder"
+ :
g
etter "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
+873,7
@@
(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"
- :
s
etter "gtk_file_chooser_get_current_folder_uri"
+ :
g
etter "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
+894,7
@@
: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"
@@
-1058,16
+1068,16
@@
((previous-alpha
:allocation :virtual
:getter "gtk_color_selection_get_previous_alpha"
((previous-alpha
:allocation :virtual
:getter "gtk_color_selection_get_previous_alpha"
- :setter "gtk_color_selection_
g
et_previous_alpha"
+ :setter "gtk_color_selection_
s
et_previous_alpha"
:initarg :previous-alpha
:accessor color-selection-previous-alpha
:type (unsigned 16))
(previous-color
:allocation :virtual
:initarg :previous-alpha
:accessor color-selection-previous-alpha
:type (unsigned 16))
(previous-color
:allocation :virtual
- :getter
"gtk_color_selection_get_previous_color"
- :setter "gtk_color_selection_
g
et_previous_color"
+ :getter
color-selection-previous-color
+ :setter "gtk_color_selection_
s
et_previous_color"
:initarg :previous-color
:initarg :previous-color
- :
accessor color-selection-previous-color
+ :
writer (setf color-selection-previous-color)
:type gdk:color)))
("GtkFontSelection"
:type gdk:color)))
("GtkFontSelection"
@@
-1096,7
+1106,7
@@
(markup-column
:allocation :virtual
:getter %icon-view-get-markup-column
(markup-column
:allocation :virtual
:getter %icon-view-get-markup-column
- :setter %icon-view-set-
t
markup-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)