cvs: php-gtk /ext/gtk+ php_gdk.c

Index: php-gtk/ext/gtk+/php_gdk.c
diff -u php-gtk/ext/gtk+/php_gdk.c:1.3 php-gtk/ext/gtk+/php_gdk.c:1.4
--- php-gtk/ext/gtk+/php_gdk.c:1.3	Thu Aug  9 02:47:12 2001
+++ php-gtk/ext/gtk+/php_gdk.c	Thu Aug  9 13:43:52 2001
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
-/* $Id: php_gdk.c,v 1.3 2001/08/09 06:47:12 fmk Exp $: */
+/* $Id: php_gdk.c,v 1.4 2001/08/09 17:43:52 fmk Exp $: */
 
 #include "php_gtk.h"
 #if HAVE_PHP_GTK
@@ -395,32 +395,32 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_underscore", GDK_underscore, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_grave", GDK_grave, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_quoteleft", GDK_quoteleft, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_a", GDK_a, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_b", GDK_b, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_c", GDK_c, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_d", GDK_d, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_e", GDK_e, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_f", GDK_f, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_g", GDK_g, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_h", GDK_h, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_i", GDK_i, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_j", GDK_j, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_k", GDK_k, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_l", GDK_l, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_m", GDK_m, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_n", GDK_n, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_o", GDK_o, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_p", GDK_p, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_q", GDK_q, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_r", GDK_r, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_s", GDK_s, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_t", GDK_t, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_u", GDK_u, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_v", GDK_v, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_w", GDK_w, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_x", GDK_x, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_y", GDK_y, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_z", GDK_z, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__a", GDK_a, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__b", GDK_b, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__c", GDK_c, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__d", GDK_d, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__e", GDK_e, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__f", GDK_f, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__g", GDK_g, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__h", GDK_h, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__i", GDK_i, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__j", GDK_j, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__k", GDK_k, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__l", GDK_l, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__m", GDK_m, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__n", GDK_n, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__o", GDK_o, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__p", GDK_p, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__q", GDK_q, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__r", GDK_r, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__s", GDK_s, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__t", GDK_t, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__u", GDK_u, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__v", GDK_v, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__w", GDK_w, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__x", GDK_x, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__y", GDK_y, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__z", GDK_z, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_braceleft", GDK_braceleft, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_bar", GDK_bar, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_braceright", GDK_braceright, CONST_CS | CONST_PERSISTENT);
@@ -474,7 +474,7 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_Icircumflex", GDK_Icircumflex, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Idiaeresis", GDK_Idiaeresis, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_ETH", GDK_ETH, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Eth", GDK_Eth, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Eth", GDK_Eth, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Ntilde", GDK_Ntilde, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Ograve", GDK_Ograve, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Oacute", GDK_Oacute, CONST_CS | CONST_PERSISTENT);
@@ -489,39 +489,39 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_Udiaeresis", GDK_Udiaeresis, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Yacute", GDK_Yacute, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_THORN", GDK_THORN, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Thorn", GDK_Thorn, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Thorn", GDK_Thorn, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_ssharp", GDK_ssharp, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_agrave", GDK_agrave, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_aacute", GDK_aacute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_acircumflex", GDK_acircumflex, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_atilde", GDK_atilde, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_adiaeresis", GDK_adiaeresis, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_aring", GDK_aring, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ae", GDK_ae, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ccedilla", GDK_ccedilla, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_egrave", GDK_egrave, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_eacute", GDK_eacute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ecircumflex", GDK_ecircumflex, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ediaeresis", GDK_ediaeresis, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_igrave", GDK_igrave, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_iacute", GDK_iacute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_icircumflex", GDK_icircumflex, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_idiaeresis", GDK_idiaeresis, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("__GDK_KEY_eth", GDK_eth, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ntilde", GDK_ntilde, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ograve", GDK_ograve, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_oacute", GDK_oacute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ocircumflex", GDK_ocircumflex, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_otilde", GDK_otilde, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_odiaeresis", GDK_odiaeresis, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__agrave", GDK_agrave, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__aacute", GDK_aacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__acircumflex", GDK_acircumflex, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__atilde", GDK_atilde, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__adiaeresis", GDK_adiaeresis, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__aring", GDK_aring, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ae", GDK_ae, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ccedilla", GDK_ccedilla, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__egrave", GDK_egrave, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__eacute", GDK_eacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ecircumflex", GDK_ecircumflex, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ediaeresis", GDK_ediaeresis, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__igrave", GDK_igrave, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__iacute", GDK_iacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__icircumflex", GDK_icircumflex, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__idiaeresis", GDK_idiaeresis, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY___eth", GDK_eth, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ntilde", GDK_ntilde, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ograve", GDK_ograve, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__oacute", GDK_oacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ocircumflex", GDK_ocircumflex, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__otilde", GDK_otilde, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__odiaeresis", GDK_odiaeresis, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_division", GDK_division, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_oslash", GDK_oslash, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ugrave", GDK_ugrave, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_uacute", GDK_uacute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ucircumflex", GDK_ucircumflex, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_udiaeresis", GDK_udiaeresis, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_yacute", GDK_yacute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("__GDK_KEY_thorn", GDK_thorn, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ugrave", GDK_ugrave, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__uacute", GDK_uacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ucircumflex", GDK_ucircumflex, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__udiaeresis", GDK_udiaeresis, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__yacute", GDK_yacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY___thorn", GDK_thorn, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_ydiaeresis", GDK_ydiaeresis, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Aogonek", GDK_Aogonek, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_breve", GDK_breve, CONST_CS | CONST_PERSISTENT);
@@ -534,19 +534,19 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_Zacute", GDK_Zacute, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Zcaron", GDK_Zcaron, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Zabovedot", GDK_Zabovedot, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_aogonek", GDK_aogonek, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__aogonek", GDK_aogonek, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_ogonek", GDK_ogonek, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_lstroke", GDK_lstroke, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_lcaron", GDK_lcaron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_sacute", GDK_sacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__lstroke", GDK_lstroke, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__lcaron", GDK_lcaron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__sacute", GDK_sacute, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_caron", GDK_caron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_scaron", GDK_scaron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_scedilla", GDK_scedilla, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_tcaron", GDK_tcaron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_zacute", GDK_zacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__scaron", GDK_scaron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__scedilla", GDK_scedilla, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__tcaron", GDK_tcaron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__zacute", GDK_zacute, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_doubleacute", GDK_doubleacute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_zcaron", GDK_zcaron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_zabovedot", GDK_zabovedot, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__zcaron", GDK_zcaron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__zabovedot", GDK_zabovedot, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Racute", GDK_Racute, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Abreve", GDK_Abreve, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Lacute", GDK_Lacute, CONST_CS | CONST_PERSISTENT);
@@ -563,45 +563,45 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_Uring", GDK_Uring, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Udoubleacute", GDK_Udoubleacute, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Tcedilla", GDK_Tcedilla, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_racute", GDK_racute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_abreve", GDK_abreve, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_lacute", GDK_lacute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_cacute", GDK_cacute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ccaron", GDK_ccaron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_eogonek", GDK_eogonek, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ecaron", GDK_ecaron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_dcaron", GDK_dcaron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_dstroke", GDK_dstroke, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_nacute", GDK_nacute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ncaron", GDK_ncaron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_odoubleacute", GDK_odoubleacute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_udoubleacute", GDK_udoubleacute, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_rcaron", GDK_rcaron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_uring", GDK_uring, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_tcedilla", GDK_tcedilla, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__racute", GDK_racute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__abreve", GDK_abreve, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__lacute", GDK_lacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__cacute", GDK_cacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ccaron", GDK_ccaron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__eogonek", GDK_eogonek, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ecaron", GDK_ecaron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__dcaron", GDK_dcaron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__dstroke", GDK_dstroke, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__nacute", GDK_nacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ncaron", GDK_ncaron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__odoubleacute", GDK_odoubleacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__udoubleacute", GDK_udoubleacute, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__rcaron", GDK_rcaron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__uring", GDK_uring, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__tcedilla", GDK_tcedilla, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_abovedot", GDK_abovedot, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Hstroke", GDK_Hstroke, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Hcircumflex", GDK_Hcircumflex, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Iabovedot", GDK_Iabovedot, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Gbreve", GDK_Gbreve, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Jcircumflex", GDK_Jcircumflex, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_hstroke", GDK_hstroke, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_hcircumflex", GDK_hcircumflex, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__hstroke", GDK_hstroke, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__hcircumflex", GDK_hcircumflex, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_idotless", GDK_idotless, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_gbreve", GDK_gbreve, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_jcircumflex", GDK_jcircumflex, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__gbreve", GDK_gbreve, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__jcircumflex", GDK_jcircumflex, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Cabovedot", GDK_Cabovedot, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Ccircumflex", GDK_Ccircumflex, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Gabovedot", GDK_Gabovedot, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Gcircumflex", GDK_Gcircumflex, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Ubreve", GDK_Ubreve, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Scircumflex", GDK_Scircumflex, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_cabovedot", GDK_cabovedot, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ccircumflex", GDK_ccircumflex, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_gabovedot", GDK_gabovedot, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_gcircumflex", GDK_gcircumflex, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ubreve", GDK_ubreve, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_scircumflex", GDK_scircumflex, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__cabovedot", GDK_cabovedot, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ccircumflex", GDK_ccircumflex, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__gabovedot", GDK_gabovedot, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__gcircumflex", GDK_gcircumflex, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ubreve", GDK_ubreve, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__scircumflex", GDK_scircumflex, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kra", GDK_kra, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kappa", GDK_kappa, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Rcedilla", GDK_Rcedilla, CONST_CS | CONST_PERSISTENT);
@@ -610,14 +610,14 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_Emacron", GDK_Emacron, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Gcedilla", GDK_Gcedilla, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Tslash", GDK_Tslash, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_rcedilla", GDK_rcedilla, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_itilde", GDK_itilde, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_lcedilla", GDK_lcedilla, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_emacron", GDK_emacron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_gcedilla", GDK_gcedilla, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_tslash", GDK_tslash, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__rcedilla", GDK_rcedilla, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__itilde", GDK_itilde, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__lcedilla", GDK_lcedilla, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__emacron", GDK_emacron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__gcedilla", GDK_gcedilla, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__tslash", GDK_tslash, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_ENG", GDK_ENG, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_eng", GDK_eng, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__eng", GDK_eng, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Amacron", GDK_Amacron, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Iogonek", GDK_Iogonek, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Eabovedot", GDK_Eabovedot, CONST_CS | CONST_PERSISTENT);
@@ -628,16 +628,16 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_Uogonek", GDK_Uogonek, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Utilde", GDK_Utilde, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Umacron", GDK_Umacron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_amacron", GDK_amacron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_iogonek", GDK_iogonek, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_eabovedot", GDK_eabovedot, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_imacron", GDK_imacron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_ncedilla", GDK_ncedilla, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_omacron", GDK_omacron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_kcedilla", GDK_kcedilla, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_uogonek", GDK_uogonek, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_utilde", GDK_utilde, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_umacron", GDK_umacron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__amacron", GDK_amacron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__iogonek", GDK_iogonek, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__eabovedot", GDK_eabovedot, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__imacron", GDK_imacron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__ncedilla", GDK_ncedilla, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__omacron", GDK_omacron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__kcedilla", GDK_kcedilla, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__uogonek", GDK_uogonek, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__utilde", GDK_utilde, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__umacron", GDK_umacron, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_overline", GDK_overline, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_fullstop", GDK_kana_fullstop, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_openingbracket", GDK_kana_openingbracket, CONST_CS | CONST_PERSISTENT);
@@ -657,11 +657,11 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_tsu", GDK_kana_tsu, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_tu", GDK_kana_tu, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_prolongedsound", GDK_prolongedsound, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_kana_A", GDK_kana_A, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_kana_I", GDK_kana_I, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_kana_U", GDK_kana_U, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_kana_E", GDK_kana_E, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_kana_O", GDK_kana_O, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__kana_A", GDK_kana_A, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__kana_I", GDK_kana_I, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__kana_U", GDK_kana_U, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__kana_E", GDK_kana_E, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__kana_O", GDK_kana_O, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_KA", GDK_kana_KA, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_KI", GDK_kana_KI, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_KU", GDK_kana_KU, CONST_CS | CONST_PERSISTENT);
@@ -675,8 +675,8 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_TA", GDK_kana_TA, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_CHI", GDK_kana_CHI, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_TI", GDK_kana_TI, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_kana_TSU", GDK_kana_TSU, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_kana_TU", GDK_kana_TU, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__kana_TSU", GDK_kana_TSU, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__kana_TU", GDK_kana_TU, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_TE", GDK_kana_TE, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_TO", GDK_kana_TO, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_NA", GDK_kana_NA, CONST_CS | CONST_PERSISTENT);
@@ -695,9 +695,9 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_MU", GDK_kana_MU, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_ME", GDK_kana_ME, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_MO", GDK_kana_MO, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_kana_YA", GDK_kana_YA, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_kana_YU", GDK_kana_YU, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_kana_YO", GDK_kana_YO, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__kana_YA", GDK_kana_YA, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__kana_YU", GDK_kana_YU, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__kana_YO", GDK_kana_YO, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_RA", GDK_kana_RA, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_RI", GDK_kana_RI, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_kana_RU", GDK_kana_RU, CONST_CS | CONST_PERSISTENT);
@@ -780,27 +780,27 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_Cyrillic_dzhe", GDK_Cyrillic_dzhe, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Serbian_dze", GDK_Serbian_dze, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_numerosign", GDK_numerosign, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Serbian_DJE", GDK_Serbian_DJE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Macedonia_GJE", GDK_Macedonia_GJE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_IO", GDK_Cyrillic_IO, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Ukrainian_IE", GDK_Ukrainian_IE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Ukranian_JE", GDK_Ukranian_JE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Macedonia_DSE", GDK_Macedonia_DSE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Ukrainian_I", GDK_Ukrainian_I, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Ukranian_I", GDK_Ukranian_I, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Ukrainian_YI", GDK_Ukrainian_YI, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Ukranian_YI", GDK_Ukranian_YI, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_JE", GDK_Cyrillic_JE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Serbian_JE", GDK_Serbian_JE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_LJE", GDK_Cyrillic_LJE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Serbian_LJE", GDK_Serbian_LJE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_NJE", GDK_Cyrillic_NJE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Serbian_NJE", GDK_Serbian_NJE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Serbian_TSHE", GDK_Serbian_TSHE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Macedonia_KJE", GDK_Macedonia_KJE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Byelorussian_SHORTU", GDK_Byelorussian_SHORTU, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_DZHE", GDK_Cyrillic_DZHE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Serbian_DZE", GDK_Serbian_DZE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Serbian_DJE", GDK_Serbian_DJE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Macedonia_GJE", GDK_Macedonia_GJE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_IO", GDK_Cyrillic_IO, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Ukrainian_IE", GDK_Ukrainian_IE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Ukranian_JE", GDK_Ukranian_JE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Macedonia_DSE", GDK_Macedonia_DSE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Ukrainian_I", GDK_Ukrainian_I, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Ukranian_I", GDK_Ukranian_I, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Ukrainian_YI", GDK_Ukrainian_YI, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Ukranian_YI", GDK_Ukranian_YI, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_JE", GDK_Cyrillic_JE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Serbian_JE", GDK_Serbian_JE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_LJE", GDK_Cyrillic_LJE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Serbian_LJE", GDK_Serbian_LJE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_NJE", GDK_Cyrillic_NJE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Serbian_NJE", GDK_Serbian_NJE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Serbian_TSHE", GDK_Serbian_TSHE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Macedonia_KJE", GDK_Macedonia_KJE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Byelorussian_SHORTU", GDK_Byelorussian_SHORTU, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_DZHE", GDK_Cyrillic_DZHE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Serbian_DZE", GDK_Serbian_DZE, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Cyrillic_yu", GDK_Cyrillic_yu, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Cyrillic_a", GDK_Cyrillic_a, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Cyrillic_be", GDK_Cyrillic_be, CONST_CS | CONST_PERSISTENT);
@@ -833,38 +833,38 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_Cyrillic_shcha", GDK_Cyrillic_shcha, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Cyrillic_che", GDK_Cyrillic_che, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Cyrillic_hardsign", GDK_Cyrillic_hardsign, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_YU", GDK_Cyrillic_YU, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_A", GDK_Cyrillic_A, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_BE", GDK_Cyrillic_BE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_TSE", GDK_Cyrillic_TSE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_DE", GDK_Cyrillic_DE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_IE", GDK_Cyrillic_IE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_EF", GDK_Cyrillic_EF, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_GHE", GDK_Cyrillic_GHE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_HA", GDK_Cyrillic_HA, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_I", GDK_Cyrillic_I, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_SHORTI", GDK_Cyrillic_SHORTI, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_KA", GDK_Cyrillic_KA, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_EL", GDK_Cyrillic_EL, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_EM", GDK_Cyrillic_EM, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_EN", GDK_Cyrillic_EN, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_O", GDK_Cyrillic_O, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_PE", GDK_Cyrillic_PE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_YA", GDK_Cyrillic_YA, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_ER", GDK_Cyrillic_ER, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_ES", GDK_Cyrillic_ES, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_TE", GDK_Cyrillic_TE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_U", GDK_Cyrillic_U, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_ZHE", GDK_Cyrillic_ZHE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_VE", GDK_Cyrillic_VE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_SOFTSIGN", GDK_Cyrillic_SOFTSIGN, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_YERU", GDK_Cyrillic_YERU, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_ZE", GDK_Cyrillic_ZE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_SHA", GDK_Cyrillic_SHA, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_E", GDK_Cyrillic_E, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_SHCHA", GDK_Cyrillic_SHCHA, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_CHE", GDK_Cyrillic_CHE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Cyrillic_HARDSIGN", GDK_Cyrillic_HARDSIGN, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_YU", GDK_Cyrillic_YU, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_A", GDK_Cyrillic_A, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_BE", GDK_Cyrillic_BE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_TSE", GDK_Cyrillic_TSE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_DE", GDK_Cyrillic_DE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_IE", GDK_Cyrillic_IE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_EF", GDK_Cyrillic_EF, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_GHE", GDK_Cyrillic_GHE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_HA", GDK_Cyrillic_HA, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_I", GDK_Cyrillic_I, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_SHORTI", GDK_Cyrillic_SHORTI, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_KA", GDK_Cyrillic_KA, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_EL", GDK_Cyrillic_EL, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_EM", GDK_Cyrillic_EM, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_EN", GDK_Cyrillic_EN, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_O", GDK_Cyrillic_O, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_PE", GDK_Cyrillic_PE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_YA", GDK_Cyrillic_YA, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_ER", GDK_Cyrillic_ER, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_ES", GDK_Cyrillic_ES, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_TE", GDK_Cyrillic_TE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_U", GDK_Cyrillic_U, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_ZHE", GDK_Cyrillic_ZHE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_VE", GDK_Cyrillic_VE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_SOFTSIGN", GDK_Cyrillic_SOFTSIGN, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_YERU", GDK_Cyrillic_YERU, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_ZE", GDK_Cyrillic_ZE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_SHA", GDK_Cyrillic_SHA, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_E", GDK_Cyrillic_E, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_SHCHA", GDK_Cyrillic_SHCHA, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_CHE", GDK_Cyrillic_CHE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Cyrillic_HARDSIGN", GDK_Cyrillic_HARDSIGN, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_ALPHAaccent", GDK_Greek_ALPHAaccent, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_EPSILONaccent", GDK_Greek_EPSILONaccent, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_ETAaccent", GDK_Greek_ETAaccent, CONST_CS | CONST_PERSISTENT);
@@ -876,17 +876,17 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_OMEGAaccent", GDK_Greek_OMEGAaccent, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_accentdieresis", GDK_Greek_accentdieresis, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_horizbar", GDK_Greek_horizbar, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_alphaaccent", GDK_Greek_alphaaccent, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_epsilonaccent", GDK_Greek_epsilonaccent, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_etaaccent", GDK_Greek_etaaccent, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_iotaaccent", GDK_Greek_iotaaccent, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_alphaaccent", GDK_Greek_alphaaccent, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_epsilonaccent", GDK_Greek_epsilonaccent, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_etaaccent", GDK_Greek_etaaccent, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_iotaaccent", GDK_Greek_iotaaccent, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_iotadieresis", GDK_Greek_iotadieresis, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_iotaaccentdieresis", GDK_Greek_iotaaccentdieresis, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_omicronaccent", GDK_Greek_omicronaccent, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_upsilonaccent", GDK_Greek_upsilonaccent, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_upsilondieresis", GDK_Greek_upsilondieresis, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_omicronaccent", GDK_Greek_omicronaccent, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_upsilonaccent", GDK_Greek_upsilonaccent, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_upsilondieresis", GDK_Greek_upsilondieresis, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_upsilonaccentdieresis", GDK_Greek_upsilonaccentdieresis, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_omegaaccent", GDK_Greek_omegaaccent, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_omegaaccent", GDK_Greek_omegaaccent, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_ALPHA", GDK_Greek_ALPHA, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_BETA", GDK_Greek_BETA, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_GAMMA", GDK_Greek_GAMMA, CONST_CS | CONST_PERSISTENT);
@@ -912,32 +912,32 @@
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_CHI", GDK_Greek_CHI, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_PSI", GDK_Greek_PSI, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_OMEGA", GDK_Greek_OMEGA, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_alpha", GDK_Greek_alpha, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_beta", GDK_Greek_beta, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_gamma", GDK_Greek_gamma, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_delta", GDK_Greek_delta, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_epsilon", GDK_Greek_epsilon, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_zeta", GDK_Greek_zeta, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_eta", GDK_Greek_eta, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_theta", GDK_Greek_theta, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_iota", GDK_Greek_iota, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_kappa", GDK_Greek_kappa, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_lamda", GDK_Greek_lamda, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_lambda", GDK_Greek_lambda, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_mu", GDK_Greek_mu, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_nu", GDK_Greek_nu, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_xi", GDK_Greek_xi, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_omicron", GDK_Greek_omicron, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_pi", GDK_Greek_pi, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_rho", GDK_Greek_rho, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_sigma", GDK_Greek_sigma, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_alpha", GDK_Greek_alpha, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_beta", GDK_Greek_beta, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_gamma", GDK_Greek_gamma, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_delta", GDK_Greek_delta, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_epsilon", GDK_Greek_epsilon, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_zeta", GDK_Greek_zeta, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_eta", GDK_Greek_eta, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_theta", GDK_Greek_theta, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_iota", GDK_Greek_iota, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_kappa", GDK_Greek_kappa, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_lamda", GDK_Greek_lamda, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_lambda", GDK_Greek_lambda, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_mu", GDK_Greek_mu, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_nu", GDK_Greek_nu, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_xi", GDK_Greek_xi, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_omicron", GDK_Greek_omicron, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_pi", GDK_Greek_pi, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_rho", GDK_Greek_rho, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_sigma", GDK_Greek_sigma, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_finalsmallsigma", GDK_Greek_finalsmallsigma, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_tau", GDK_Greek_tau, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_upsilon", GDK_Greek_upsilon, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_phi", GDK_Greek_phi, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_chi", GDK_Greek_chi, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_psi", GDK_Greek_psi, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("_GDK_KEY_Greek_omega", GDK_Greek_omega, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_tau", GDK_Greek_tau, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_upsilon", GDK_Greek_upsilon, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_phi", GDK_Greek_phi, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_chi", GDK_Greek_chi, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_psi", GDK_Greek_psi, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GDK_KEY__Greek_omega", GDK_Greek_omega, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_Greek_switch", GDK_Greek_switch, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_leftradical", GDK_leftradical, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GDK_KEY_topleftradical", GDK_topleftradical, CONST_CS | CONST_PERSISTENT);