Mercurial > hg > xemacs-beta

diff src/frame-msw.c @ 231:557eaa0339bf r20-5b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b14
author cvs
date Mon, 13 Aug 2007 10:13:48 +0200
parents 12579d965149
children 51092a27c943
line wrap: on
line diff
--- a/src/frame-msw.c	Mon Aug 13 10:13:03 2007 +0200
+++ b/src/frame-msw.c	Mon Aug 13 10:13:48 2007 +0200
@@ -35,6 +35,7 @@
 #include "event-msw.h"
 
 #include "buffer.h"
+#include "faces.h"
 #include "frame.h"
 #include "events.h"
 
@@ -60,13 +61,11 @@
 {
   Lisp_Object device = FRAME_DEVICE (f);
   struct device *d = XDEVICE (device);
-  Lisp_Object lisp_window_id, initially_unmapped;
+  Lisp_Object initially_unmapped;
   Lisp_Object name, height, width, popup, top, left;
   Lisp_Object frame_obj;
-  int pixel_width, pixel_height;
   RECT rect;
   DWORD style, exstyle;
-  HWND hwnd;
 
   initially_unmapped = Fplist_get (props, Qinitially_unmapped, Qnil);
   name = Fplist_get (props, Qname, Qnil);
@@ -101,6 +100,8 @@
   FRAME_MSWINDOWS_DATA(f)->ignore_next_rbutton_up = 0;
   FRAME_MSWINDOWS_DATA(f)->sizing = 0;
 
+  FRAME_MSWINDOWS_MENU_HASHTABLE(f) = Qnil;
+
   AdjustWindowRectEx(&rect, style, ADJR_MENUFLAG, exstyle);
 
   FRAME_MSWINDOWS_HANDLE(f) =
@@ -135,6 +136,12 @@
 }
 
 static void
+mswindows_mark_frame (struct frame *f, void (*markobj) (Lisp_Object))
+{
+  ((markobj) (FRAME_MSWINDOWS_MENU_HASHTABLE (f)));
+}
+
+static void
 mswindows_focus_on_frame (struct frame *f)
 {
     SetForegroundWindow (FRAME_MSWINDOWS_HANDLE(f));
@@ -340,7 +347,7 @@
   CONSOLE_HAS_METHOD (mswindows, init_frame_1);
   CONSOLE_HAS_METHOD (mswindows, init_frame_2);
   CONSOLE_HAS_METHOD (mswindows, init_frame_3);
-/*  CONSOLE_HAS_METHOD (mswindows, mark_frame); */
+  CONSOLE_HAS_METHOD (mswindows, mark_frame);
   CONSOLE_HAS_METHOD (mswindows, focus_on_frame);
   CONSOLE_HAS_METHOD (mswindows, delete_frame);
 /*  CONSOLE_HAS_METHOD (mswindows, get_mouse_position); */