suzanne.soy/gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixup for old versions of GTK+ 2

Browse Source 
Restore support for Debian Lenny, at least.
This commit is contained in:
Matthew Flatt 2015-08-16 22:51:44 -04:00
parent 3f4302e948
commit 63a62b0832
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gui-lib/mred/private/wx/gtk/canvas.rkt
View File

@ -209,8 +209,11 @@
(not (send wx is-panel?))) (not (send wx is-panel?)))
#f)))) #f))))
(define-gdk gdk_window_get_background_pattern (_fun _GdkWindow -> (_or-null _cairo_pattern_t))) (define-gdk gdk_window_get_background_pattern (_fun _GdkWindow -> (_or-null _cairo_pattern_t))
(define-gdk gdk_window_get_effective_parent (_fun _GdkWindow -> _GdkWindow)) #:make-fail make-not-available)
(define-gdk gdk_window_get_effective_parent (_fun _GdkWindow -> _GdkWindow)
#:make-fail make-not-available)
(define-signal-handler connect-draw "draw" (define-signal-handler connect-draw "draw"
(_fun _GtkWidget _cairo_t -> _gboolean) (_fun _GtkWidget _cairo_t -> _gboolean)
(lambda (gtk cr) (lambda (gtk cr)

6
gui-lib/mred/private/wx/gtk/gcwin.rkt
View File

@ -70,8 +70,10 @@
(define-x11 XUnmapWindow _fpointer #:fail (lambda () #f)) (define-x11 XUnmapWindow _fpointer #:fail (lambda () #f))
(define _GdkVisual (_cpointer 'GdkVisual)) (define _GdkVisual (_cpointer 'GdkVisual))
(define-gdk gdk_window_get_visual (_fun _GdkWindow -> _GdkVisual)) (define-gdk gdk_window_get_visual (_fun _GdkWindow -> _GdkVisual)
(define-gdk gdk_visual_get_depth (_fun _GdkVisual -> _int)) #:make-fail make-not-available)
(define-gdk gdk_visual_get_depth (_fun _GdkVisual -> _int)
#:make-fail make-not-available)
(define (bitmap->gc-bitmap bm client-gtk) (define (bitmap->gc-bitmap bm client-gtk)
(cond (cond

4
gui-lib/mred/private/wx/gtk/gl-context.rkt
View File

@ -144,7 +144,6 @@
(define-gtk gtk_widget_get_display (_fun _GtkWidget -> _GdkDisplay)) (define-gtk gtk_widget_get_display (_fun _GtkWidget -> _GdkDisplay))
(define-gtk gtk_widget_get_screen (_fun _GtkWidget -> _GdkScreen)) (define-gtk gtk_widget_get_screen (_fun _GtkWidget -> _GdkScreen))
(define-gtk gtk_widget_get_window (_fun _GtkWidget -> _GtkWindow))
;; =================================================================================================== ;; ===================================================================================================
;; GLX versions and extensions queries ;; GLX versions and extensions queries
@ -447,7 +446,8 @@ returned a non-NULL context; ignoring possibly corrupt context")
(define (make-gtk-widget-gl-context widget conf) (define (make-gtk-widget-gl-context widget conf)
(atomically (atomically
(make-gtk-drawable-gl-context widget (gtk_widget_get_window widget) conf #t))) (make-gtk-drawable-gl-context widget (widget-window widget) conf
#t)))
(define (make-gtk-pixmap-gl-context pixmap conf) (define (make-gtk-pixmap-gl-context pixmap conf)
(atomically (atomically

12
gui-lib/mred/private/wx/gtk/gsettings.rkt
View File

@ -36,7 +36,11 @@
(define-gio g_settings_get_value (_fun _GSettings-pointer _string -> _GVariant-pointer)) (define-gio g_settings_get_value (_fun _GSettings-pointer _string -> _GVariant-pointer))
(define-gio g_settings_list_keys (_fun _GSettings-pointer -> _pointer)) (define-gio g_settings_list_keys (_fun _GSettings-pointer -> _pointer))
(define-glib g_variant_get_type_string (_fun _GVariant-pointer -> _string)) (define-glib g_variant_get_type_string (_fun _GVariant-pointer -> _string)
(define-glib g_variant_get_int32 (_fun _GVariant-pointer -> _int32)) #:make-fail make-not-available)
(define-glib g_variant_get_uint32 (_fun _GVariant-pointer -> _uint32)) (define-glib g_variant_get_int32 (_fun _GVariant-pointer -> _int32)
(define-glib g_variant_get_double (_fun _GVariant-pointer -> _gdouble)) #:make-fail make-not-available)
(define-glib g_variant_get_uint32 (_fun _GVariant-pointer -> _uint32)
#:make-fail make-not-available)
(define-glib g_variant_get_double (_fun _GVariant-pointer -> _gdouble)
#:make-fail make-not-available)

4
gui-lib/mred/private/wx/gtk/gtk3.rkt
View File

@ -6,9 +6,9 @@
get-gtk3-lib) get-gtk3-lib)
(define (get-gdk3-lib) (define (get-gdk3-lib)
(ffi-lib "libgdk-3" '("0" ""))) (ffi-lib "libgdk-3" '("0" "") #:fail (lambda () #f)))
(define (get-gtk3-lib) (define (get-gtk3-lib)
(ffi-lib "libgtk-3" '("0" ""))) (ffi-lib "libgtk-3" '("0" "") #:fail (lambda () #f)))
(define gtk3? (define gtk3?
(and (not (getenv "PLT_GTK2")) (and (not (getenv "PLT_GTK2"))