From cf763f5b942d40121b1d647d2a34d48410965c09 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 23 Dec 2003 21:37:21 +0000 Subject: [PATCH] backwards compatibility aliases can be used in the wxPython namespace git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_colour.i | 9 ++++---- wxPython/src/_settings.i | 12 +++++------ wxPython/wxPython/_wx.py | 44 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/wxPython/src/_colour.i b/wxPython/src/_colour.i index 55af312eef..c1df0f8df2 100644 --- a/wxPython/src/_colour.i +++ b/wxPython/src/_colour.i @@ -83,9 +83,10 @@ public: } }; -%pythoncode { - Color = Colour - NamedColor = NamedColour -} +// %pythoncode { +// Color = Colour +// NamedColor = NamedColour +// } + //--------------------------------------------------------------------------- diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i index 28ba50b290..379a988fac 100644 --- a/wxPython/src/_settings.i +++ b/wxPython/src/_settings.i @@ -175,12 +175,12 @@ public: }; -%pythoncode { -%# backwards compatibility aliasses -SystemSettings_GetSystemColour = SystemSettings_GetColour -SystemSettings_GetSystemFont = SystemSettings_GetFont -SystemSettings_GetSystemMetric = SystemSettings_GetMetric -} +// %pythoncode { +// %# backwards compatibility aliasses +// SystemSettings_GetSystemColour = SystemSettings_GetColour +// SystemSettings_GetSystemFont = SystemSettings_GetFont +// SystemSettings_GetSystemMetric = SystemSettings_GetMetric +// } //--------------------------------------------------------------------------- diff --git a/wxPython/wxPython/_wx.py b/wxPython/wxPython/_wx.py index 9342b81db2..848c96b70c 100644 --- a/wxPython/wxPython/_wx.py +++ b/wxPython/wxPython/_wx.py @@ -9,3 +9,47 @@ from misc import * # Cleanup this one. del wx + + +# Make some to help backawrds compatibility for the old namespace. +# This is only for code that is using tthe wxPython.wx package and +# using names and classes in the old way. New code should use the wx +# namespace and the new names. + +wxPyDefaultPosition = wxDefaultPosition +wxPyDefaultSize = wxDefaultSize +wxNoRefBitmap = wxBitmap +wxSystemSettings_GetSystemColour = wxSystemSettings_GetColour +wxSystemSettings_GetSystemFont = wxSystemSettings_GetFont +wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric +wxColor = wxColour +wxNamedColor = wxNamedColour + +NULL = None +TRUE = true = True +FALSE = false = False + +def wxPyTypeCast(obj, typeStr): + return obj + +wxPy_isinstance = isinstance + +wxDC.FloodFill = wxDC.FloodFillXY +wxDC.GetPixel = wxDC.GetPixelXY +wxDC.DrawLine = wxDC.DrawLineXY +wxDC.CrossHair = wxDC.CrossHairXY +wxDC.DrawArc = wxDC.DrawArcXY +wxDC.DrawCheckMark = wxDC.DrawCheckMarkXY +wxDC.DrawEllipticArc = wxDC.DrawEllipticArcXY +wxDC.DrawPoint = wxDC.DrawPointXY +wxDC.DrawRectangle = wxDC.DrawRectangleXY +wxDC.DrawRoundedRectangle = wxDC.DrawRoundedRectangleXY +wxDC.DrawCircle = wxDC.DrawCircleXY +wxDC.DrawEllipse = wxDC.DrawEllipseXY +wxDC.DrawIcon = wxDC.DrawIconXY +wxDC.DrawBitmap = wxDC.DrawBitmapXY +wxDC.DrawText = wxDC.DrawTextXY +wxDC.DrawRotatedText = wxDC.DrawRotatedTextXY +wxDC.Blit = wxDC.BlitXY +wxDC.SetClippingRegion = wxDC.SetClippingRegionXY + -- 2.47.2