Mercurial > hg > xemacs-beta

comparison src/event-gtk.c @ 4962:e813cf16c015

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 05:29:05 -0600
parents 304aebb79cd3 b3ce27ca7647
children 16112448d484
comparison
equal deleted inserted replaced
4961:b90f8cf474e0 4962:e813cf16c015
47 #include "console-gtk-impl.h" 47 #include "console-gtk-impl.h"
48 #include "objects-gtk.h" 48 #include "objects-gtk.h"
49 49
50 #include "gtk-xemacs.h" 50 #include "gtk-xemacs.h"
51 51
52 #include "sysgdkx.h"
53
52 #include "systime.h" 54 #include "systime.h"
53 #include "sysproc.h" /* for MAXDESC */ 55 #include "sysproc.h" /* for MAXDESC */
54
55 #include <gdk/gdkkeysyms.h>
56 56
57 #ifdef HAVE_DRAGNDROP 57 #ifdef HAVE_DRAGNDROP
58 #include "dragdrop.h" 58 #include "dragdrop.h"
59 #endif 59 #endif
60 60
61 #ifdef HAVE_MENUBARS 61 #ifdef HAVE_MENUBARS
62 # include "menubar.h" 62 # include "menubar.h"
63 #endif 63 #endif
64
65 #include <gdk/gdkx.h>
66
67 #include "event-gtk.h"
68 64
69 static struct event_stream *gtk_event_stream; 65 static struct event_stream *gtk_event_stream;
70 66
71 #ifdef WIN32_ANY 67 #ifdef WIN32_ANY
72 extern int mswindows_is_blocking; 68 extern int mswindows_is_blocking;
1580 1576
1581 /************************************************************************/ 1577 /************************************************************************/
1582 /* input pending / C-g checking */ 1578 /* input pending / C-g checking */
1583 /************************************************************************/ 1579 /************************************************************************/
1584 1580
1585 #include <gdk/gdkx.h>
1586
1587 static void 1581 static void
1588 emacs_gtk_drain_queue (void) 1582 emacs_gtk_drain_queue (void)
1589 1583
1590 { 1584 {
1591 /* We can't just spin through here and wait for GTKs idea of the 1585 /* We can't just spin through here and wait for GTKs idea of the
1690 } 1684 }
1691 1685
1692 /* This is down at the bottom of the file so I can avoid polluting the 1686 /* This is down at the bottom of the file so I can avoid polluting the
1693 generic code with this X specific CRAP! */ 1687 generic code with this X specific CRAP! */
1694 1688
1695 #include <gdk/gdkx.h> 1689 #include "sysgdkx.h"
1696 #include <X11/keysym.h> 1690 #include <X11/keysym.h>
1697 /* #### BILL!!! Fix this please! */ 1691 /* #### BILL!!! Fix this please! */
1698 1692
1699 1693
1700 /************************************************************************/ 1694 /************************************************************************/