X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconsole-msw.h;h=eacfbf51e165011518fb72f0083ef0fe2924be6b;hb=2cbece6401b2279497293e6dc54cda607f49db2f;hp=1aad49f8c74588b00ee1390fd424ffd863f0a956;hpb=2fd9701a4f902054649dde9143a3f77809afee8f;p=chise%2Fxemacs-chise.git-

diff --git a/src/console-msw.h b/src/console-msw.h
index 1aad49f..eacfbf5 100644
--- a/src/console-msw.h
+++ b/src/console-msw.h
@@ -33,13 +33,8 @@ Boston, MA 02111-1307, USA.  */
 #define INCLUDED_console_msw_h_
 
 #include "console.h"
-#include <windows.h>
-#include <ddeml.h>	/* DDE management library */
-#if !defined(__CYGWIN32__) && !defined(__MINGW32__) \
-	|| CYGWIN_VERSION_DLL_MAJOR > 20
-#include <shellapi.h>	/* FileManager/Explorer drag and drop */
-#include <commctrl.h>
-#endif
+#include "syswindows.h"
+#include "syscommctrl.h"
 
 #ifdef HAVE_XPM
 #include <X11/xpm.h>
@@ -164,6 +159,9 @@ struct mswindows_frame
   /* DC for this win32 window */
   HDC hdc;
 
+  /* Used with DeferWindowPos */
+  HDWP hdwp;
+
   /* Time of last click event, for button 2 emul */
   DWORD last_click_time;
 
@@ -182,7 +180,7 @@ struct mswindows_frame
   unsigned int menu_checksum;
 
   /* Widget glyphs attached to this frame. See glyphs-msw.c */
-  Lisp_Object widget_hash_table;
+  Lisp_Object widget_hash_table1, widget_hash_table2, widget_hash_table3;
 
   /* Frame title hash value. See frame-msw.c */
   unsigned int title_checksum;
@@ -212,8 +210,12 @@ struct mswindows_frame
 #define FRAME_MSWINDOWS_MENU_HASH_TABLE(f) (FRAME_MSWINDOWS_DATA (f)->menu_hash_table)
 #define FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE(f) \
  (FRAME_MSWINDOWS_DATA (f)->toolbar_hash_table)
-#define FRAME_MSWINDOWS_WIDGET_HASH_TABLE(f) \
- (FRAME_MSWINDOWS_DATA (f)->widget_hash_table)
+#define FRAME_MSWINDOWS_WIDGET_HASH_TABLE1(f) \
+ (FRAME_MSWINDOWS_DATA (f)->widget_hash_table1)
+#define FRAME_MSWINDOWS_WIDGET_HASH_TABLE2(f) \
+ (FRAME_MSWINDOWS_DATA (f)->widget_hash_table2)
+#define FRAME_MSWINDOWS_WIDGET_HASH_TABLE3(f) \
+ (FRAME_MSWINDOWS_DATA (f)->widget_hash_table3)
 #define FRAME_MSWINDOWS_TOOLBAR_CHECKSUM(f,pos) \
  (FRAME_MSWINDOWS_DATA (f)->toolbar_checksum[pos])
 #define FRAME_MSWINDOWS_MENU_CHECKSUM(f)  (FRAME_MSWINDOWS_DATA (f)->menu_checksum)
@@ -297,6 +299,7 @@ HDDEDATA CALLBACK mswindows_dde_callback (UINT uType, UINT uFmt, HCONV hconv,
 					  HDDEDATA hdata,
 					  DWORD dwData1, DWORD dwData2);
 
+void mswindows_enqueue_dispatch_event (Lisp_Object event);
 void mswindows_enqueue_misc_user_event (Lisp_Object channel,
 					Lisp_Object function,
 					Lisp_Object object);
@@ -347,4 +350,7 @@ Lisp_Object mswindows_handle_gui_wm_command (struct frame* f,
 
 int msw_windows9x_p (void);
 
+
+void mswindows_output_last_error (char *frob);
+
 #endif /* INCLUDED_console_msw_h_ */