From d8ea16eb0318fc24188e6c3e789d02f4dae5d632 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 30 Jun 2005 21:33:11 +0000
Subject: [PATCH] windows startup tweaks

svn: r286
---
 src/mred/mred.cxx                | 2 --
 src/mred/mredmsw.cxx             | 2 +-
 src/mred/mrmain.cxx              | 1 -
 src/mred/wxme/wx_media.cxx       | 2 --
 src/wxwindow/src/msw/wx_main.cxx | 2 ++
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/mred/mred.cxx b/src/mred/mred.cxx
index 151d6276d4..3239194f78 100644
--- a/src/mred/mred.cxx
+++ b/src/mred/mred.cxx
@@ -3799,7 +3799,6 @@ static void wxDo(Scheme_Object *proc, int argc, Scheme_Object **argv)
   scheme_end_atomic_no_swap();
 }
 
-#if defined(wx_mac) || defined(wx_msw)
 void wxDrop_Runtime(char **argv, int argc)
 {
   int i;
@@ -3809,7 +3808,6 @@ void wxDrop_Runtime(char **argv, int argc)
     wxDo(wxs_app_file_proc, 1, p);
   }
 }
-#endif
 
 void wxDrop_Quit()
 {
diff --git a/src/mred/mredmsw.cxx b/src/mred/mredmsw.cxx
index 3c39ff17b4..fe5f430b5a 100644
--- a/src/mred/mredmsw.cxx
+++ b/src/mred/mredmsw.cxx
@@ -709,7 +709,7 @@ void wx_end_win_event(const char *who, HWND hWnd, UINT message, int tramp)
     scheme_end_atomic_no_swap();
 
 
-  if (!tramp && ((message == WM_VSCROLL) || (message == WM_HSCROLL))) {
+  if (!tramp && ((message == WM_VSCROLL) || (message == WM_HSCROLL)) && scheme_current_thread) {
     HiEventTramp *het;
     Scheme_Object *v;
 
diff --git a/src/mred/mrmain.cxx b/src/mred/mrmain.cxx
index b4727b3b12..90b5757211 100644
--- a/src/mred/mrmain.cxx
+++ b/src/mred/mrmain.cxx
@@ -603,7 +603,6 @@ static char *CreateUniqueName()
   return together;
 }
 
-
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR ignored, int nCmdShow)
 {
   LPWSTR m_lpCmdLine;
diff --git a/src/mred/wxme/wx_media.cxx b/src/mred/wxme/wx_media.cxx
index b76eac5a25..db5f186aa2 100644
--- a/src/mred/wxme/wx_media.cxx
+++ b/src/mred/wxme/wx_media.cxx
@@ -3245,8 +3245,6 @@ Bool wxMediaEdit::InsertFile(const char *who, Scheme_Object *f, char *WXUNUSED(f
       Insert(1, "\r");
   } 
 
-  fileerr = fileerr;
-
   if (fileerr && showErrors) {
     char ebuf[256];
     sprintf(ebuf, "%s: error loading the file", who);
diff --git a/src/wxwindow/src/msw/wx_main.cxx b/src/wxwindow/src/msw/wx_main.cxx
index 5aa1df9967..cbfc361432 100644
--- a/src/wxwindow/src/msw/wx_main.cxx
+++ b/src/wxwindow/src/msw/wx_main.cxx
@@ -44,6 +44,8 @@ HICON wxSTD_FRAME_ICON = NULL;
 HFONT wxSTATUS_LINE_FONT = NULL;
 LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
 
+__declspec(dllexport) void (*wx_post_setup)(void) = NULL;
+
 static void RegisterNoCursor(HINSTANCE hInstance,
 			     char *src, char *dest, wchar_t *wsrc, wchar_t *wdest)
 {