X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconsole-msw.h;h=0bb2fc5579750310a7bee4ec256983ecc11d5e8a;hb=6797bde39c52203650064ef8e079af5a9c5f124a;hp=45e2561676921807e204a875a6c246c1902f8017;hpb=669565bfdc5d704dfb1d5ac1a0ec01fb3615a1ae;p=chise%2Fxemacs-chise.git-

diff --git a/src/console-msw.h b/src/console-msw.h
index 45e2561..0bb2fc5 100644
--- a/src/console-msw.h
+++ b/src/console-msw.h
@@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #endif
 #include <windows.h>
 #include <ddeml.h>	/* DDE management library */
-#ifndef __CYGWIN32__
+#if !defined (__CYGWIN32__) && !defined(__MINGW32__)
 #include <shellapi.h>	/* FileManager/Explorer drag and drop */
 #include <commctrl.h>
 #endif
@@ -133,7 +133,7 @@ struct mswindows_frame
   /* DC for this win32 window */
   HDC hdc;
 
-  /* compatibke DC for bitmap operations */
+  /* compatible DC for bitmap operations */
   HDC cdc;
 
   /* Time of last click event, for button 2 emul */
@@ -142,17 +142,20 @@ struct mswindows_frame
   /* Coordinates of last click event, screen-relative */
   POINTS last_click_point;
 #ifdef HAVE_TOOLBARS
-  /* Toolbar hashtable. See toolbar-msw.c */
-  Lisp_Object toolbar_hashtable;
+  /* Toolbar hash table. See toolbar-msw.c */
+  Lisp_Object toolbar_hash_table;
   unsigned int toolbar_checksum[4];
 #endif
 
-  /* Menu hashtable. See menubar-msw.c */
-  Lisp_Object menu_hashtable;
+  /* Menu hash table. See menubar-msw.c */
+  Lisp_Object menu_hash_table;
 
   /* 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;
 
@@ -175,12 +178,14 @@ struct mswindows_frame
 
 #define FRAME_MSWINDOWS_DATA(f) FRAME_TYPE_DATA (f, mswindows)
 
-#define FRAME_MSWINDOWS_HANDLE(f)	  (FRAME_MSWINDOWS_DATA (f)->hwnd)
-#define FRAME_MSWINDOWS_DC(f)		  (FRAME_MSWINDOWS_DATA (f)->hdc)
-#define FRAME_MSWINDOWS_CDC(f)		  (FRAME_MSWINDOWS_DATA (f)->cdc)
-#define FRAME_MSWINDOWS_MENU_HASHTABLE(f) (FRAME_MSWINDOWS_DATA (f)->menu_hashtable)
-#define FRAME_MSWINDOWS_TOOLBAR_HASHTABLE(f) \
- (FRAME_MSWINDOWS_DATA (f)->toolbar_hashtable)
+#define FRAME_MSWINDOWS_HANDLE(f)	   (FRAME_MSWINDOWS_DATA (f)->hwnd)
+#define FRAME_MSWINDOWS_DC(f)		   (FRAME_MSWINDOWS_DATA (f)->hdc)
+#define FRAME_MSWINDOWS_CDC(f)		   (FRAME_MSWINDOWS_DATA (f)->cdc)
+#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)