callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to guess if we can use the mb* functions safely. (For glibc, they do

Browse Source 
Tue Mar 17 01:55:00 1998  Owen Taylor  <owt1@cornell.edu>

	* gtk/gtkmain.c gtk/gtkentry.c: Try to guess if we can
	  use the mb* functions safely. (For glibc, they do
	  UTF-8). Heuristic is (X_LOCALE && locale != C/POSIX)
	  || (mblen("\xc0", MB_CUR_MAX) == 1).

	(From: "Richard Lloyd" <rkl@csc.liv.ac.uk>)

	* gdk/gdk.c (gdk_ic_get_attr): Use an intermediate
	  variable to avoid taking the address of the result
	  of va_arg.

	* gtk/gtkentry.c gtk/gtkeditable.c gtkobject.c
	  gtk/testselection.c: signedness fixups

	* gtk/gtkcontainer.c: Fixed implicit cast between
	  gpointer and func pointer by changing.

	* gtk/gtkcombo.c, gtk/gtkentry.c, gtk/gtktext.c:
	  static void forward declaration vs. void actual fixed

	* gtk/testgtk.c: Limit total number of tree items to 10,000
This commit is contained in:
Owen Taylor
1998-03-17 19:03:52 +00:00
committed by Owen Taylor
parent a783d668f1
commit 70b3b3e6e1
22 changed files with 432 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/x11/gdkmain-x11.c
View File

@ -3430,6 +3430,7 @@ gdk_ic_new (GdkWindow* client_window,
GdkIMStyle style, ...)
{
va_list list;
void *argsptr;
GdkICPrivate *private;
XVaNestedList preedit_attr;
@ -3440,7 +3441,8 @@ gdk_ic_new (GdkWindow* client_window,
private = g_new (GdkICPrivate, 1);
va_start (list, style);
preedit_attr = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
preedit_attr = (XVaNestedList)&argsptr;
va_end (list);
private->style = gdk_im_decide_style (style);
@ -3500,6 +3502,7 @@ void
gdk_ic_set_values (GdkIC ic, ...)
{
va_list list;
void *argsptr;
XVaNestedList args;
GdkICPrivate *private;
@ -3508,7 +3511,8 @@ gdk_ic_set_values (GdkIC ic, ...)
private = (GdkICPrivate *) ic;
va_start (list, ic);
args = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
args = (XVaNestedList)&argsptr;
va_end (list);
XSetICValues (private->xic, XNVaNestedList, args, NULL);
@ -3518,6 +3522,7 @@ void
gdk_ic_get_values (GdkIC ic, ...)
{
va_list list;
void *argsptr;
XVaNestedList args;
GdkICPrivate *private;
@ -3526,7 +3531,8 @@ gdk_ic_get_values (GdkIC ic, ...)
private = (GdkICPrivate *) ic;
va_start (list, ic);
args = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
args = (XVaNestedList)&argsptr;
va_end (list);
XGetICValues (private->xic, XNVaNestedList, args, NULL);
@ -3536,6 +3542,7 @@ void
gdk_ic_set_attr (GdkIC ic, const char *target, ...)
{
va_list list;
void *argsptr;
XVaNestedList attr;
GdkICPrivate *private;
@ -3545,7 +3552,8 @@ gdk_ic_set_attr (GdkIC ic, const char *target, ...)
private = (GdkICPrivate *) ic;
va_start (list, target);
attr = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
attr = (XVaNestedList)&argsptr;
va_end (list);
XSetICValues (private->xic, target, attr, NULL);
@ -3555,6 +3563,7 @@ void
gdk_ic_get_attr (GdkIC ic, const char *target, ...)
{
va_list list;
void *argsptr;
XVaNestedList attr;
GdkICPrivate *private;
@ -3564,7 +3573,8 @@ gdk_ic_get_attr (GdkIC ic, const char *target, ...)
private = (GdkICPrivate *) ic;
va_start (list, target);
attr = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
attr = (XVaNestedList)&argsptr;
va_end (list);
XGetICValues (private->xic, target, attr, NULL);