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

merge
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 05:29:05 -0600
parents 304aebb79cd3 b3ce27ca7647
children d0c14ea98592
comparison
equal deleted inserted replaced
4961:b90f8cf474e0 4962:e813cf16c015
19 ** 19 **
20 ** You should have received a copy of the GNU General Public License 20 ** You should have received a copy of the GNU General Public License
21 ** along with XEmacs; see the file COPYING. If not, write to 21 ** along with XEmacs; see the file COPYING. If not, write to
22 ** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, 22 ** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
23 ** Boston, MA 02111-1301, USA. */ 23 ** Boston, MA 02111-1301, USA. */
24 */
25 24
26 #include <config.h> 25 #include <config.h>
27 26
28 #include "lisp.h" 27 #include "lisp.h"
29 #include "console-gtk.h" 28
30 #include "objects-gtk.h"
31 #include "gtk-xemacs.h"
32 #include "device.h" 29 #include "device.h"
30 #include "faces.h"
33 #include "glyphs.h" 31 #include "glyphs.h"
34 #include "window.h" 32 #include "window.h"
35 #include "faces.h" 33
36 #include "event-gtk.h"
37 #include "frame-impl.h" 34 #include "frame-impl.h"
38 #include "console-gtk-impl.h" 35 #include "console-gtk-impl.h"
39 #include "device-impl.h" 36 #include "device-impl.h"
37 #include "gtk-xemacs.h"
38 #include "objects-gtk.h"
40 39
41 extern Lisp_Object Vmodeline_face; 40 extern Lisp_Object Vmodeline_face;
42 extern Lisp_Object Vscrollbar_on_left_p; 41 extern Lisp_Object Vscrollbar_on_left_p;
43 42
44 EXFUN (Fmake_image_instance, 4); 43 EXFUN (Fmake_image_instance, 4);