added wx/defs.h include to correct compilation issues under Mac OS X

[wxWidgets.git] / wxPython / src / _extras.py

diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py
index 48bdc72a0d992b2d699ac17035d8e51e63d3e0f6..cc7b8ce623340f03fc75a88550e92e02ca57a587 100644 (file)
--- a/wxPython/src/_extras.py
+++ b/wxPython/src/_extras.py
@@ -579,12 +579,7 @@ NULL = None  # For backwards compatibility only.  You should really be
 
 wxColor      = wxColour
 wxNamedColor = wxNamedColour
-
-wxPyListCtrlPtr       = wxListCtrlPtr
-wxPyTreeCtrlPtr       = wxTreeCtrlPtr
-wxGenericDragImagePtr = wxDragImagePtr
-wxPyProcessPtr        = wxProcessPtr
-
+wxPen        = wxPyPen
 
 # backwards compatibility
 wxNoRefBitmap       = wxBitmap
@@ -592,6 +587,7 @@ wxPyDefaultPosition = wxDefaultPosition
 wxPyDefaultSize     = wxDefaultSize
 
 
+#----------------------------------------------------------------------
 # wxGTK sets the locale when initialized.  Doing this at the Python
 # level should set it up to match what GTK is doing at the C level.
 try:
@@ -601,6 +597,19 @@ except:
     pass
 
 
+
+#----------------------------------------------------------------------
+# wxWindows version numbers.  wxPython version is in __version__.
+
+wxMAJOR_VERSION   = wxc.wxMAJOR_VERSION
+wxMINOR_VERSION   = wxc.wxMINOR_VERSION
+wxRELEASE_NUMBER  = wxc.wxRELEASE_NUMBER
+wxVERSION_STRING  = wxc.wxVERSION_STRING
+wxVERSION_NUMBER  = wxc.wxVERSION_NUMBER
+
+wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER)
+
+
 #----------------------------------------------------------------------
 # This helper function will take a wxPython object and convert it to
 # another wxPython object type.  This will not be able to create objects