diff --git a/collects/mred/private/wx/gtk/list-box.rkt b/collects/mred/private/wx/gtk/list-box.rkt
index 966b361b23..cefaccb742 100644
--- a/collects/mred/private/wx/gtk/list-box.rkt
+++ b/collects/mred/private/wx/gtk/list-box.rkt
@@ -1,5 +1,6 @@
#lang scheme/base
-(require scheme/foreign
+(require ffi/unsafe
+ ffi/unsafe/define
scheme/class
"../../syntax.rkt"
"../../lock.rkt"
@@ -9,7 +10,6 @@
"window.rkt"
"const.rkt"
"../common/event.rkt")
-(unsafe!)
(provide list-box%)
@@ -38,8 +38,8 @@
(define-gtk gtk_tree_view_get_selection (_fun _GtkWidget -> _GtkWidget))
(define _GList (_cpointer 'List))
-(define-gdk g_list_foreach (_fun _GList (_fun _pointer -> _void) _pointer -> _void))
-(define-gdk g_list_free (_fun _GList -> _void))
+(define-glib g_list_foreach (_fun _GList (_fun _pointer -> _void) _pointer -> _void))
+(define-glib g_list_free (_fun _GList -> _void))
(define-gtk gtk_tree_selection_get_selected_rows (_fun _GtkWidget _pointer -> (_or-null _GList)))
(define-gtk gtk_tree_path_free (_fun _pointer -> _void))
(define-gtk gtk_tree_path_get_indices (_fun _pointer -> _pointer))
diff --git a/src/gracket/grmain.c b/src/gracket/grmain.c
index 17e291e731..9467d536ae 100644
--- a/src/gracket/grmain.c
+++ b/src/gracket/grmain.c
@@ -482,7 +482,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR ignored
# ifndef MZ_PRECISE_GC
load_delayed_dll(NULL, "libmzgcxxxxxxx.dll");
# endif
- load_delayed_dll(NULL, "libmzsch" DLL_3M_SUFFIX "xxxxxxx.dll");
+ load_delayed_dll(NULL, "libracket" DLL_3M_SUFFIX "xxxxxxx.dll");
record_dll_path();
{
diff --git a/src/worksp/gracket/gracket.sln b/src/worksp/gracket/gracket.sln
index 1b08343803..6dc291d309 100644
--- a/src/worksp/gracket/gracket.sln
+++ b/src/worksp/gracket/gracket.sln
@@ -7,20 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GRacket", "gracket.vcproj",
{66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgracket", "..\libgracket\libgracket.vcproj", "{81BD2D42-F150-493D-94BA-88585B202789}"
- ProjectSection(ProjectDependencies) = postProject
- {B9FC613A-B427-4DB5-B1E3-7673D384ECE3} = {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}
- {5386B148-05B4-483B-B144-C3E2A6E15C78} = {5386B148-05B4-483B-B144-C3E2A6E15C78}
- {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3} = {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}
- {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} = {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}
- {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}
- {8CE7DC81-695B-436B-AA96-2D753846AFE5} = {8CE7DC81-695B-436B-AA96-2D753846AFE5}
- {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA} = {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}
- {1549C7C5-AF41-43BE-B905-BA6374FE6BEC} = {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}
- {31231DD7-4B8F-4E46-A747-81E41AFE04B5} = {31231DD7-4B8F-4E46-A747-81E41AFE04B5}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libracket", "..\libracket\libracket.vcproj", "{A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmzsch", "..\libracket\libracket.vcproj", "{A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}"
ProjectSection(ProjectDependencies) = postProject
{66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}
EndProjectSection
@@ -37,6 +24,10 @@ Global
{D59A2B28-330B-41F5-8261-F5BC1019E163}.Debug|Win32.Build.0 = Debug|Win32
{D59A2B28-330B-41F5-8261-F5BC1019E163}.Release|Win32.ActiveCfg = Release|Win32
{D59A2B28-330B-41F5-8261-F5BC1019E163}.Release|Win32.Build.0 = Release|Win32
+ {81BD2D42-F150-493D-94BA-88585B202789}.Debug|Win32.ActiveCfg = Debug|Win32
+ {81BD2D42-F150-493D-94BA-88585B202789}.Debug|Win32.Build.0 = Debug|Win32
+ {81BD2D42-F150-493D-94BA-88585B202789}.Release|Win32.ActiveCfg = Release|Win32
+ {81BD2D42-F150-493D-94BA-88585B202789}.Release|Win32.Build.0 = Release|Win32
{A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.ActiveCfg = Debug|Win32
{A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.Build.0 = Debug|Win32
{A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/src/worksp/gracket/gracket.vcproj b/src/worksp/gracket/gracket.vcproj
index 9714a6ebd6..c21b1e7d83 100644
--- a/src/worksp/gracket/gracket.vcproj
+++ b/src/worksp/gracket/gracket.vcproj
@@ -68,7 +68,7 @@
/>