AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed argument list and return type for non-XIM fallback.

Browse Source 
Wed Dec  9 13:06:31 1998  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

 	* gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
 	list and return type for non-XIM fallback.

 	* configure.in: Only build XIM-support if available.
This commit is contained in:
Sebastian Wilhelmi 1998-12-09 18:13:52 +00:00 committed by Owen Taylor
parent dfa88ef9c7
commit d3483d010e
12 changed files with 91 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Dec 9 13:06:31 1998 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
list and return type for non-XIM fallback.
* configure.in: Only build XIM-support if available.
Wed Dec 9 12:23:30 1998 Owen Taylor <otaylor@redhat.com>
* gtk/testselection.c (main): Add in missing 'flags'

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
Wed Dec 9 13:06:31 1998 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
list and return type for non-XIM fallback.
* configure.in: Only build XIM-support if available.
Wed Dec 9 12:23:30 1998 Owen Taylor <otaylor@redhat.com>
* gtk/testselection.c (main): Add in missing 'flags'

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
Wed Dec 9 13:06:31 1998 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
list and return type for non-XIM fallback.
* configure.in: Only build XIM-support if available.
Wed Dec 9 12:23:30 1998 Owen Taylor <otaylor@redhat.com>
* gtk/testselection.c (main): Add in missing 'flags'

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
Wed Dec 9 13:06:31 1998 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
list and return type for non-XIM fallback.
* configure.in: Only build XIM-support if available.
Wed Dec 9 12:23:30 1998 Owen Taylor <otaylor@redhat.com>
* gtk/testselection.c (main): Add in missing 'flags'

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
Wed Dec 9 13:06:31 1998 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
list and return type for non-XIM fallback.
* configure.in: Only build XIM-support if available.
Wed Dec 9 12:23:30 1998 Owen Taylor <otaylor@redhat.com>
* gtk/testselection.c (main): Add in missing 'flags'

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
Wed Dec 9 13:06:31 1998 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
list and return type for non-XIM fallback.
* configure.in: Only build XIM-support if available.
Wed Dec 9 12:23:30 1998 Owen Taylor <otaylor@redhat.com>
* gtk/testselection.c (main): Add in missing 'flags'

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
Wed Dec 9 13:06:31 1998 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c (gdk_ic_new,gdk_ic_{set,get}_attr): Fixed argument
list and return type for non-XIM fallback.
* configure.in: Only build XIM-support if available.
Wed Dec 9 12:23:30 1998 Owen Taylor <otaylor@redhat.com>
* gtk/testselection.c (main): Add in missing 'flags'

11
README.cvs-commits
View File

@ -43,6 +43,17 @@ Notes:
* If you are going to be changing many files in an experimental fashion,
it probably is a good idea to create a separate branch for your changes.
* The ChangeLog entries should preferrably match in date format
with the existing entries. You can set how emacs does this
by using customize mode:
- M-x customize
- set Programming/Tools/ChangeLog/Add Log Time Format to
'Old Format'
Or, set the add-log-time-format to 'current-time-string in
your .emacs file.
Owen Taylor
13 Aug 1998

3
config.h.in
View File

@ -59,3 +59,6 @@
/* Define if you have the <wctype.h> header file. */
#undef HAVE_WCTYPE_H
/* Define if you have the X11 library (-lX11). */
#undef HAVE_LIBX11

17
configure.in
View File

@ -63,7 +63,7 @@ AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]]
, enable_ansi=no)
AC_ARG_WITH(glib, [ --with-glib=DIR Use uninstalled copy of glib])
AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]],
echo $enable_xim, enable_xim="yes")
, enable_xim="yes")
AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ])
AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ])
@ -163,10 +163,6 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
CFLAGS=$gtk_save_CFLAGS
AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
if test "x$enable_xim" = "xyes"; then
GTK_XIM_FLAGS="-DUSE_XIM"
fi
if test x$with_glib = xyes ; then
AC_MSG_ERROR([
*** Directory must be specified for --with-glib])
@ -273,6 +269,17 @@ AC_CHECK_LIB(X11, XConvertCase,
,
$x_libs)
# Check for XIM support.
AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
,
enable_xim=no,
$x_libs)
if test "x$enable_xim" = "xyes"; then
GTK_XIM_FLAGS="-DUSE_XIM"
fi
x_cflags="$X_CFLAGS"
x_ldflags="$X_LDFLAGS $X_LIBS"

16
gdk/gdkim.c
View File

@ -1317,10 +1317,8 @@ gdk_im_ready (void)
return FALSE;
}
GdkIC
gdk_ic_new (GdkWindow* client_window,
GdkWindow* focus_window,
GdkIMStyle style, ...)
GdkIC *
gdk_ic_new (GdkICAttr *attr, GdkICAttributesType mask)
{
return NULL;
}
@ -1346,14 +1344,16 @@ gdk_ic_get_values (GdkIC *ic, ...)
{
}
void
gdk_ic_set_attr (GdkIC *ic, const char *target, ...)
GdkICAttributesType
gdk_ic_set_attr (GdkIC *ic, GdkICAttr *attr, GdkICAttributesType mask)
{
return 0;
}
void
gdk_ic_get_attr (GdkIC *ic, const char *target, ...)
GdkICAttributesType
gdk_ic_get_attr (GdkIC *ic, GdkICAttr *attr, GdkICAttributesType mask)
{
return 0;
}
GdkEventMask

16
gdk/x11/gdkim-x11.c
View File

@ -1317,10 +1317,8 @@ gdk_im_ready (void)
return FALSE;
}
GdkIC
gdk_ic_new (GdkWindow* client_window,
GdkWindow* focus_window,
GdkIMStyle style, ...)
GdkIC *
gdk_ic_new (GdkICAttr *attr, GdkICAttributesType mask)
{
return NULL;
}
@ -1346,14 +1344,16 @@ gdk_ic_get_values (GdkIC *ic, ...)
{
}
void
gdk_ic_set_attr (GdkIC *ic, const char *target, ...)
GdkICAttributesType
gdk_ic_set_attr (GdkIC *ic, GdkICAttr *attr, GdkICAttributesType mask)
{
return 0;
}
void
gdk_ic_get_attr (GdkIC *ic, const char *target, ...)
GdkICAttributesType
gdk_ic_get_attr (GdkIC *ic, GdkICAttr *attr, GdkICAttributesType mask)
{
return 0;
}
GdkEventMask