--- a/dwt/graphics/TextLayout.d	Wed Jan 09 07:07:50 2008 +0100
+++ b/dwt/graphics/TextLayout.d	Thu Jan 10 02:18:07 2008 +0100
@@ -11,9 +11,6 @@
 module dwt.graphics.TextLayout;
 
 import dwt.internal.cairo.Cairo;
-import dwt.internal.gtk.c.cairotypes;
-import dwt.internal.gtk.c.pangotypes;
-import dwt.internal.gtk.c.gdktypes;
 import dwt.internal.gtk.OS;
 import dwt.internal.Converter;
 import dwt.SWT;
@@ -95,11 +92,11 @@
 	context = OS.gdk_pango_context_get();
 	if (context is null) SWT.error(SWT.ERROR_NO_HANDLES);
 	OS.pango_context_set_language(context, OS.gtk_get_default_language());
-	OS.pango_context_set_base_dir(context, cast(PangoDirection) OS.PANGO_DIRECTION_LTR);
+	OS.pango_context_set_base_dir(context, OS.PANGO_DIRECTION_LTR);
 	OS.gdk_pango_context_set_colormap(context, OS.gdk_colormap_get_system());
 	layout = OS.pango_layout_new(context);
 	if (layout is null) SWT.error(SWT.ERROR_NO_HANDLES);
-	OS.pango_layout_set_wrap(layout, cast(PangoWrapMode)OS.PANGO_WRAP_WORD_CHAR);
+	OS.pango_layout_set_wrap(layout, OS.PANGO_WRAP_WORD_CHAR);
 	OS.pango_layout_set_tabs(layout, device.emptyTab);
 	if (OS.GTK_VERSION >= OS.buildVERSION(2, 4, 0)) {
 		OS.pango_layout_set_auto_dir(layout, false);
@@ -201,7 +198,7 @@
 			OS.pango_attr_list_insert(attrList, attr);
 		}
 		if (style.underline) {
-			auto attr = OS.pango_attr_underline_new(cast(PangoUnderline)OS.PANGO_UNDERLINE_SINGLE);
+			auto attr = OS.pango_attr_underline_new(OS.PANGO_UNDERLINE_SINGLE);
 			attr.start_index = byteStart;
 			attr.end_index = byteEnd;
 			OS.pango_attr_list_insert(attrList, attr);
@@ -381,7 +378,7 @@
 			} else {
 				if (attrs is null) OS.pango_layout_get_log_attrs(layout, &attrs, &nAttrs);
 				*logAttr = attrs[lineEnd];
-				if (!logAttr.is_line_break) {
+				if (!( logAttr.bitfield0 & 0x01 /* PangoLogAttr.is_line_break is Bit0 */)) {
 					if (selectionStart <= lineEnd && lineEnd <= selectionEnd) extent = true;
 				} else {
 					if (selectionStart <= lineEnd && lineEnd < selectionEnd && (flags & SWT.FULL_SELECTION) != 0) {
@@ -968,19 +965,19 @@
 	offset = validateOffset(offset, step);
 	while (0 < offset && offset < length) {
 		*logAttr = attrs[ offset ];
-		if (((movement & SWT.MOVEMENT_CLUSTER) != 0) && logAttr.is_cursor_position) break;
+		if (((movement & SWT.MOVEMENT_CLUSTER) != 0) && ( logAttr.bitfield0 & (1<<4/*is_cursor_position*/))) break;
 		if ((movement & SWT.MOVEMENT_WORD) != 0) {
 			if (forward) {
-				if (logAttr.is_word_end) break;
+				if (logAttr.bitfield0 & (1<<6/*is_word_end*/)) break;
 			} else {
-				if (logAttr.is_word_start) break;
+				if (logAttr.bitfield0 & (1<<5/*is_word_start*/)) break;
 			}
 		}
 		if ((movement & SWT.MOVEMENT_WORD_START) != 0) {
-			if (logAttr.is_word_start) break;
+			if (logAttr.bitfield0 & (1<<5/*is_word_start*/)) break;
 		}
 		if ((movement & SWT.MOVEMENT_WORD_END) != 0) {
-			if (logAttr.is_word_end) break;
+			if (logAttr.bitfield0 & (1<<6/*is_word_end*/)) break;
 		}
 		offset = validateOffset(offset, step);
 	}
@@ -1348,7 +1345,7 @@
 		case SWT.CENTER: al = OS.PANGO_ALIGN_CENTER; break;
 		case SWT.RIGHT: al = OS.PANGO_ALIGN_RIGHT; break;
 	}
-	OS.pango_layout_set_alignment(layout, cast(PangoAlignment) al);
+	OS.pango_layout_set_alignment(layout, al);
 }
 
 /**
@@ -1482,7 +1479,7 @@
 	if ((orientation & SWT.LEFT_TO_RIGHT) != 0) orientation = SWT.LEFT_TO_RIGHT;
 	int baseDir = orientation == SWT.RIGHT_TO_LEFT ? OS.PANGO_DIRECTION_RTL : OS.PANGO_DIRECTION_LTR;
 	if (OS.pango_context_get_base_dir(context) == baseDir) return;
-	OS.pango_context_set_base_dir(context,cast(PangoDirection) baseDir);
+	OS.pango_context_set_base_dir(context, baseDir);
 	OS.pango_layout_context_changed(layout);
 }
 
@@ -1668,7 +1665,7 @@
 		auto tabArray = OS.pango_tab_array_new(tabs.length, true);
 		if (tabArray !is null) {
 			for (int i = 0; i < tabs.length; i++) {
-				OS.pango_tab_array_set_tab(tabArray, i,cast(PangoTabAlign)OS.PANGO_TAB_LEFT, tabs[i]);
+				OS.pango_tab_array_set_tab(tabArray, i, OS.PANGO_TAB_LEFT, tabs[i]);
 			}
 			OS.pango_layout_set_tabs(layout, tabArray);
 			OS.pango_tab_array_free(tabArray);