More adjustments to aliases

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_gdi_reverse.txt b/wxPython/src/_gdi_reverse.txt
index 0aea27834198b9b74925cca61e8dcab3fcd64392..67f45d777ae1ff2fb13e1daad69c886eec4895ed 100644 (file)
--- a/wxPython/src/_gdi_reverse.txt
+++ b/wxPython/src/_gdi_reverse.txt
@@ -1,7 +1,7 @@
 # Other names that need to be reverse-renamed for the old namespace
 
 
-Color
-NamedColor
+#Color
+#NamedColor
 
 

diff --git a/wxPython/src/_misc_reverse.txt b/wxPython/src/_misc_reverse.txt
index 6a14fb5c81a08b8c4614d96b4bb5d69cd506440c..db39fd5d5ce51e4a9e31ac65099a04eeb2e98f92 100644 (file)
--- a/wxPython/src/_misc_reverse.txt
+++ b/wxPython/src/_misc_reverse.txt
@@ -3,9 +3,9 @@
 PyTimer
 PyDropTarget
 
-SystemSettings_GetSystemColour
-SystemSettings_GetSystemFont
-SystemSettings_GetSystemMetric
+#SystemSettings_GetSystemColour
+#SystemSettings_GetSystemFont
+#SystemSettings_GetSystemMetric
 
 
 # With the * on the end these will cause code to be added that 

diff --git a/wxPython/wxPython/gdi.py b/wxPython/wxPython/gdi.py
index ba9457b842011acdcc5871782004934ab4df4172..a2dc1e37fdaf3ad3747daaf73b7441eb4f0247aa 100644 (file)
--- a/wxPython/wxPython/gdi.py
+++ b/wxPython/wxPython/gdi.py
@@ -535,7 +535,5 @@ wxTheBrushList = wx.gdi.TheBrushList
 wxTheColourDatabase = wx.gdi.TheColourDatabase
 wxEffects = wx.gdi.Effects
 wxEffectsPtr = wx.gdi.EffectsPtr
-wxColor = wx.gdi.Color
-wxNamedColor = wx.gdi.NamedColor
 
 

diff --git a/wxPython/wxPython/misc.py b/wxPython/wxPython/misc.py
index db018a8d2bfbff2a88b85b75a4bf6ec2c9439778..cf6f122a52e1be62c1aa581849436e40ff448819 100644 (file)
--- a/wxPython/wxPython/misc.py
+++ b/wxPython/wxPython/misc.py
@@ -562,8 +562,5 @@ wxClipboardLocker = wx.misc.ClipboardLocker
 wxClipboardLockerPtr = wx.misc.ClipboardLockerPtr
 wxPyTimer = wx.misc.PyTimer
 wxPyDropTarget = wx.misc.PyDropTarget
-wxSystemSettings_GetSystemColour = wx.misc.SystemSettings_GetSystemColour
-wxSystemSettings_GetSystemFont = wx.misc.SystemSettings_GetSystemFont
-wxSystemSettings_GetSystemMetric = wx.misc.SystemSettings_GetSystemMetric