Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 03:20:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22 from wernerfb/2015-july-demo

Browse Source 
demo corrections and loosening demo version check
This commit is contained in:
Robin Dunn
2016-02-27 16:50:47 -08:00
parent 6e2be0665a e81b57863b
commit ca15e52650
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
demo/Main.py
View File

@@ -56,6 +56,8 @@ import re
import shutil
from threading import Thread
from distutils.version import LooseVersion
import wx
import wx.adv
import wx.lib.agw.aui as aui
@@ -2879,7 +2881,7 @@ class MySplashScreen(SplashScreen):
from wx.lib.mixins.treemixin import ExpansionState
if USE_CUSTOMTREECTRL:
import wx.lib.customtreectrl as CT
import wx.lib.agw.customtreectrl as CT
TreeBaseClass = CT.CustomTreeCtrl
else:
TreeBaseClass = wx.TreeCtrl
@@ -2925,7 +2927,7 @@ class MyApp(wx.App, wx.lib.mixins.inspection.InspectionMixin):
def OnInit(self):
# Check runtime version
if version.VERSION_STRING != wx.VERSION_STRING:
if LooseVersion(version.VERSION_STRING) >= LooseVersion(wx.VERSION_STRING):
wx.MessageBox(caption="Warning",
message="You're using version %s of wxPython, but this copy of the demo was written for version %s.\n"
"There may be some version incompatibilities..."