From e5a5e579f6964a157db1acee8007fffe8ab30afd Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Sat, 20 Apr 2013 21:17:17 +0000
Subject: [PATCH] a couple more Phoenix changes for wx.lib.masked

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wx/lib/masked/combobox.py   | 2 +-
 wx/lib/masked/maskededit.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wx/lib/masked/combobox.py b/wx/lib/masked/combobox.py
index e1338636..ec7bd617 100644
--- a/wx/lib/masked/combobox.py
+++ b/wx/lib/masked/combobox.py
@@ -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
 
diff --git a/wx/lib/masked/maskededit.py b/wx/lib/masked/maskededit.py
index 5d9f565b..b676f0cc 100644
--- a/wx/lib/masked/maskededit.py
+++ b/wx/lib/masked/maskededit.py
@@ -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: