comparison src/input-method-xlib.c @ 432:3a7e78e1142d r21-2-24

Import from CVS: tag r21-2-24
author cvs
date Mon, 13 Aug 2007 11:29:58 +0200
parents 3ecd8885ac67
children 8de8e3f6228a
comparison
equal deleted inserted replaced
431:a97165e56215 432:3a7e78e1142d
79 #include "EmacsFrame.h" 79 #include "EmacsFrame.h"
80 #include "events.h" 80 #include "events.h"
81 81
82 #ifdef THIS_IS_X11R6 82 #ifdef THIS_IS_X11R6
83 #include <X11/IntrinsicP.h> 83 #include <X11/IntrinsicP.h>
84 #include <X11/Xaw/XawImP.h>
85 #endif 84 #endif
86 85
87 #ifndef XIM_XLIB 86 #ifndef XIM_XLIB
88 #error XIM_XLIB is not defined?? 87 #error XIM_XLIB is not defined??
89 #endif 88 #endif
321 XtOffsetOf(xic_vars_t, field), XtRString, default_value } 320 XtOffsetOf(xic_vars_t, field), XtRString, default_value }
322 321
323 static XtResource resources[] = 322 static XtResource resources[] =
324 { 323 {
325 /* name class represent'n field default value */ 324 /* name class represent'n field default value */
326 #ifdef THIS_IS_X11R6
327 res(XtNinputMethod, XtCInputMethod, XtRString, inputmethod, (XtPointer) NULL),
328 #endif
329 res(XtNximStyles, XtCXimStyles, XtRXimStyles, styles, (XtPointer) DefaultXIMStyles), 325 res(XtNximStyles, XtCXimStyles, XtRXimStyles, styles, (XtPointer) DefaultXIMStyles),
330 res(XtNfontSet, XtCFontSet, XtRFontSet, fontset, (XtPointer) XtDefaultFontSet), 326 res(XtNfontSet, XtCFontSet, XtRFontSet, fontset, (XtPointer) XtDefaultFontSet),
331 res(XtNximForeground, XtCForeground, XtRPixel, fg, (XtPointer) XtDefaultForeground), 327 res(XtNximForeground, XtCForeground, XtRPixel, fg, (XtPointer) XtDefaultForeground),
332 res(XtNximBackground, XtCBackground, XtRPixel, bg, (XtPointer) XtDefaultBackground) 328 res(XtNximBackground, XtCBackground, XtRPixel, bg, (XtPointer) XtDefaultBackground)
333 }; 329 };