Fix pi test failures - add missing global strings

etg/aboutdlg.py

@@ -36,16 +36,17 @@ def run():
     c = module.find('wxAboutDialogInfo')
     assert isinstance(c, etgtools.ClassDef)
 
+
+
+    #-----------------------------------------------------------------
+    tools.doCommonTweaks(module)
     # Add some aliases for the non-UK spelling
+    # Do this after doCommonTweaks so that the .License property exists first
     c.addPyCode("""\
         AboutDialogInfo.HasLicense = AboutDialogInfo.HasLicence
         AboutDialogInfo.GetLicense = AboutDialogInfo.GetLicence
         AboutDialogInfo.License = AboutDialogInfo.Licence
         """)
-
-
-    #-----------------------------------------------------------------
-    tools.doCommonTweaks(module)
     tools.runGenerators(module)
     
     

etg/choice.py

@@ -39,6 +39,8 @@ def run():
     c.find('Create').findOverload('wxArrayString').find('choices').default = 'wxArrayString()'
 
     tools.fixWindowClass(c)
+
+    module.addGlobalStr('wxChoiceNameStr', c)
     
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)

etg/combo.py

@@ -40,8 +40,6 @@ def run():
     c = module.find('wxComboCtrl')
     tools.fixWindowClass(c)
 
-    module.addGlobalStr('wxComboBoxNameStr', c)
-    
     # These are protected methods that need to be unignored and also add back
     # their virtual flags
     for name in ['AnimateShow', 'DoSetPopupControl', 'DoShowPopup']:

etg/combobox.py

@@ -69,6 +69,7 @@ def run():
     c.addPyCode("ComboBox.SetMark = wx.deprecated(ComboBox.SetTextSelection, 'Use SetTextSelection instead.')")
     c.addPyCode("ComboBox.GetMark = wx.deprecated(ComboBox.GetTextSelection, 'Use GetTextSelection instead.')")
 
+    module.addGlobalStr('wxComboBoxNameStr', c)
     
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)

etg/htmllbox.py

@@ -75,6 +75,7 @@ def run():
         virtual wxString OnGetItem(size_t n) const;
         """))
     
+    module.addGlobalStr('wxSimpleHtmlListBoxNameStr', c)
     
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)

etg/listbox.py

@@ -56,6 +56,8 @@ def run():
     
     tools.fixWindowClass(c)
     
+    module.addGlobalStr('wxListBoxNameStr', c)
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)