Add ability to make global name strings from a wchar_t constant

This commit is contained in:
Robin Dunn
2020-03-17 17:46:56 -07:00
parent 29b7095888
commit b503793e5e
4 changed files with 8 additions and 3 deletions

View File

@@ -6492,6 +6492,7 @@
"TheMimeTypesManager":"wx.",
"ThePenList":"wx.",
"TimePickerCtrl":"wx.adv.",
"TimePickerCtrlNameStr":"wx.adv.",
"TimeSpan":"wx.",
"TimeZone":"wx.DateTime.",
"Timer":"wx.",

View File

@@ -36,6 +36,7 @@ def run():
c = module.find('wxTimePickerCtrl')
assert isinstance(c, etgtools.ClassDef)
tools.fixWindowClass(c)
module.addGlobalStr('wxTimePickerCtrlNameStr', c, wide=True)
# ignore the return value and set the parameters to be outputs

View File

@@ -1596,10 +1596,13 @@ class ModuleDef(BaseDef):
return pc
def addGlobalStr(self, name, before=None):
def addGlobalStr(self, name, before=None, wide=False):
if self.findItem(name):
self.findItem(name).ignore()
gv = GlobalVarDef(type='const char*', name=name)
if wide:
gv = GlobalVarDef(type='const wchar_t*', name=name)
else:
gv = GlobalVarDef(type='const char*', name=name)
if before is None:
self.addItem(gv)
elif isinstance(before, int):

View File

@@ -1302,7 +1302,7 @@ def guessTypeFloat(v):
def guessTypeStr(v):
if hasattr(v, 'value') and '"' in v.value:
return True
for t in ['wxString', 'wxChar', 'char*', 'char *']:
for t in ['wxString', 'wxChar', 'char*', 'char *', 'wchar_t*', 'wchar_t *']:
if t in v.type:
return True
return False