--- a/WinWorkstation.st	Mon Nov 17 18:29:31 2008 +0100
+++ b/WinWorkstation.st	Mon Nov 17 18:46:30 2008 +0100
@@ -7957,8 +7957,8 @@
 
 #   define MAX_LABEL_SIZE       256
 #   define MAX_CLASSNAME_SIZE   256
-    static wchar_t classNameBuffer[MAX_CLASSNAME_SIZE];
-    static wchar_t windowNameBuffer[MAX_LABEL_SIZE];
+    static wchar_t classNameBufferw[MAX_CLASSNAME_SIZE];
+    static wchar_t windowNameBufferw[MAX_LABEL_SIZE];
     unsigned char fastBits[10000];
 
     xpos = __ArrayInstPtr(moreArgs)->a_element[0];
@@ -8103,37 +8103,37 @@
     if (__isString(windowClass) || __isSymbol(windowClass)) {
 	className = __stringVal(windowClass);
 	NDPRINTF(("className: %s\n", className));
-    }
-
-    if (__isString(windowClass) || __isSymbol(windowClass)) {
+
 	if (__isInteger(wStyle)) {
 	    isNativeWindow = 1;
 	    winStyleBits |= __longIntVal(wStyle);
 	    NDPRINTF(("winStyleBits: %x\n", winStyleBits));
 	} else {
-	    if (windowType == @symbol(RadioButton)) {
-		isNativeWindow = 1;
-		winStyleBits |= BS_RADIOBUTTON;
-		NDPRINTF(("class: %s - winStyleBits BS_RADIOBUTTON: %x\n", className, winStyleBits));
-	    } else if (windowType == @symbol(CheckBox)) {
-		isNativeWindow = 1;
-		winStyleBits |= BS_CHECKBOX;
-		NDPRINTF(("class: %s - winStyleBits BS_CHECKBOX: %x\n", className, winStyleBits));
-	    } else if (windowType == @symbol(HorizontalScrollBar)) {
-		isNativeWindow = 1;
-		winStyleBits |= SBS_HORZ;
-		NDPRINTF(("class: %s - winStyleBits SBS_HORZ: %x\n", className, winStyleBits));
-	    } else if (windowType == @symbol(VerticalScrollBar)) {
-		isNativeWindow = 1;
-		winStyleBits |= SBS_VERT;
-		NDPRINTF(("class: %s - winStyleBits SBS_VERT: %x\n", className, winStyleBits));
-	    } else if (windowType == @symbol(Button)) {
-		isNativeWindow = 1;
-		NDPRINTF(("class: %s\n", className));
-	    } else if (windowType == @symbol(OwnerDrawButton)) {
-		isNativeWindow = 1;
-		winStyleBits |= BS_OWNERDRAW;
-		NDPRINTF(("class: %s - winStyleBits BS_OWNERDRAW: %x\n", className, winStyleBits));
+	    if (windowType != nil) {
+		if (windowType == @symbol(RadioButton)) {
+		    isNativeWindow = 1;
+		    winStyleBits |= BS_RADIOBUTTON;
+		    NDPRINTF(("class: %s - winStyleBits BS_RADIOBUTTON: %x\n", className, winStyleBits));
+		} else if (windowType == @symbol(CheckBox)) {
+		    isNativeWindow = 1;
+		    winStyleBits |= BS_CHECKBOX;
+		    NDPRINTF(("class: %s - winStyleBits BS_CHECKBOX: %x\n", className, winStyleBits));
+		} else if (windowType == @symbol(HorizontalScrollBar)) {
+		    isNativeWindow = 1;
+		    winStyleBits |= SBS_HORZ;
+		    NDPRINTF(("class: %s - winStyleBits SBS_HORZ: %x\n", className, winStyleBits));
+		} else if (windowType == @symbol(VerticalScrollBar)) {
+		    isNativeWindow = 1;
+		    winStyleBits |= SBS_VERT;
+		    NDPRINTF(("class: %s - winStyleBits SBS_VERT: %x\n", className, winStyleBits));
+		} else if (windowType == @symbol(Button)) {
+		    isNativeWindow = 1;
+		    NDPRINTF(("class: %s\n", className));
+		} else if (windowType == @symbol(OwnerDrawButton)) {
+		    isNativeWindow = 1;
+		    winStyleBits |= BS_OWNERDRAW;
+		    NDPRINTF(("class: %s - winStyleBits BS_OWNERDRAW: %x\n", className, winStyleBits));
+		}
 	    }
 	}
     }
@@ -8354,8 +8354,8 @@
 	if (wStyle == @symbol(dialog)) {
 	    cwi.className = wapp_nameDialog;
 	} else {
-	    ch2wch(className, classNameBuffer, MAX_CLASSNAME_SIZE);
-	    cwi.className = classNameBuffer;
+	    ch2wch(className, classNameBufferw, MAX_CLASSNAME_SIZE);
+	    cwi.className = classNameBufferw;
 	}
     }
 
@@ -8411,17 +8411,17 @@
 
     if (isTopWindow | isMDIChild) {
 	if (__isString(wlabel) || __isSymbol(wlabel)) {
-	    ch2wch((char *)__stringVal(wlabel), windowNameBuffer, MAX_LABEL_SIZE);
-	    cwi.windowName = windowNameBuffer;
-	}
-	else if (__isUnicode16String(wlabel)) {
-	    int l = __unicode16StringSize(wlabel);
-
-	    if (l >= MAX_LABEL_SIZE) l = MAX_LABEL_SIZE-1;
-	    memmove(windowNameBuffer, __unicode16StringVal(wlabel), l*sizeof(wchar_t));
-	    windowNameBuffer[ l ] = 0;
-	    cwi.windowName = windowNameBuffer;
-	}
+	    ch2wch((char *)__stringVal(wlabel), windowNameBufferw, MAX_LABEL_SIZE);
+	    cwi.windowName = windowNameBufferw;
+	} else
+	    if (__isUnicode16String(wlabel)) {
+		int l = __unicode16StringSize(wlabel);
+
+		if (l >= MAX_LABEL_SIZE) l = MAX_LABEL_SIZE-1;
+		memmove(windowNameBufferw, __unicode16StringVal(wlabel), l*sizeof(wchar_t));
+		windowNameBufferw[ l ] = 0;
+		cwi.windowName = windowNameBufferw;
+	    }
     }
 
     cwi.infoWasRead = 0;
@@ -18121,7 +18121,7 @@
 !WinWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.374 2008-10-31 14:38:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.375 2008-11-17 17:46:30 cg Exp $'
 ! !
 
 WinWorkstation initialize!