diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-07-21 13:20:06 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-07-21 13:20:06 +0000 |
| commit | 2e96cb67cedf3ab723f670b10731d06d1f0384b4 (patch) | |
| tree | 7ee6bff6e6682cc5c99ad45eefcb136ad189371a | |
| parent | 46c99b962f35c3268040cd21e61b804e3b353512 (diff) | |
| download | gdk-pixbuf-2e96cb67cedf3ab723f670b10731d06d1f0384b4.tar.gz | |
gtk/gtkxembed.h New function, used in error messages and debugging output.
2005-07-21 Tor Lillqvist <tml@novell.com>
* gtk/gtkxembed.h
* gtk/gtkxembed.c (_gtk_xembed_message_name): New function, used
in error messages and debugging output.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkxembed.c | 30 | ||||
| -rw-r--r-- | gtk/gtkxembed.h | 9 |
5 files changed, 52 insertions, 5 deletions
@@ -1,5 +1,11 @@ 2005-07-21 Tor Lillqvist <tml@novell.com> + * gtk/gtkxembed.h + * gtk/gtkxembed.c (_gtk_xembed_message_name): New function, used + in error messages and debugging output. + +2005-07-21 Tor Lillqvist <tml@novell.com> + * gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use wide-char API when available. (#311079, Peter Zelezny) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 633c81ab2..86e695a0e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,11 @@ 2005-07-21 Tor Lillqvist <tml@novell.com> + * gtk/gtkxembed.h + * gtk/gtkxembed.c (_gtk_xembed_message_name): New function, used + in error messages and debugging output. + +2005-07-21 Tor Lillqvist <tml@novell.com> + * gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use wide-char API when available. (#311079, Peter Zelezny) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 633c81ab2..86e695a0e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,11 @@ 2005-07-21 Tor Lillqvist <tml@novell.com> + * gtk/gtkxembed.h + * gtk/gtkxembed.c (_gtk_xembed_message_name): New function, used + in error messages and debugging output. + +2005-07-21 Tor Lillqvist <tml@novell.com> + * gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use wide-char API when available. (#311079, Peter Zelezny) diff --git a/gtk/gtkxembed.c b/gtk/gtkxembed.c index 4d084f140..164b4c2bb 100644 --- a/gtk/gtkxembed.c +++ b/gtk/gtkxembed.c @@ -149,7 +149,7 @@ _gtk_xembed_send_message (GdkWindow *recipient, display = gdk_drawable_get_display (recipient); GTK_NOTE (PLUGSOCKET, - g_message ("Sending XEMBED message of type %d", message)); + g_message ("Sending %s", _gtk_xembed_message_name (message))); xevent.xclient.window = GDK_WINDOW_XWINDOW (recipient); xevent.xclient.type = ClientMessage; @@ -213,3 +213,31 @@ _gtk_xembed_send_focus_message (GdkWindow *recipient, _gtk_xembed_send_message (recipient, message, detail, flags, 0); } +const char * +_gtk_xembed_message_name (XEmbedMessageType message) +{ + static char unk[100]; + + switch (message) + { +#define CASE(x) case XEMBED_##x: return "XEMBED_"#x + CASE (EMBEDDED_NOTIFY); + CASE (WINDOW_ACTIVATE); + CASE (WINDOW_DEACTIVATE); + CASE (REQUEST_FOCUS); + CASE (FOCUS_IN); + CASE (FOCUS_OUT); + CASE (FOCUS_NEXT); + CASE (FOCUS_PREV); + CASE (GRAB_KEY); + CASE (UNGRAB_KEY); + CASE (MODALITY_ON); + CASE (MODALITY_OFF); + CASE (GTK_GRAB_KEY); + CASE (GTK_UNGRAB_KEY); +#undef CASE + default: + sprintf (unk, "UNKNOWN(%d)", message); + return unk; + } +} diff --git a/gtk/gtkxembed.h b/gtk/gtkxembed.h index d18e81a12..5de99e9a9 100644 --- a/gtk/gtkxembed.h +++ b/gtk/gtkxembed.h @@ -38,10 +38,11 @@ void _gtk_xembed_send_focus_message (GdkWindow *recipient, XEmbedMessageType message, glong detail); -void _gtk_xembed_push_message (XEvent *xevent); -void _gtk_xembed_pop_message (void); -void _gtk_xembed_set_focus_wrapped (void); -gboolean _gtk_xembed_get_focus_wrapped (void); +void _gtk_xembed_push_message (XEvent *xevent); +void _gtk_xembed_pop_message (void); +void _gtk_xembed_set_focus_wrapped (void); +gboolean _gtk_xembed_get_focus_wrapped (void); +const char *_gtk_xembed_message_name (XEmbedMessageType message); G_END_DECLS |