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

gdk_key is a typedef, not a struct tag.

Browse Source 
2005-03-17  Tor Lillqvist  <tml@novell.com>

	* gdk/gdkkeynames.c: gdk_key is a typedef, not a struct tag.
This commit is contained in:
Tor Lillqvist 2005-03-17 12:05:16 +00:00 committed by Tor Lillqvist
parent 6ffbc07492
commit 691bea134f
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2005-03-17 Tor Lillqvist <tml@novell.com>
* gdk/gdkkeynames.c: gdk_key is a typedef, not a struct tag.
2005-03-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_get_ellipsize):

4
ChangeLog.pre-2-10
View File

@ -1,3 +1,7 @@
2005-03-17 Tor Lillqvist <tml@novell.com>
* gdk/gdkkeynames.c: gdk_key is a typedef, not a struct tag.
2005-03-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_get_ellipsize):

4
ChangeLog.pre-2-8
View File

@ -1,3 +1,7 @@
2005-03-17 Tor Lillqvist <tml@novell.com>
* gdk/gdkkeynames.c: gdk_key is a typedef, not a struct tag.
2005-03-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_get_ellipsize):

14
gdk/gdkkeynames.c
View File

@ -37,19 +37,19 @@
#include "keyname-table.h"
#define GDK_NUM_KEYS (sizeof (gdk_keys_by_keyval) / sizeof (gdk_keys_by_keyval[0]))
#define GDK_NUM_KEYS G_N_ELEMENTS (gdk_keys_by_keyval)
static int
gdk_keys_keyval_compare (const void *pkey, const void *pbase)
{
return (*(int *) pkey) - ((struct gdk_key *) pbase)->keyval;
return (*(int *) pkey) - ((gdk_key *) pbase)->keyval;
}
gchar*
gdk_keyval_name (guint keyval)
{
static gchar buf[100];
struct gdk_key *found;
gdk_key *found;
/* Check for directly encoded 24-bit UCS characters: */
if ((keyval & 0xff000000) == 0x01000000)
@ -59,7 +59,7 @@ gdk_keyval_name (guint keyval)
}
found = bsearch (&keyval, gdk_keys_by_keyval,
GDK_NUM_KEYS, sizeof (struct gdk_key),
GDK_NUM_KEYS, sizeof (gdk_key),
gdk_keys_keyval_compare);
if (found != NULL)
@ -83,18 +83,18 @@ static int
gdk_keys_name_compare (const void *pkey, const void *pbase)
{
return strcmp ((const char *) pkey,
(const char *) (keynames + ((const struct gdk_key *) pbase)->offset));
(const char *) (keynames + ((const gdk_key *) pbase)->offset));
}
guint
gdk_keyval_from_name (const gchar *keyval_name)
{
struct gdk_key *found;
gdk_key *found;
g_return_val_if_fail (keyval_name != NULL, 0);
found = bsearch (keyval_name, gdk_keys_by_name,
GDK_NUM_KEYS, sizeof (struct gdk_key),
GDK_NUM_KEYS, sizeof (gdk_key),
gdk_keys_name_compare);
if (found != NULL)
return found->keyval;