Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-07 04:20:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

a couple more Phoenix changes for wx.lib.masked

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2013-04-20 21:17:17 +00:00
parent bdd04888a6
commit e5a5e579f6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wx/lib/masked/combobox.py
View File

@@ -592,7 +592,7 @@ class BaseMaskedComboBox( wx.ComboBox, MaskedEditMixin ):
else:
def GetMark(self):
## dbg('MaskedComboBox::GetMark()', indent = 1)
ret = wx.ComboBox.GetMark(self)
ret = wx.ComboBox.GetTextSelection(self)
## dbg('returned', ret, indent=0)
return ret

2
wx/lib/masked/maskededit.py
View File

@@ -1955,7 +1955,7 @@ class MaskedEditMixin:
'foregroundColour', 'signedForegroundColour'):
if key in ctrl_kwargs:
if isinstance(ctrl_kwargs[key], (str, unicode)):
c = wx.NamedColour(ctrl_kwargs[key])
c = wx.Colour(ctrl_kwargs[key])
if c.Get() == (-1, -1, -1):
raise TypeError('%s not a legal color specification for %s' % (repr(ctrl_kwargs[key]), key))
else: