Fix compilation for Gtk with the new, stricter inheritance

[clg] / gtk / gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 4a0a52ea9c07fda6d8fcaadba2665cc19b187a28..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.64 2008-05-06 00:09:03 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