Skip to content
Permalink
Browse files

Various small tweaks and fixes

  • Loading branch information...
RobinD42 committed Sep 11, 2019
1 parent 034ae9a commit 6206d20badbf9f9910fb2562b6ee734a28b7e375
Showing with 15 additions and 10 deletions.
  1. +6 −2 build.py
  2. +1 −1 demo/Main.py
  3. +2 −2 etg/ctrlsub.py
  4. +5 −4 wx/lib/nvdlg.py
  5. +1 −1 wx/py/frame.py
@@ -1201,10 +1201,14 @@ def cmd_sip(options, args):
if not newer_group(sipFiles, sbf) and os.path.exists(pycode):
continue

# leave this turned off for now...
# typehint = '-y {}'.format(posixjoin(cfg.PKGDIR, base[1:]) + '.pyi')
typehint = ''

pycode = '-X pycode'+base+':'+pycode
sip = getSipCmd()
cmd = '%s %s -c %s -b %s %s %s' % \
(sip, cfg.SIPOPTS, tmpdir, sbf, pycode, src_name)
cmd = '%s %s -c %s -b %s %s %s %s' % \
(sip, cfg.SIPOPTS, tmpdir, sbf, pycode, typehint, src_name)
runcmd(cmd)

classesNeedingClassInfo = { 'sip_corewxTreeCtrl.cpp' : 'wxTreeCtrl', }
@@ -2593,7 +2593,7 @@ def OnDemoMenu(self, event):

#---------------------------------------------
def OnIconfiy(self, evt):
wx.LogMessage("OnIconfiy: %s" % evt.Iconized())
wx.LogMessage("OnIconfiy: %s" % evt.IsIconized())
evt.Skip()

#---------------------------------------------
@@ -59,7 +59,7 @@ def pickOverloads(m):


# The [G|S]etClientData methods deal with untyped void* values, which we
# don't support. The [G|S]etClientObject methods use wxClientData instaces
# don't support. The [G|S]etClientObject methods use wxClientData instances
# which we have a MappedType for, so make the ClientData methods just be
# aliases for ClientObjects. From the Python programmer's perspective they
# would be virtually the same anyway.
@@ -76,7 +76,7 @@ def pickOverloads(m):
body="self.SetClientData(n, data)")


# Deal with transfering ownership of wxClientData objects
# Deal with transferring ownership of wxClientData objects
c.find('DetachClientObject').transfer = True
c.find('SetClientObject.data').transfer = True
c.find('Append').findOverload('clientData').find('clientData').transfer = True
@@ -84,17 +84,18 @@ def createFields(self, fields):


def destroyFields(self):
for name, widgets in self._fields.iteritems():
for name, widgets in self._fields.items():
for w in widgets:
w.Destroy()
del self.__dict__[name]


def loadValues(self, values):
self.clearValues()
for name, value in values.iteritems():
if name in self._fields.keys():
setattr(self, name, value)
if values:
for name, value in values.items():
if name in self._fields.keys():
setattr(self, name, value)

def clearValues(self):
for name in self._fields.keys():
@@ -85,7 +85,7 @@ def __init__(self, parent=None, id=-1, title='Editor',

def OnIconize(self, event):
"""Event handler for Iconize."""
self.iconized = event.Iconized()
self.iconized = event.IsIconized()


def OnClose(self, event):

0 comments on commit 6206d20

Please sign in to comment.
You can’t perform that action at this time.