A better way to handle the OOR wxPyListCtrl --> wxLIstCtrl thing

[wxWidgets.git] / wxPython / src / msw / wx.py

diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py
index be6a63ccaa79fc0f58ce67d11f57c34ec0346838..39b9db97e5ec80aeee97bdd3984a839ff31d0fa1 100644 (file)
--- a/wxPython/src/msw/wx.py
+++ b/wxPython/src/msw/wx.py
@@ -1400,11 +1400,6 @@ NULL = None  # For backwards compatibility only.  You should really be
 wxColor      = wxColour
 wxNamedColor = wxNamedColour
 
 wxColor      = wxColour
 wxNamedColor = wxNamedColour
 

-wxPyListCtrlPtr       = wxListCtrlPtr
-wxPyTreeCtrlPtr       = wxTreeCtrlPtr
-wxGenericDragImagePtr = wxDragImagePtr
-wxPyProcessPtr        = wxProcessPtr
-

 
 # backwards compatibility
 wxNoRefBitmap       = wxBitmap
 
 # backwards compatibility
 wxNoRefBitmap       = wxBitmap


@@ -1412,6 +1407,7 @@ wxPyDefaultPosition = wxDefaultPosition
 wxPyDefaultSize     = wxDefaultSize
 
 
 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:
 # 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:


@@ -1421,6 +1417,19 @@ except:
     pass
 
 
     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
 #----------------------------------------------------------------------
 # This helper function will take a wxPython object and convert it to
 # another wxPython object type.  This will not be able to create objects