[Openrpg-dev] openrpg1/orpg orpg_wx.py,1.16,1.16.2.1

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3787/orpg

Modified Files:
      Tag: BRANCH-1-7-3
	orpg_wx.py 
Log Message:


Index: orpg_wx.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_wx.py,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** orpg_wx.py	1 Mar 2007 22:25:40 -0000	1.16
--- orpg_wx.py	5 May 2007 19:56:36 -0000	1.16.2.1
***************
*** 1,21 ****
  try:
      import wxversion
!     wxversion.select(["2.7", "2.8"])
      import wx
      import wx.html
-     import wx.lib.wxpTag
      import wx.grid
      import wx.media
      from wx.lib.filebrowsebutton import  *
!     try:
!         import wx.aui as AUI
!     except:
!         import orpg.tools.PyAUI as AUI
! 
!     if wx.VERSION_STRING < "2.7.2" and wx.VERSION_STRING > "2.7.0":
!         AUI.AuiManager = AUI.FrameManager
!         AUI.AuiManagerEvent = AUI.FrameManagerEvent
!         AUI.AuiPaneInfo = AUI.PaneInfo
!         AUI.AuiFloatingPane = AUI.FloatingPane
  
      try:
--- 1,11 ----
  try:
      import wxversion
!     wxversion.select(["2.8"])
      import wx
      import wx.html
      import wx.grid
      import wx.media
      from wx.lib.filebrowsebutton import  *
!     import wx.aui as AUI
  
      try:
***************
*** 26,32 ****
          import orpg.tools.FlatNotebook as FNB
  
-     if wx.VERSION_STRING < "2.7":
-         wx.Rect.Contains = lambda self, point: wx.Rect.Inside(self, point)
- 
      WXLOADED = True
  except ImportError:
--- 16,19 ----