comparison src/frame-x.c @ 5180:4cd28c29a7a1

merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 22:52:01 -0500
parents 97eb4942aec8
children 6466bc9ebf15
comparison
equal deleted inserted replaced
5179:14fda1dbdb26 5180:4cd28c29a7a1
38 #include "gutter.h" 38 #include "gutter.h"
39 #include "window.h" 39 #include "window.h"
40 40
41 #include "console-x-impl.h" 41 #include "console-x-impl.h"
42 #include "glyphs-x.h" 42 #include "glyphs-x.h"
43 #include "objects-x-impl.h" 43 #include "fontcolor-x-impl.h"
44 #include "scrollbar-x.h" 44 #include "scrollbar-x.h"
45 45
46 #include "xintrinsicp.h" /* CoreP.h needs this */ 46 #include "xintrinsicp.h" /* CoreP.h needs this */
47 #include <X11/CoreP.h> /* Numerous places access the fields of 47 #include <X11/CoreP.h> /* Numerous places access the fields of
48 a core widget directly. We could 48 a core widget directly. We could