diff src/event-msw.c @ 1111:184461bc8de4

[xemacs-hg @ 2002-11-18 06:52:23 by ben] warning fixes, etc. * s/cygwin32.h: -fvtable-thunks is obsolete in GCC 3 and generates warnings. * s/mingw32.h: * s/windowsnt.h: Comment fixes. * emodules.h: Fix warnings from redefining symbols. * eval.c: Fix C++ errors -- no automatic casting between function pointers and void *, function declarations inside of functions not allowed. * event-Xt.c (emacs_Xt_enqueue_focus_event): Warning fixes. * fileio.c (Ffile_truename): Warning fixes. Use LOCAL_TO_WIN32_FILE_FORMAT rather than duplicating it. * glyphs-x.c: Fix style. * intl-auto-encap-win32.c: * intl-auto-encap-win32.h: * intl-encap-win32.c: * intl-encap-win32.c (qxeRegConnectRegistry): * syswindows.h (RegConnectRegistry): DdeCreateStringHandle needs to be manual due to new Cygwin bug. * intl-win32.c: wcslen/wcscmp don't seem to exist under G++ 3, Cygwin. * lisp.h: * lisp-union.h: * lisp-disunion.h: * process-unix.c (unix_send_process): Ugh, C needs volatile and C++ must not have volatile. Remove previous volatile hacks, which don't seem to be working any more. * sheap.c (STATIC_HEAP_SLOP): Try to get a working Cygwin build with old unexec. * sheap.c (more_static_core): No NL's in literals allowed. * symbols.c (Fset): Fix C++ errors. * syswindows.h: Fix Cygwin complaints now that some missing structs have been added. aclocal.m4: Disable shared library modules under Cygwin for the moment, since we need some more tricky coding done and I don't have the time right now. configure.in, configure.usage: code-files.el, loadhist.el: Fix warnings. package-get.el: Fix warnings. NOTE: This was already fixed awhile ago, but reverted by Steve Y. Please be careful. postgresql/Makefile.in.in: Removed. Move common stuff into modues/common/Makefile.common. (Also add extraclean target and a couple of other fixes in that file.) postgresql/configure.ac: Extract out common configure stuff into modules/common/configure-{pre,post}.ac. postgresql/postgresql.c: Fix warning. ldap/Makefile.in.in: Removed. Move common stuff into modues/common/Makefile.common. (Also add extraclean target and a couple of other fixes in that file.) ldap/configure.ac: Extract out common configure stuff into modules/common/configure-{pre,post}.ac. common/Makefile.common: Common stuff is here.
author ben
date Mon, 18 Nov 2002 06:53:08 +0000
parents 9b80efded6a5
children e22b0213b713
line wrap: on
line diff
--- a/src/event-msw.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/event-msw.c	Mon Nov 18 06:53:08 2002 +0000
@@ -3353,7 +3353,7 @@
       {
 	LPNMHDR nmhdr = (LPNMHDR) lParam;
 
-	if ((int) nmhdr->code == TTN_NEEDTEXT)
+	if (nmhdr->code == TTN_NEEDTEXT)
 	  {
 #ifdef HAVE_TOOLBARS
 	    LPTOOLTIPTEXTW tttextw = (LPTOOLTIPTEXTW) lParam;
@@ -3383,14 +3383,14 @@
 #endif
 	  }
 	/* handle tree view callbacks */
-	else if ((int) nmhdr->code == TVN_SELCHANGED)
+	else if (nmhdr->code == TVN_SELCHANGED)
 	  {
 	    NM_TREEVIEW *ptree = (NM_TREEVIEW *) lParam;
 	    frame = XFRAME (mswindows_find_frame (hwnd));
 	    mswindows_handle_gui_wm_command (frame, 0, ptree->itemNew.lParam);
 	  }
 	/* handle tab control callbacks */
-	else if ((int) nmhdr->code == TCN_SELCHANGE)
+	else if (nmhdr->code == TCN_SELCHANGE)
 	  {
 	    TC_ITEM item;
 	    int idx = qxeSendMessage (nmhdr->hwndFrom, TCM_GETCURSEL, 0, 0);
@@ -4225,8 +4225,8 @@
       mods |= (keymap [VK_CONTROL] & 0x80) ? XEMACS_MOD_CONTROL : 0;
     }
 
-  mods |= (keys_is_real ? fwKeys & MK_SHIFT : (keymap [VK_SHIFT] & 0x80))
-    ? XEMACS_MOD_SHIFT : 0;
+  mods |= (keys_is_real ? (int) (fwKeys & MK_SHIFT) :
+	   (keymap [VK_SHIFT] & 0x80)) ? XEMACS_MOD_SHIFT : 0;
   mods |= fwKeys & MK_LBUTTON ? XEMACS_MOD_BUTTON1 : 0;
   mods |= fwKeys & MK_MBUTTON ? XEMACS_MOD_BUTTON2 : 0;
   mods |= fwKeys & MK_RBUTTON ? XEMACS_MOD_BUTTON3 : 0;