--- tovid-0.31/src/tovidgui	2007-07-15 07:31:46.000000000 -0700
+++ tovid-0.31/src/tovidgui.new	2008-12-27 10:43:22.000000000 -0800
@@ -21,25 +21,32 @@
 import sys
 import traceback
 
-# Try to import wx 2.6; print error if it's unavailable
 try:
     import wxversion
-    if wxversion.checkInstalled('2.6'):
-        wxversion.select('2.6-unicode')
-    else:
-        print "tovidgui requires wxPython 2.6; please install or upgrade wxPython."
-        sys.exit()
-    import wx
 except ImportError:
     traceback.print_exc()
     print "There was an error importing the 'wx' libraries. The above"
     print "output should help you find what went wrong. Re-installing"
-    print "wxPython 2.6 (or upgrading from wxPython 2.4 to 2.6) may"
+    print "wxPython may"
     print "help. Consult the tovid homepage (tovid.org) for further"
     print "assistance."
     print "Sorry, 'tovidgui' will not work."
     sys.exit()
 
+# Use wx version 2.6 or 2.8
+_allowed_versions = [
+    '2.6-unicode',
+    '2.8-unicode',
+    '2.6-gtk-unicode',
+    '2.8-gtk-unicode']
+try:
+    wxversion.select(_allowed_versions)
+except wxversion.VersionError:
+    print "tovidgui requires wxPython 2.6 or 2.8."
+    print "Please install or upgrade wxPython."
+    sys.exit()
+
+import wx
 from libtovid.gui.frames import TovidFrame
 
 TovidGUI = wx.PySimpleApp()