diff --git a/collects/mred/private/wx/gtk/init.rkt b/collects/mred/private/wx/gtk/init.rkt index 4effb240..190be27f 100644 --- a/collects/mred/private/wx/gtk/init.rkt +++ b/collects/mred/private/wx/gtk/init.rkt @@ -7,6 +7,16 @@ (define-gtk gtk_init (_fun (_ptr io _int) (_ptr io _pointer) -> _void)) +(define-gtk gtk_rc_parse_string (_fun _string -> _void)) +(define-gtk gtk_rc_add_default_file (_fun _path -> _void)) +(define-gtk gtk_rc_find_module_in_path (_fun _path -> _path)) +(define-gtk gtk_rc_get_module_dir (_fun -> _path)) + +(when (eq? 'windows (system-type)) + (let ([dir (simplify-path (build-path (collection-path "scheme") 'up 'up "lib"))]) + (gtk_rc_parse_string (format "module_path \"~a\"\n" dir)) + (gtk_rc_add_default_file (build-path dir "gtkrc")))) + (gtk_init 0 #f) (define pump-thread (gtk-start-event-pump)) diff --git a/collects/mred/private/wx/gtk/utils.rkt b/collects/mred/private/wx/gtk/utils.rkt index dda5ba82..d3c6946c 100644 --- a/collects/mred/private/wx/gtk/utils.rkt +++ b/collects/mred/private/wx/gtk/utils.rkt @@ -99,10 +99,7 @@ (define (set-gtk-object-flags! gtk v) (set-GtkObject-flags! (cast gtk _pointer _GtkObject-pointer) v)) -(define-gtk gtk_rc_parse (_fun _path -> _void)) -(define-gmodule g_module_open (_fun _path _int -> _pointer)) -(when (eq? 'windows (system-type)) - (gtk_rc_parse (build-path (collection-path "scheme") 'up 'up "lib" "gtkrc"))) +(define-gmodule g_module_open (_fun _path _int -> _pointer)) (define-syntax-rule (define-signal-handler connect-name