(M16107): Unify U+6B3E.

[chise/xemacs-chise.git-] / src / console-msw.h

diff --git a/src/console-msw.h b/src/console-msw.h
index 2f48d95..f3a6c3b 100644 (file)
--- a/src/console-msw.h
+++ b/src/console-msw.h
@@ -38,7 +38,8 @@ Boston, MA 02111-1307, USA.  */
 #endif
 #include <windows.h>
 #include <ddeml.h>     /* DDE management library */
-#ifndef __CYGWIN32__
+#if !defined(__CYGWIN32__) && !defined(__MINGW32__) \
+       || CYGWIN_VERSION_DLL_MAJOR > 20
 #include <shellapi.h>  /* FileManager/Explorer drag and drop */
 #include <commctrl.h>
 #endif
@@ -66,6 +67,7 @@ Boston, MA 02111-1307, USA.  */
 /* The name of the main window class */
 #define XEMACS_CLASS "XEmacs"
 
+#define XEMACS_CONTROL_CLASS "XEmacsControl"
 
 /*
  * Console
@@ -153,6 +155,9 @@ struct mswindows_frame
   /* Menu checksum. See menubar-msw.c */
   unsigned int menu_checksum;
 
+  /* Widget glyphs attached to this frame. See glyphs-msw.c */
+  Lisp_Object widget_hash_table;
+
   /* Frame title hash value. See frame-msw.c */
   unsigned int title_checksum;
 
@@ -181,6 +186,8 @@ 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_TOOLBAR_CHECKSUM(f,pos) \
  (FRAME_MSWINDOWS_DATA (f)->toolbar_checksum[pos])
 #define FRAME_MSWINDOWS_MENU_CHECKSUM(f)  (FRAME_MSWINDOWS_DATA (f)->menu_checksum)
@@ -219,6 +226,9 @@ struct mswindows_frame
 /* win32 "Windows" procedure */
 LRESULT WINAPI mswindows_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam,
                                   LPARAM lParam);
+LRESULT WINAPI mswindows_control_wnd_proc (HWND hwnd,
+                                          UINT msg, WPARAM wParam,
+                                          LPARAM lParam);
 
 void mswindows_redraw_exposed_area (struct frame *f, int x, int y, 
                                    int width, int height);