X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/016f67baf6bf35c9d98279dcfee2da2764186de2..0a5bb138a71dfc1c706fc0858fb2801500e2c2e8:/wxPython/wx/tools/XRCed/globals.py?ds=sidebyside

diff --git a/wxPython/wx/tools/XRCed/globals.py b/wxPython/wx/tools/XRCed/globals.py
index 18dae74e4a..845e3231ff 100644
--- a/wxPython/wx/tools/XRCed/globals.py
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -5,10 +5,9 @@
 # RCS-ID:       $Id$
 
 import wx
-from wxPython.wx import *
-from wxPython.xrc import *
+import wx.xrc as xrc
 try:
-    from wxPython.wizard import *
+    import wx.wizard
 except:
     pass
 import sys
@@ -16,9 +15,19 @@ import sys
 # Global constants
 
 progname = 'XRCed'
-version = '0.1.5-2'
+version = '0.1.7-5'
+# Minimal wxWidgets version
+MinWxVersion = (2,6,0)
+if wx.VERSION[:3] < MinWxVersion:
+    print '''\
+******************************* WARNING **************************************
+  This version of XRCed may not work correctly on your version of wxWidgets.
+  Please upgrade wxWidgets to %d.%d.%d or higher.
+******************************************************************************''' % MinWxVersion    
+
 # Can be changed to set other default encoding different
-#defaultEncoding = sys.getdefaultencoding()
+#defaultEncoding = ''
+# you comment above and can uncomment this:
 defaultEncoding = wx.GetDefaultPyEncoding()
 
 try:
@@ -36,15 +45,15 @@ class Globals:
     tools = None
     undoMan = None
     testWin = None
-    testWinPos = wxDefaultPosition
+    testWinPos = wx.DefaultPosition
     currentXXX = None
     currentEncoding = defaultEncoding
 
     def _makeFonts(self):
-        self._sysFont = wxSystemSettings_GetFont(wxSYS_SYSTEM_FONT)
-        self._labelFont = wxFont(self._sysFont.GetPointSize(), wxDEFAULT, wxNORMAL, wxBOLD)
-        self._modernFont = wxFont(self._sysFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL)
-        self._smallerFont = wxFont(self._sysFont.GetPointSize()-2, wxDEFAULT, wxNORMAL, wxNORMAL)
+        self._sysFont = wx.SystemSettings.GetFont(wx.SYS_SYSTEM_FONT)
+        self._labelFont = wx.Font(self._sysFont.GetPointSize(), wx.DEFAULT, wx.NORMAL, wx.BOLD)
+        self._modernFont = wx.Font(self._sysFont.GetPointSize(), wx.MODERN, wx.NORMAL, wx.NORMAL)
+        self._smallerFont = wx.Font(self._sysFont.GetPointSize()-2, wx.DEFAULT, wx.NORMAL, wx.NORMAL)
         
     def sysFont(self):
         if not hasattr(self, "_sysFont"): self._makeFonts()