--- a/dwt/internal/c/Xlib.d	Sat Apr 26 10:01:30 2008 +0200
+++ b/dwt/internal/c/Xlib.d	Mon May 05 00:42:55 2008 +0200
@@ -4,6 +4,8 @@
 ******************************************************************************/
 module dwt.internal.c.Xlib;
 
+import dwt.dwthelper.utils;
+
 extern(C):
 align(4):
 
@@ -14,16 +16,16 @@
 const int QueuedAlready = 0;
 const int QueuedAfterReading = 1;
 const int QueuedAfterFlush = 2;
-const char[] XNRequiredCharSet = "requiredCharSet";
-const char[] XNQueryOrientation = "queryOrientation";
-const char[] XNBaseFontName = "baseFontName";
-const char[] XNOMAutomatic = "omAutomatic";
-const char[] XNMissingCharSet = "missingCharSet";
-const char[] XNDefaultString = "defaultString";
-const char[] XNOrientation = "orientation";
-const char[] XNDirectionalDependentDrawing = "directionalDependentDrawing";
-const char[] XNContextualDrawing = "contextualDrawing";
-const char[] XNFontInfo = "fontInfo";
+const String XNRequiredCharSet = "requiredCharSet";
+const String XNQueryOrientation = "queryOrientation";
+const String XNBaseFontName = "baseFontName";
+const String XNOMAutomatic = "omAutomatic";
+const String XNMissingCharSet = "missingCharSet";
+const String XNDefaultString = "defaultString";
+const String XNOrientation = "orientation";
+const String XNDirectionalDependentDrawing = "directionalDependentDrawing";
+const String XNContextualDrawing = "contextualDrawing";
+const String XNFontInfo = "fontInfo";
 const int XIMPreeditArea = 0x0001;
 const int XIMPreeditCallbacks = 0x0002;
 const int XIMPreeditPosition = 0x0004;
@@ -33,48 +35,48 @@
 const int XIMStatusCallbacks = 0x0200;
 const int XIMStatusNothing = 0x0400;
 const int XIMStatusNone = 0x0800;
-const char[] XNVaNestedList = "XNVaNestedList";
-const char[] XNQueryInputStyle = "queryInputStyle";
-const char[] XNClientWindow = "clientWindow";
-const char[] XNInputStyle = "inputStyle";
-const char[] XNFocusWindow = "focusWindow";
-const char[] XNResourceName = "resourceName";
-const char[] XNResourceClass = "resourceClass";
-const char[] XNGeometryCallback = "geometryCallback";
-const char[] XNDestroyCallback = "destroyCallback";
-const char[] XNFilterEvents = "filterEvents";
-const char[] XNPreeditStartCallback = "preeditStartCallback";
-const char[] XNPreeditDoneCallback = "preeditDoneCallback";
-const char[] XNPreeditDrawCallback = "preeditDrawCallback";
-const char[] XNPreeditCaretCallback = "preeditCaretCallback";
-const char[] XNPreeditStateNotifyCallback = "preeditStateNotifyCallback";
-const char[] XNPreeditAttributes = "preeditAttributes";
-const char[] XNStatusStartCallback = "statusStartCallback";
-const char[] XNStatusDoneCallback = "statusDoneCallback";
-const char[] XNStatusDrawCallback = "statusDrawCallback";
-const char[] XNStatusAttributes = "statusAttributes";
-const char[] XNArea = "area";
-const char[] XNAreaNeeded = "areaNeeded";
-const char[] XNSpotLocation = "spotLocation";
-const char[] XNColormap = "colorMap";
-const char[] XNStdColormap = "stdColorMap";
-const char[] XNForeground = "foreground";
-const char[] XNBackground = "background";
-const char[] XNBackgroundPixmap = "backgroundPixmap";
-const char[] XNFontSet = "fontSet";
-const char[] XNLineSpace = "lineSpace";
-const char[] XNCursor = "cursor";
-const char[] XNQueryIMValuesList = "queryIMValuesList";
-const char[] XNQueryICValuesList = "queryICValuesList";
-const char[] XNVisiblePosition = "visiblePosition";
-const char[] XNR6PreeditCallback = "r6PreeditCallback";
-const char[] XNStringConversionCallback = "stringConversionCallback";
-const char[] XNStringConversion = "stringConversion";
-const char[] XNResetState = "resetState";
-const char[] XNHotKey = "hotKey";
-const char[] XNHotKeyState = "hotKeyState";
-const char[] XNPreeditState = "preeditState";
-const char[] XNSeparatorofNestedList = "separatorofNestedList";
+const String XNVaNestedList = "XNVaNestedList";
+const String XNQueryInputStyle = "queryInputStyle";
+const String XNClientWindow = "clientWindow";
+const String XNInputStyle = "inputStyle";
+const String XNFocusWindow = "focusWindow";
+const String XNResourceName = "resourceName";
+const String XNResourceClass = "resourceClass";
+const String XNGeometryCallback = "geometryCallback";
+const String XNDestroyCallback = "destroyCallback";
+const String XNFilterEvents = "filterEvents";
+const String XNPreeditStartCallback = "preeditStartCallback";
+const String XNPreeditDoneCallback = "preeditDoneCallback";
+const String XNPreeditDrawCallback = "preeditDrawCallback";
+const String XNPreeditCaretCallback = "preeditCaretCallback";
+const String XNPreeditStateNotifyCallback = "preeditStateNotifyCallback";
+const String XNPreeditAttributes = "preeditAttributes";
+const String XNStatusStartCallback = "statusStartCallback";
+const String XNStatusDoneCallback = "statusDoneCallback";
+const String XNStatusDrawCallback = "statusDrawCallback";
+const String XNStatusAttributes = "statusAttributes";
+const String XNArea = "area";
+const String XNAreaNeeded = "areaNeeded";
+const String XNSpotLocation = "spotLocation";
+const String XNColormap = "colorMap";
+const String XNStdColormap = "stdColorMap";
+const String XNForeground = "foreground";
+const String XNBackground = "background";
+const String XNBackgroundPixmap = "backgroundPixmap";
+const String XNFontSet = "fontSet";
+const String XNLineSpace = "lineSpace";
+const String XNCursor = "cursor";
+const String XNQueryIMValuesList = "queryIMValuesList";
+const String XNQueryICValuesList = "queryICValuesList";
+const String XNVisiblePosition = "visiblePosition";
+const String XNR6PreeditCallback = "r6PreeditCallback";
+const String XNStringConversionCallback = "stringConversionCallback";
+const String XNStringConversion = "stringConversion";
+const String XNResetState = "resetState";
+const String XNHotKey = "hotKey";
+const String XNHotKeyState = "hotKeyState";
+const String XNPreeditState = "preeditState";
+const String XNSeparatorofNestedList = "separatorofNestedList";
 const int XBufferOverflow = -1;
 const int XLookupNone = 1;
 const int XLookupChars = 2;