diff --git a/src/gtk/main.c b/src/gtk/main.c
index 578cb36..eb75d0e 100644
--- a/src/gtk/main.c
+++ b/src/gtk/main.c
@@ -31,6 +31,7 @@
 
 #include "globals.h"
 #include "v3270/v3270.h"
+#include "v3270/accessible.h"
 #include <lib3270/popup.h>
 #include <stdlib.h>
 
diff --git a/src/gtk/pw3270-GTK.cbp b/src/gtk/pw3270-GTK.cbp
index 4c223f7..b7ccb36 100644
--- a/src/gtk/pw3270-GTK.cbp
+++ b/src/gtk/pw3270-GTK.cbp
@@ -7,8 +7,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin\Debug\pw3270-GTK" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj\Debug\" />
+				<Option output=".bin/Debug/pw3270-GTK" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -17,8 +17,8 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output=".bin\Release\pw3270-GTK" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj\Release\" />
+				<Option output=".bin/Release/pw3270-GTK" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj/Release/" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -32,7 +32,7 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="`pkg-config lib3270 gtk+-2.0 lib3270 --cflags`" />
-			<Add directory="..\include" />
+			<Add directory="../include" />
 		</Compiler>
 		<Linker>
 			<Add option="`pkg-config lib3270 gtk+-2.0 lib3270 --libs`" />
@@ -44,12 +44,12 @@
 		<Unit filename="colors.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="common\common.h" />
-		<Unit filename="common\common.h.in" />
-		<Unit filename="common\config.c">
+		<Unit filename="common/common.h" />
+		<Unit filename="common/common.h.in" />
+		<Unit filename="common/config.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="common\sources.mak" />
+		<Unit filename="common/sources.mak" />
 		<Unit filename="dialog.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -66,74 +66,78 @@
 		<Unit filename="print.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="uiparser\accelerator.c">
+		<Unit filename="uiparser/accelerator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="uiparser\action.c">
+		<Unit filename="uiparser/action.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="uiparser\menu.c">
+		<Unit filename="uiparser/menu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="uiparser\menubar.c">
+		<Unit filename="uiparser/menubar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="uiparser\menuitem.c">
+		<Unit filename="uiparser/menuitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="uiparser\parsefile.c">
+		<Unit filename="uiparser/parsefile.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="uiparser\parser.c">
+		<Unit filename="uiparser/parser.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="uiparser\parser.h" />
-		<Unit filename="uiparser\popup.c">
+		<Unit filename="uiparser/parser.h" />
+		<Unit filename="uiparser/popup.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="uiparser\private.h" />
-		<Unit filename="uiparser\script.c">
+		<Unit filename="uiparser/private.h" />
+		<Unit filename="uiparser/script.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="uiparser\separator.c">
+		<Unit filename="uiparser/separator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="uiparser\sources.mak" />
-		<Unit filename="uiparser\toolbar.c">
+		<Unit filename="uiparser/sources.mak" />
+		<Unit filename="uiparser/toolbar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="uiparser\toolitem.c">
+		<Unit filename="uiparser/toolitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="v3270\clipboard.c">
+		<Unit filename="v3270/accessible.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="v3270\draw.c">
+		<Unit filename="v3270/accessible.h" />
+		<Unit filename="v3270/clipboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="v3270\genmarshal" />
-		<Unit filename="v3270\iocallback.c">
+		<Unit filename="v3270/draw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="v3270\keyboard.c">
+		<Unit filename="v3270/genmarshal" />
+		<Unit filename="v3270/iocallback.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="v3270\locked.xbm" />
-		<Unit filename="v3270\marshal.c">
+		<Unit filename="v3270/keyboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="v3270\marshal.h" />
-		<Unit filename="v3270\mouse.c">
+		<Unit filename="v3270/locked.xbm" />
+		<Unit filename="v3270/marshal.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="v3270\oia.c">
+		<Unit filename="v3270/marshal.h" />
+		<Unit filename="v3270/mouse.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="v3270\private.h" />
-		<Unit filename="v3270\sources.mak" />
-		<Unit filename="v3270\unlocked.xbm" />
-		<Unit filename="v3270\v3270.h" />
-		<Unit filename="v3270\widget.c">
+		<Unit filename="v3270/oia.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="v3270/private.h" />
+		<Unit filename="v3270/sources.mak" />
+		<Unit filename="v3270/unlocked.xbm" />
+		<Unit filename="v3270/v3270.h" />
+		<Unit filename="v3270/widget.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="valgrind.suppression" />
diff --git a/src/gtk/v3270/accessible.c b/src/gtk/v3270/accessible.c
index be54de3..f8660f0 100644
--- a/src/gtk/v3270/accessible.c
+++ b/src/gtk/v3270/accessible.c
@@ -40,14 +40,17 @@
 
 /*--[ Prototipes ]-----------------------------------------------------------------------------------*/
 
+static void atk_component_interface_init 		(AtkComponentIface		*iface);
 static void atk_editable_text_interface_init	(AtkEditableTextIface	*iface);
+
 static void v3270_accessible_class_init			(v3270AccessibleClass	*klass);
 static void v3270_accessible_init				(v3270Accessible		*widget);
 
 /*--[ Widget definition ]----------------------------------------------------------------------------*/
 
-G_DEFINE_TYPE_WITH_CODE (v3270Accessible, v3270_accessible, GTK_TYPE_V3270_ACCESSIBLE,
-                         G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init) )
+G_DEFINE_TYPE_WITH_CODE (v3270Accessible, v3270_accessible, GTK_TYPE_ACCESSIBLE,
+							G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)
+							G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init) )
 
 //                         G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
 //                         G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init)
@@ -74,6 +77,20 @@ static void v3270_accessible_class_init(v3270AccessibleClass *klass)
 */
 }
 
+static void
+atk_component_interface_init(AtkComponentIface *iface)
+{
+/*
+  iface->get_extents = gtk_widget_accessible_get_extents;
+  iface->get_size = gtk_widget_accessible_get_size;
+  iface->get_layer = gtk_widget_accessible_get_layer;
+  iface->grab_focus = gtk_widget_accessible_grab_focus;
+  iface->set_extents = gtk_widget_accessible_set_extents;
+  iface->set_position = gtk_widget_accessible_set_position;
+  iface->set_size = gtk_widget_accessible_set_size;
+*/
+}
+
 static void v3270_accessible_init(v3270Accessible *widget)
 {
 	trace("*********************************** %s",__FUNCTION__);
diff --git a/src/gtk/v3270/widget.c b/src/gtk/v3270/widget.c
index 37d3bdc..5514697 100644
--- a/src/gtk/v3270/widget.c
+++ b/src/gtk/v3270/widget.c
@@ -57,10 +57,11 @@
 
  // http://git.gnome.org/browse/gtk+/tree/gtk/gtkdrawingarea.c?h=gtk-3-0
 
-static void			  v3270_realize				(	GtkWidget		* widget);
+static void			  v3270_realize				(	GtkWidget		* widget) ;
 static void			  v3270_size_allocate		(	GtkWidget		* widget,
-													GtkAllocation	* allocation);
-static void			  v3270_send_configure		(	v3270			* terminal);
+													GtkAllocation	* allocation );
+static void			  v3270_send_configure		(	v3270			* terminal );
+static AtkObject	* v3270_get_accessible		(	GtkWidget 		* widget );
 
 // Signals
 static void v3270_activate			(GtkWidget *widget);
@@ -231,6 +232,9 @@ static void v3270_class_init(v3270Class *klass)
 	widget_class->motion_notify_event				= v3270_motion_notify_event;
 	widget_class->popup_menu						= v3270_popup_menu;
 
+	/* Accessibility support */
+	widget_class->get_accessible 					= v3270_get_accessible;
+
 	klass->activate									= v3270_activate;
 	klass->toggle_changed 							= v3270_toggle_changed;
 	klass->message_changed 							= v3270_update_message;
@@ -433,15 +437,6 @@ static void v3270_class_init(v3270Class *klass)
 						pw3270_VOID__VOID_BOOL,
 						G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
-#ifdef DEBUG
-	trace("%s: Acessibility check starts",__FUNCTION__);
-	v3270_accessible_get_type();
-	trace("%s: Acessibility check ends",__FUNCTION__);
-#endif // DEBUG
-
-#if GTK_CHECK_VERSION(3,0,0)
-	gtk_widget_class_set_accessible_type(widget_class, GTK_TYPE_V3270_ACCESSIBLE);
-#endif
 }
 
 void v3270_update_font_metrics(v3270 *terminal, cairo_t *cr, int width, int height)
@@ -1102,4 +1097,18 @@ const GtkWidgetClass * v3270_get_parent_class(void)
 	return GTK_WIDGET_CLASS(v3270_parent_class);
 }
 
+static AtkObject * v3270_get_accessible(GtkWidget * widget)
+{
+	v3270 * terminal = GTK_V3270(widget);
+
+//	trace("%s acc=%p",__FUNCTION__,terminal->accessible);
+
+	if(!terminal->accessible)
+	{
+		terminal->accessible = g_object_new(GTK_TYPE_V3270_ACCESSIBLE,NULL);
+		atk_object_initialize(ATK_OBJECT(terminal->accessible), widget);
+	}
+
+	return ATK_OBJECT(terminal->accessible);
+}
 
--
libgit2 0.21.2