aboutsummaryrefslogtreecommitdiff
path: root/libXaw/src/XawIm.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-10 14:58:33 +0200
committermarha <marha@users.sourceforge.net>2012-04-10 14:58:33 +0200
commit5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (patch)
treec10939819ba1167cdc905a0c105c7ae4091abbc3 /libXaw/src/XawIm.c
parent67326634496ef21b4acbf4cef2f05040d34aef9b (diff)
downloadvcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.tar.gz
vcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.tar.bz2
vcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.zip
Updated following packages:
bigreqsproto-1.1.2 fontsproto-2.1.2 recordproto-1.14.2 scrnsaverproto-1.2.2 xcmiscproto-1.2.2 libXt-1.1.3 xhost-1.0.5 kbproto-1.0.6 libXrender-0.9.7 libxkbfile-1.0.8 freetype-2.4.9 libXaw-1.0.10 libXpm-3.5.10 xproto-7.0.23
Diffstat (limited to 'libXaw/src/XawIm.c')
-rw-r--r--libXaw/src/XawIm.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/libXaw/src/XawIm.c b/libXaw/src/XawIm.c
index 3b7032b74..7a7152fb6 100644
--- a/libXaw/src/XawIm.c
+++ b/libXaw/src/XawIm.c
@@ -17,12 +17,12 @@
* ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
* WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTUOUS ACTION,
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ * SOFTWARE.
*
* Author: Seiji Kuwari OMRON Corporation
* kuwa@omron.co.jp
* kuwa%omron.co.jp@uunet.uu.net
- */
+ */
/*
@@ -85,7 +85,7 @@ in this Software without prior written authorization from The Open Group.
* Forward reference prototypes
*
*****************************************************/
-
+
/*
* Prototypes
*/
@@ -184,14 +184,14 @@ static VendorShellWidget SearchVendorShell(Widget w)
return(NULL);
}
-static XContext extContext = (XContext)NULL;
+static XContext extContext = (XContext)0;
static XawVendorShellExtPart *
SetExtPart(VendorShellWidget w, XawVendorShellExtWidget vew)
{
contextDataRec *contextData;
- if (extContext == (XContext)NULL) extContext = XUniqueContext();
+ if (extContext == (XContext)0) extContext = XUniqueContext();
contextData = XtNew(contextDataRec);
contextData->parent = (Widget)w;
@@ -296,13 +296,13 @@ ConfigureCB(Widget w, XtPointer closure, XEvent *event, Boolean *unused)
}
}
-static XContext errContext = (XContext)NULL;
+static XContext errContext = (XContext)0;
static Widget SetErrCnxt(Widget w, XIM xim)
{
contextErrDataRec *contextErrData;
- if (errContext == (XContext)NULL) errContext = XUniqueContext();
+ if (errContext == (XContext)0) errContext = XUniqueContext();
contextErrData = XtNew(contextErrDataRec);
contextErrData->widget = w;
@@ -506,7 +506,7 @@ OpenIM(XawVendorShellExtPart *ve)
}
if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
|| !xim_styles) {
- XtAppWarning(XtWidgetToApplicationContext(ve->parent),
+ XtAppWarning(XtWidgetToApplicationContext(ve->parent),
"input method doesn't support any style");
XCloseIM(xim);
return;
@@ -800,7 +800,7 @@ CreateIC(Widget w, XawVendorShellExtPart *ve)
if (IsSharedIC(ve)) SetICValuesShared(w, ve, p, FALSE);
XFlush(XtDisplay(w));
-
+
if (p->input_style & (XIMPreeditArea|XIMPreeditPosition|XIMStatusArea)) {
if (p->flg & CIFontSet) {
pe_a[pe_cnt] = (XPointer) XNFontSet; pe_cnt++;
@@ -1220,7 +1220,7 @@ SetFocusValues(Widget inwidg, ArgList args, Cardinal num_args, Bool focus)
if (focus) SetICFocus(inwidg, ve);
} else {
CreateIC(inwidg, ve);
- SetICFocus(inwidg, ve);
+ SetICFocus(inwidg, ve);
}
}
}
@@ -1407,13 +1407,13 @@ Destroy(Widget w, XawVendorShellExtPart *ve)
return;
XtFree( (char*) ve->im.resources );
- if (extContext != (XContext)NULL &&
- !XFindContext (XtDisplay (w), (Window)w,
+ if (extContext != (XContext)0 &&
+ !XFindContext (XtDisplay (w), (Window)w,
extContext, (XPointer*)&contextData))
XtFree( (char*) contextData );
- if (errContext != (XContext)NULL &&
- !XFindContext (XDisplayOfIM( ve->im.xim ), (Window) ve->im.xim,
+ if (errContext != (XContext)0 &&
+ !XFindContext (XDisplayOfIM( ve->im.xim ), (Window) ve->im.xim,
errContext, (XPointer*) &contextErrData))
XtFree( (char*) contextErrData );
}