diff --git a/src/include/pw3270.h b/src/include/pw3270.h
index 9624520..a2b079c 100644
--- a/src/include/pw3270.h
+++ b/src/include/pw3270.h
@@ -56,7 +56,7 @@
  LIB3270_EXPORT const gchar	* pw3270_get_url(GtkWidget *widget);
  LIB3270_EXPORT void		  pw3270_connect(GtkWidget *widget);
 
- LIB3270_EXPORT gboolean 	  pw3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix);
+ LIB3270_EXPORT gboolean 	  pw3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID ix);
  LIB3270_EXPORT gboolean	  pw3270_set_toggle_by_name(GtkWidget *widget, const gchar *name, gboolean flag);
  LIB3270_EXPORT	H3270		* pw3270_get_session(GtkWidget *widget);
  LIB3270_EXPORT	GtkWidget	* pw3270_get_terminal_widget(GtkWidget *widget);
diff --git a/src/pw3270/actions.c b/src/pw3270/actions.c
index 923107e..206a941 100644
--- a/src/pw3270/actions.c
+++ b/src/pw3270/actions.c
@@ -394,7 +394,7 @@ static void connect_standard_action(GtkAction *action, GtkWidget *widget, const 
 
 static void lib3270_toggle_action(GtkToggleAction *action,GtkWidget *widget)
 {
-	LIB3270_TOGGLE toggle = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
+	LIB3270_TOGGLE_ID toggle = (LIB3270_TOGGLE_ID) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
 
 	trace("Action %s toggled on widget %p (id=%d)\n",gtk_action_get_name(GTK_ACTION(action)),widget,(int) toggle);
 
@@ -471,7 +471,7 @@ static void action_pakey(GtkAction *action, GtkWidget *widget)
 
 static void action_set_toggle(GtkAction *action, GtkWidget *widget)
 {
-	LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
+	LIB3270_TOGGLE_ID id = (LIB3270_TOGGLE_ID) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
 
 	trace("Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
 
@@ -481,7 +481,7 @@ static void action_set_toggle(GtkAction *action, GtkWidget *widget)
 
 static void action_reset_toggle(GtkAction *action, GtkWidget *widget)
 {
-	LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
+	LIB3270_TOGGLE_ID id = (LIB3270_TOGGLE_ID) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
 
 	trace("Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
 
diff --git a/src/pw3270/tools.c b/src/pw3270/tools.c
index 3cd708a..500c4f3 100644
--- a/src/pw3270/tools.c
+++ b/src/pw3270/tools.c
@@ -135,12 +135,12 @@ LIB3270_EXPORT void pw3270_set_boolean(GtkWidget *widget, const gchar *group, co
 
 LIB3270_EXPORT gboolean pw3270_set_toggle_by_name(GtkWidget *widget, const gchar *name, gboolean flag)
 {
-	H3270 			* hSession	= pw3270_get_session(widget);
-	LIB3270_TOGGLE	  id		= lib3270_get_toggle_id(name);
+	H3270 				* hSession	= pw3270_get_session(widget);
+	LIB3270_TOGGLE_ID	  id		= lib3270_get_toggle_id(name);
 
 	trace("%s(%s) id=%u",__FUNCTION__,name,id);
 
-	if(!hSession || id == (LIB3270_TOGGLE) -1)
+	if(!hSession || id == (LIB3270_TOGGLE_ID) -1)
 		return FALSE;
 
 	lib3270_set_toggle(hSession,id,(int) flag);
diff --git a/src/pw3270/window.c b/src/pw3270/window.c
index 97ecdf6..bb44154 100644
--- a/src/pw3270/window.c
+++ b/src/pw3270/window.c
@@ -330,7 +330,7 @@ static GtkWidget * trace_window = NULL;
  	return v3270_get_url(GTK_PW3270(widget)->terminal);
  }
 
- gboolean pw3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix)
+ gboolean pw3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID ix)
  {
  	g_return_val_if_fail(GTK_IS_PW3270(widget),FALSE);
  	return v3270_get_toggle(GTK_PW3270(widget)->terminal,ix);
@@ -678,7 +678,7 @@ static GtkWidget * trace_window = NULL;
 	pw3270_print(widget, NULL, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_CONTENT_ALL);
  }
 
- static void toggle_changed(GtkWidget *widget, LIB3270_TOGGLE id, gboolean toggled, const gchar *name, GtkWindow *toplevel)
+ static void toggle_changed(GtkWidget *widget, LIB3270_TOGGLE_ID id, gboolean toggled, const gchar *name, GtkWindow *toplevel)
  {
 	GtkAction **list = (GtkAction **) g_object_get_data(G_OBJECT(widget),"toggle_actions");
  	gchar *nm = g_ascii_strdown(name,-1);
--
libgit2 0.21.2