diff --git a/etg/aboutdlg.py b/etg/aboutdlg.py index dfcec0ac..84fa3da6 100644 --- a/etg/aboutdlg.py +++ b/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) diff --git a/etg/choice.py b/etg/choice.py index 12431024..0f04ab97 100644 --- a/etg/choice.py +++ b/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) diff --git a/etg/combo.py b/etg/combo.py index ecf0e30f..754afd18 100644 --- a/etg/combo.py +++ b/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']: diff --git a/etg/combobox.py b/etg/combobox.py index 28957384..6e9537ff 100644 --- a/etg/combobox.py +++ b/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) diff --git a/etg/htmllbox.py b/etg/htmllbox.py index 638952d6..de333ebd 100644 --- a/etg/htmllbox.py +++ b/etg/htmllbox.py @@ -75,6 +75,7 @@ def run(): virtual wxString OnGetItem(size_t n) const; """)) + module.addGlobalStr('wxSimpleHtmlListBoxNameStr', c) #----------------------------------------------------------------- tools.doCommonTweaks(module) diff --git a/etg/listbox.py b/etg/listbox.py index 11e091d8..99a67242 100644 --- a/etg/listbox.py +++ b/etg/listbox.py @@ -56,6 +56,8 @@ def run(): tools.fixWindowClass(c) + module.addGlobalStr('wxListBoxNameStr', c) + #----------------------------------------------------------------- tools.doCommonTweaks(module) tools.runGenerators(module)