Make it compile with XEMACS_WIDGETS=gtk.

3 files changed, 85 insertions, 1 deletions

diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index e7fe00c4f4c..2c766938944 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/04/07 17:30:15 magick Exp $
+$NetBSD: distinfo,v 1.6 2003/04/23 22:54:42 martin Exp $
 
 SHA1 (xemacs-21.5.11.tar.gz) = 2b2f4c1150625947d5c9c978b2d5d234406fbe77
 Size (xemacs-21.5.11.tar.gz) = 12909148 bytes
@@ -7,3 +7,5 @@ SHA1 (patch-ab) = 62a968f19d1b2b9efc5f8c3cf3e612f6a1dc7df2
 SHA1 (patch-ac) = 1ffaa2c5c425de6abd8f76d262762d21d8c7d0af
 SHA1 (patch-ad) = 14c5e0f31801648fbdb7f96e5d26cb505a59b741
 SHA1 (patch-ae) = 902a375f974e06eb5d67b69deadead98c625d97a
+SHA1 (patch-af) = e32b873bfba31e84b162cac4f1a4e9cee7c47c9e
+SHA1 (patch-ag) = cd4e13ebaa9ff13c3987eddc427998a3765da259
diff --git a/editors/xemacs-current/patches/patch-af b/editors/xemacs-current/patches/patch-af
new file mode 100644
index 00000000000..b40f4d7feb2
--- /dev/null
+++ b/editors/xemacs-current/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2003/04/23 22:54:43 martin Exp $
+
+--- src/console-x.h.orig	2003-04-23 23:36:37.000000000 +0200
++++ src/console-x.h	2003-04-23 23:37:07.000000000 +0200
+@@ -33,7 +33,7 @@
+ #ifndef INCLUDED_console_x_h_
+ #define INCLUDED_console_x_h_
+ 
+-#ifdef HAVE_X_WINDOWS
++#if defined(HAVE_X_WINDOWS) || defined(HAVE_GTK)
+ 
+ #include "console.h"
+ #include "xintrinsic.h"
diff --git a/editors/xemacs-current/patches/patch-ag b/editors/xemacs-current/patches/patch-ag
new file mode 100644
index 00000000000..e6fcbf7ce5f
--- /dev/null
+++ b/editors/xemacs-current/patches/patch-ag
@@ -0,0 +1,69 @@
+$NetBSD: patch-ag,v 1.1 2003/04/23 22:54:43 martin Exp $
+
+--- src/event-xlike-inc.c.orig	2003-04-23 23:17:05.000000000 +0200
++++ src/event-xlike-inc.c	2003-04-23 23:39:47.000000000 +0200
+@@ -22,12 +22,63 @@
+ 
+ /* Synched up with: Not in FSF. */
+ 
++#include <config.h>
++#include "lisp.h"
++
++#include "blocktype.h"
++#include "charset.h"
++#include "console-x.h"
++#include "device-impl.h"
++#include "elhash.h"
++#include "events.h"
++#include "file-coding.h"
++#include "frame-impl.h"
++#include "glyphs.h"
++#include "lstream.h"
++#include "process.h"
++#include "redisplay.h"
++#include "window.h"
++
++#include "console-tty.h"
++
++#include "console-x-impl.h"
++#include "objects-x.h"
++#include "../lwlib/lwlib.h"
++#include "EmacsFrame.h"
++
++#include "sysproc.h" /* for MAXDESC */
++#include "systime.h"
++
++#include "xintrinsicp.h"	/* CoreP.h needs this */
++#include <X11/CoreP.h>		/* Numerous places access the fields of
++				   a core widget directly.  We could
++				   use XtGetValues(), but ... */
++#include <X11/ShellP.h>
++
++#if defined (HAVE_XIM) && defined (XIM_MOTIF)
++#include <Xm/Xm.h>
++#endif
++
++#ifdef HAVE_DRAGNDROP
++#include "dragdrop.h"
++#endif
++
++#if defined (HAVE_OFFIX_DND)
++#include "offix.h"
++#endif
++
++/* Mask of bits indicating the descriptors that we wait for input on */
++extern SELECT_TYPE input_wait_mask, non_fake_input_wait_mask;
++extern SELECT_TYPE process_only_mask, tty_only_mask;
++
++static int last_quit_check_signal_tick_count;
++
+ /* For some code it's reasonable to have only one copy and conditionalize
+    at run-time.  For other code it isn't. #### Perhaps all code should be
+    included here, not in event-xlike.c.  However, event-xlike.c is always
+    X-specific, whereas the following code isn't, in the GTK case. */
+ 
+-static int
++int
+ #ifdef THIS_IS_GTK
+ emacs_gtk_event_pending_p (int how_many)
+ #else