diff src/glyphs-x.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 79fb6b9e9f76
children e22b0213b713
line wrap: on
line diff
--- a/src/glyphs-x.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/glyphs-x.c	Mon Nov 18 06:53:08 2002 +0000
@@ -142,17 +142,16 @@
 				     Lisp_Object domain);
 
 #ifdef HAVE_X_WIDGETS
-static void
-update_widget_face (widget_value* wv,
-		    Lisp_Image_Instance* ii, Lisp_Object domain);
-static void
-update_tab_widget_face (widget_value* wv,
-			Lisp_Image_Instance* ii, Lisp_Object domain);
+static void update_widget_face (widget_value* wv,
+				Lisp_Image_Instance* ii, Lisp_Object domain);
+static void update_tab_widget_face (widget_value* wv,
+				    Lisp_Image_Instance* ii,
+				    Lisp_Object domain);
 #endif
-void
-emacs_Xt_handle_widget_losing_focus (struct frame* f, Widget losing_widget);
-void
-enqueue_focus_event (Widget wants_it, Lisp_Object frame, int in_p);
+void emacs_Xt_handle_widget_losing_focus (struct frame* f,
+					  Widget losing_widget);
+void emacs_Xt_enqueue_focus_event (Widget wants_it, Lisp_Object frame,
+				   int in_p);
 
 #include "bitmaps.h"
 
@@ -2081,13 +2080,14 @@
       if (!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (p))
 	XtMapWidget (IMAGE_INSTANCE_X_CLIPWIDGET (p));
       /* See comments in glyphs-msw.c about keyboard focus. */
-      if (IMAGE_INSTANCE_WANTS_INITIAL_FOCUS (p)) {
-	/* #### FIXME to pop-up the find dialog we map the text-field
-	   seven times! This doesn't show on a fast linux box but does
-	   under X on windows. */
-	enqueue_focus_event (IMAGE_INSTANCE_X_WIDGET_ID (p),
-			     IMAGE_INSTANCE_FRAME (p), 1);
-      }
+      if (IMAGE_INSTANCE_WANTS_INITIAL_FOCUS (p))
+	{
+	  /* #### FIXME to pop-up the find dialog we map the text-field
+	     seven times! This doesn't show on a fast linux box but does
+	     under X on windows. */
+	  emacs_Xt_enqueue_focus_event (IMAGE_INSTANCE_X_WIDGET_ID (p),
+					IMAGE_INSTANCE_FRAME (p), 1);
+	}
     }
 }