diff --git a/gui-lib/mred/private/wx/gtk/canvas.rkt b/gui-lib/mred/private/wx/gtk/canvas.rkt index 6032568a..3cc7513f 100644 --- a/gui-lib/mred/private/wx/gtk/canvas.rkt +++ b/gui-lib/mred/private/wx/gtk/canvas.rkt @@ -209,8 +209,11 @@ (not (send wx is-panel?))) #f)))) -(define-gdk gdk_window_get_background_pattern (_fun _GdkWindow -> (_or-null _cairo_pattern_t))) -(define-gdk gdk_window_get_effective_parent (_fun _GdkWindow -> _GdkWindow)) +(define-gdk gdk_window_get_background_pattern (_fun _GdkWindow -> (_or-null _cairo_pattern_t)) + #: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" (_fun _GtkWidget _cairo_t -> _gboolean) (lambda (gtk cr) diff --git a/gui-lib/mred/private/wx/gtk/gcwin.rkt b/gui-lib/mred/private/wx/gtk/gcwin.rkt index e13a6760..ce3a9098 100644 --- a/gui-lib/mred/private/wx/gtk/gcwin.rkt +++ b/gui-lib/mred/private/wx/gtk/gcwin.rkt @@ -70,8 +70,10 @@ (define-x11 XUnmapWindow _fpointer #:fail (lambda () #f)) (define _GdkVisual (_cpointer 'GdkVisual)) -(define-gdk gdk_window_get_visual (_fun _GdkWindow -> _GdkVisual)) -(define-gdk gdk_visual_get_depth (_fun _GdkVisual -> _int)) +(define-gdk gdk_window_get_visual (_fun _GdkWindow -> _GdkVisual) + #: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) (cond diff --git a/gui-lib/mred/private/wx/gtk/gl-context.rkt b/gui-lib/mred/private/wx/gtk/gl-context.rkt index 6210ead8..481c6b76 100644 --- a/gui-lib/mred/private/wx/gtk/gl-context.rkt +++ b/gui-lib/mred/private/wx/gtk/gl-context.rkt @@ -144,7 +144,6 @@ (define-gtk gtk_widget_get_display (_fun _GtkWidget -> _GdkDisplay)) (define-gtk gtk_widget_get_screen (_fun _GtkWidget -> _GdkScreen)) -(define-gtk gtk_widget_get_window (_fun _GtkWidget -> _GtkWindow)) ;; =================================================================================================== ;; 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) (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) (atomically diff --git a/gui-lib/mred/private/wx/gtk/gsettings.rkt b/gui-lib/mred/private/wx/gtk/gsettings.rkt index 812f03d8..d6afa7a4 100644 --- a/gui-lib/mred/private/wx/gtk/gsettings.rkt +++ b/gui-lib/mred/private/wx/gtk/gsettings.rkt @@ -36,7 +36,11 @@ (define-gio g_settings_get_value (_fun _GSettings-pointer _string -> _GVariant-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_int32 (_fun _GVariant-pointer -> _int32)) -(define-glib g_variant_get_uint32 (_fun _GVariant-pointer -> _uint32)) -(define-glib g_variant_get_double (_fun _GVariant-pointer -> _gdouble)) +(define-glib g_variant_get_type_string (_fun _GVariant-pointer -> _string) + #:make-fail make-not-available) +(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) + #:make-fail make-not-available) +(define-glib g_variant_get_double (_fun _GVariant-pointer -> _gdouble) + #:make-fail make-not-available) diff --git a/gui-lib/mred/private/wx/gtk/gtk3.rkt b/gui-lib/mred/private/wx/gtk/gtk3.rkt index b8d5b195..f903336d 100644 --- a/gui-lib/mred/private/wx/gtk/gtk3.rkt +++ b/gui-lib/mred/private/wx/gtk/gtk3.rkt @@ -6,9 +6,9 @@ get-gtk3-lib) (define (get-gdk3-lib) - (ffi-lib "libgdk-3" '("0" ""))) + (ffi-lib "libgdk-3" '("0" "") #:fail (lambda () #f))) (define (get-gtk3-lib) - (ffi-lib "libgtk-3" '("0" ""))) + (ffi-lib "libgtk-3" '("0" "") #:fail (lambda () #f))) (define gtk3? (and (not (getenv "PLT_GTK2"))