This commit was manufactured by cvs2svn to create branch 'XEmacs-21_4'.

[chise/xemacs-chise.git.1] / src / gui-msw.c

diff --git a/src/gui-msw.c b/src/gui-msw.c
index 9fd0b37..db63c2a 100644 (file)
--- a/src/gui-msw.c
+++ b/src/gui-msw.c
@@ -22,13 +22,13 @@ Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 #include "lisp.h"
+#include "console-msw.h"
 #include "redisplay.h"
 #include "gui.h"
 #include "glyphs.h"
 #include "frame.h"
-#include "events.h"
 #include "elhash.h"
-#include "console-msw.h"
+#include "events.h"
 #include "buffer.h"
 
 /*
@@ -84,15 +84,8 @@ mswindows_handle_gui_wm_command (struct frame* f, HWND ctrl, LPARAM id)
 
   mswindows_enqueue_dispatch_event (event);
   /* The result of this evaluation could cause other instances to change so 
-     enqueue an update callback to check this. We also have to make sure that
-     the function does not appear in the command history.
-     #### I'm sure someone can tell me how to optimize this. */
-  mswindows_enqueue_misc_user_event
-    (frame, Qeval, 
-     list3 (Qlet,
-           list2 (Qthis_command,
-                  Qlast_command),
-           list2 (Qupdate_widget_instances, frame)));
+     enqueue an update callback to check this. */
+  enqueue_magic_eval_event (update_widget_instances, frame);
   return Qt;
 }
 
@@ -140,7 +133,7 @@ otherwise it is an integer representing a ShowWindow flag:
       TO_EXTERNAL_FORMAT (LISP_STRING, current_dir,
                          C_STRING_ALLOCA, f,
                          Qfile_name);
-#ifdef __CYGWIN32__
+#ifdef CYGWIN
       CYGWIN_WIN32_PATH (f, path);
 #else
       path = f;
@@ -152,7 +145,7 @@ otherwise it is an integer representing a ShowWindow flag:
       TO_EXTERNAL_FORMAT (LISP_STRING, document,
                          C_STRING_ALLOCA, f,
                          Qfile_name);
-#ifdef __CYGWIN32__
+#ifdef CYGWIN
       CYGWIN_WIN32_PATH (f, doc);
 #else
       doc = f;