--- a/Tools__NewClassWizardDialog.st	Sat Nov 07 14:34:17 2009 +0100
+++ b/Tools__NewClassWizardDialog.st	Sat Nov 07 16:49:27 2009 +0100
@@ -269,8 +269,8 @@
         name: windowSpec
         window: 
        (WindowSpec
-          label: 'Tools::NewClassDialog'
-          name: 'Tools::NewClassDialog'
+          label: 'Class Creation Wizard'
+          name: 'Class Creation Wizard'
           min: (Point 10 10)
           max: (Point 1024 768)
           bounds: (Rectangle 0 0 506 600)
@@ -308,6 +308,22 @@
               useIndex: true
             )
            (LabelSpec
+              label: 'Stereotype:'
+              name: 'Label13'
+              layout: (LayoutFrame 10 0 120 0 180 0 142 0)
+              activeHelpKey: className
+              translateLabel: true
+              adjust: right
+            )
+           (ComboListSpec
+              name: 'ComboList3'
+              layout: (LayoutFrame 190 0 119 0 -32 1 141 0)
+              activeHelpKey: programmingLanguage
+              model: stereotypeHolder
+              comboList: listOfStereotypes
+              useIndex: true
+            )
+           (LabelSpec
               label: 'Class Name:'
               name: 'Label1'
               layout: (LayoutFrame 10 0 149 0 180 0 171 0)
@@ -326,6 +342,12 @@
               acceptOnPointerLeave: true
             )
            (LabelSpec
+              label: '*'
+              name: 'Label14'
+              layout: (LayoutFrame 180 0 150 0 190 0 172 0)
+              translateLabel: true
+            )
+           (LabelSpec
               label: 'Superclass:'
               name: 'Label2'
               layout: (LayoutFrame 10 0 179 0 180 0 201 0)
@@ -342,6 +364,12 @@
               comboList: recentlyVisitedClasses
               useIndex: false
             )
+           (LabelSpec
+              label: '*'
+              name: 'Label15'
+              layout: (LayoutFrame 180 0 179 0 190 0 201 0)
+              translateLabel: true
+            )
            (ActionButtonSpec
               label: '...'
               name: 'Button1'
@@ -561,22 +589,6 @@
                
               )
             )
-           (LabelSpec
-              label: 'Stereotype:'
-              name: 'Label13'
-              layout: (LayoutFrame 10 0 120 0 180 0 142 0)
-              activeHelpKey: className
-              translateLabel: true
-              adjust: right
-            )
-           (ComboListSpec
-              name: 'ComboList3'
-              layout: (LayoutFrame 190 0 119 0 -32 1 141 0)
-              activeHelpKey: programmingLanguage
-              model: stereotypeHolder
-              comboList: listOfStereotypes
-              useIndex: true
-            )
            )
          
         )
@@ -947,10 +959,10 @@
     |idx|
 
     languageHolder isNil ifTrue:[
-        (self listOfLanguages size == 1 or:[LastLanguage isNil]) ifTrue:[
+        (self listOfLanguages size == 1) ifTrue:[
             idx := 1.
         ] ifFalse:[
-            idx := self listOfLanguages indexOf:LastLanguage.
+            idx := self listOfLanguages indexOf:(LastLanguage ? 'Smalltalk').
         ].
         languageHolder := idx asValue.
 
@@ -1036,5 +1048,5 @@
 !NewClassWizardDialog class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewClassWizardDialog.st,v 1.6 2009-11-07 03:44:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewClassWizardDialog.st,v 1.7 2009-11-07 15:49:27 cg Exp $'
 ! !