Temporary hack to get clg build with Gtk+ 2.14

[clg] / gtk / gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index a26a0cd..dfa9c05 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.61 2008-01-02 16:00:22 espen Exp $
+;; $Id: gtktypes.lisp,v 1.65 2008-10-27 18:42:01 espen Exp $
 
 (in-package "GTK")
 
@@ -154,6 +154,8 @@
   ("GtkTreePath" :ignore t)
 ;  ("GtkStyle" :ignore t)
 
+  ("GtkMountOperation" :ignore t) ; Needs GIO
+
   ;; Manual override
   ("GtkWidget"
    :slots
@@ -572,7 +574,7 @@
    ((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)))
@@ -849,7 +851,7 @@
     (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)
@@ -863,7 +865,7 @@
     (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)))
@@ -884,7 +886,7 @@
      :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"
@@ -1058,16 +1060,16 @@
    ((previous-alpha
      :allocation :virtual
      :getter "gtk_color_selection_get_previous_alpha"
-     :setter "gtk_color_selection_get_previous_alpha"
+     :setter "gtk_color_selection_set_previous_alpha"
      :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_get_previous_color"
+     :getter color-selection-previous-color
+     :setter "gtk_color_selection_set_previous_color"
      :initarg :previous-color
-     :accessor color-selection-previous-color
+     :writer (setf color-selection-previous-color)
      :type gdk:color)))
 
   ("GtkFontSelection"
@@ -1096,7 +1098,7 @@
     (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)