add glut callback-pointer types

[clinton/guile-figl.git] / figl / glut / low-level.scm

diff --git a/figl/glut/low-level.scm b/figl/glut/low-level.scm
index 8f87dbb..2f9a855 100644 (file)
--- a/figl/glut/low-level.scm
+++ b/figl/glut/low-level.scm
@@ -26,8 +26,8 @@
 ;;; Code:
 
 (define-module (figl glut low-level)
-  #:use-module (figl runtime)
   #:use-module (figl glut runtime)
+  #:use-module (figl glut types)
   #:use-module (figl gl types)
   #:use-module ((system foreign) #:renamer (symbol-prefix-proc 'ffi:))
   #:use-module (srfi srfi-26) ; cut
@@ -143,17 +143,6 @@
             glutWireTeapot
             ))
 
-(define-simple-foreign-type int ffi:int)
-(define-simple-foreign-type unsigned-int ffi:unsigned-int)
-
-;; GLUT specifies that all strings are ASCII encoded.
-(define-foreign-type char-* '*
-  (cut ffi:string->pointer <> "ASCII")
-  (cut ffi:pointer->string <> -1 "ASCII"))
-
-(define-simple-foreign-type int-* '*)
-(define-simple-foreign-type char-** '*)
-
 ;;;
 ;;; 2 Initialization
 ;;;
@@ -427,10 +416,6 @@
   (glutMenuStatusFunc (func void-*) -> void)
   #f)
 
-(define-glut-procedure
-  (glutMenuStateFunc (func void-*) -> void)
-  #f)
-
 (define-glut-procedure
   (glutIdleFunc (func void-*) -> void)
   #f)