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

gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)

Browse Source 
* gtk/gtkenums.h (enum GtkIMPreeditStyle, GtkIMStatusStyle):
	* modules/input/gtkimcontextxim.c (preedit_style_change, status_style_change):
	gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)
This commit is contained in:
Hidetoshi Tajima
2003-05-21 20:21:41 +00:00
parent b5adee991a
commit 539ad89f76
7 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkenums.h (enum GtkIMPreeditStyle, GtkIMStatusStyle):
* modules/input/gtkimcontextxim.c (preedit_style_change, status_style_change):
gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)
Wed May 21 12:10:25 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 12:10:25 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkimcontextsimple.c: * gtk/gtkimcontextsimple.c:

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkenums.h (enum GtkIMPreeditStyle, GtkIMStatusStyle):
* modules/input/gtkimcontextxim.c (preedit_style_change, status_style_change):
gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)
Wed May 21 12:10:25 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 12:10:25 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkimcontextsimple.c: * gtk/gtkimcontextsimple.c:

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkenums.h (enum GtkIMPreeditStyle, GtkIMStatusStyle):
* modules/input/gtkimcontextxim.c (preedit_style_change, status_style_change):
gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)
Wed May 21 12:10:25 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 12:10:25 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkimcontextsimple.c: * gtk/gtkimcontextsimple.c:

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkenums.h (enum GtkIMPreeditStyle, GtkIMStatusStyle):
* modules/input/gtkimcontextxim.c (preedit_style_change, status_style_change):
gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)
Wed May 21 12:10:25 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 12:10:25 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkimcontextsimple.c: * gtk/gtkimcontextsimple.c:

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkenums.h (enum GtkIMPreeditStyle, GtkIMStatusStyle):
* modules/input/gtkimcontextxim.c (preedit_style_change, status_style_change):
gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)
Wed May 21 12:10:25 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 12:10:25 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkimcontextsimple.c: * gtk/gtkimcontextsimple.c:

6
gtk/gtkenums.h
View File

@ -431,13 +431,15 @@ typedef enum
typedef enum typedef enum
{ {
GTK_IM_PREEDIT_NOTHING, GTK_IM_PREEDIT_NOTHING,
GTK_IM_PREEDIT_CALLBACK GTK_IM_PREEDIT_CALLBACK,
GTK_IM_PREEDIT_NONE
} GtkIMPreeditStyle; } GtkIMPreeditStyle;
typedef enum typedef enum
{ {
GTK_IM_STATUS_NOTHING, GTK_IM_STATUS_NOTHING,
GTK_IM_STATUS_CALLBACK GTK_IM_STATUS_CALLBACK,
GTK_IM_STATUS_NONE
} GtkIMStatusStyle; } GtkIMStatusStyle;
#ifdef __cplusplus #ifdef __cplusplus

4
modules/input/gtkimcontextxim.c
View File

@ -190,6 +190,8 @@ status_style_change (GtkXIMInfo *info)
info->status_style_setting = XIMStatusCallbacks; info->status_style_setting = XIMStatusCallbacks;
else if (status_style == GTK_IM_STATUS_NOTHING) else if (status_style == GTK_IM_STATUS_NOTHING)
info->status_style_setting = XIMStatusNothing; info->status_style_setting = XIMStatusNothing;
else if (status_style == GTK_IM_STATUS_NONE)
info->status_style_setting = XIMStatusNone;
else else
return; return;
@ -209,6 +211,8 @@ preedit_style_change (GtkXIMInfo *info)
info->preedit_style_setting = XIMPreeditCallbacks; info->preedit_style_setting = XIMPreeditCallbacks;
else if (preedit_style == GTK_IM_PREEDIT_NOTHING) else if (preedit_style == GTK_IM_PREEDIT_NOTHING)
info->preedit_style_setting = XIMPreeditNothing; info->preedit_style_setting = XIMPreeditNothing;
else if (preedit_style == GTK_IM_PREEDIT_NONE)
info->preedit_style_setting = XIMPreeditNone;
else else
return; return;