diff options
| author | Owen Taylor <otaylor@redhat.com> | 1998-12-09 06:36:57 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-12-09 06:36:57 +0000 |
| commit | 207757e70d8b2d9aa8335d968fd7ac79796264ab (patch) | |
| tree | ae572a9674c8dc7b8a0ae7200e6d4e7c5c7632e8 /gdk/gdkprivate.h | |
| parent | af84227184f9cbe2c87f0aa09d5c93564150bb70 (diff) | |
| download | gtk+-207757e70d8b2d9aa8335d968fd7ac79796264ab.tar.gz | |
Destroy widgets _after_ propagating unrealize signals through the widget
Mon Dec 7 10:27:09 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Destroy widgets _after_ propagating unrealize
signals through the widget heirarchy. This is unpleasant, as it
causes more X traffic, but is necessary, because we have to clean
up our Input Contexts before destroying the X windows.
(from matsu-981109-0.patch)
Mon Dec 7 10:18:18 1998 Owen Taylor <otaylor@redhat.com>
Applied gtk-a-higuti-981202-0 :
[ a-higuti@math.sci.hokudai.ac.jp (Akira Higuchi) ]
* gdk/gdk.h gdk/gdk.c
(gdk_mbstowcs): New function. Nearly equals to mbstowcs, but
implemented by a combination of Xlib functions, so
it works even with X_LOCALE.
(gdk_wcstombs): New function.
(g_mbtowc): Removed. No longer needed.
* gdk/gdk.h gdk/gdkfont.c gdk/gdkdraw.c:
Added _wc() variants to gdk_text_width(),
gdk_char_width(), gdk_draw_text(),
* gdk/gdki18n.h
(mblen, mbtowc, wctomb, mbstowcs, wcstombs,
wcslen, wcscpy, wcsncpy):
Removed. No longer needed.
(iswalnum): Removed.
(gdk_iswalnum): New macro.
(gdk_iswspace): New macro.
* gdk/gdktype.h
(GdkWChar): New typedef.
* gtk/gtkentry.h, gtk/gtkentry.c
There are many changes according to the change of the
internal representation of text, from multibyte string
to wide characters.
* gtk/gtkprivate.h, gtk/gtkmain.c
Removed the variable gtk_use_mb and related codes.
* gtk/gtkspinbutton.c
Some changes according to the change of type of entry->text.
* gtk/gtktext.h, gtk/gtktext.c
Changed the internal representation of text. We use GdkWchar
if a fontset is supplied. If not, we use guchar to save
memory.
Diffstat (limited to 'gdk/gdkprivate.h')
| -rw-r--r-- | gdk/gdkprivate.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h index d7f71cd224..e095853d3f 100644 --- a/gdk/gdkprivate.h +++ b/gdk/gdkprivate.h @@ -186,14 +186,15 @@ struct _GdkClientFilter { #ifdef USE_XIM +typedef struct _GdkICPrivate GdkICPrivate; + struct _GdkICPrivate { XIC xic; - GdkIMStyle style; + GdkICAttr *attr; + GdkICAttributesType mask; }; -typedef struct _GdkICPrivate GdkICPrivate; - #endif /* USE_XIM */ struct _GdkColorContextPrivate @@ -282,6 +283,16 @@ extern gint gdk_threads_pipe[2]; extern gboolean gdk_select_waiting; #endif +#ifdef USE_XIM +/* XIM support */ +gint gdk_im_open (void); +void gdk_im_close (void); +void gdk_ic_cleanup (void); + +extern GdkICPrivate *gdk_xim_ic; /* currently using IC */ +extern GdkWindow *gdk_xim_window; /* currently using Window */ +#endif USE_XIM + /* Debugging support */ #ifdef G_ENABLE_DEBUG |