hopefully this will fix some encoding problems

[wxWidgets.git] / wxPython / wx / tools / XRCed / globals.py

diff --git a/wxPython/wx/tools/XRCed/globals.py b/wxPython/wx/tools/XRCed/globals.py
index 572629efea5567c79d361c11551c2faf6c297184..202d5186e152d890ace98df2e34138c54c638c74 100644 (file)
--- a/wxPython/wx/tools/XRCed/globals.py
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -4,10 +4,10 @@
 # Created:      02.12.2002
 # RCS-ID:       $Id$
 
 # Created:      02.12.2002
 # RCS-ID:       $Id$
 

-from wxPython.wx import *
-from wxPython.xrc import *
+import wx
+import wx.xrc as xrc

 try:
 try:

-    from wxPython.wizard import *
+    import wx.wizard

 except:
     pass
 import sys
 except:
     pass
 import sys


@@ -15,11 +15,20 @@ import sys
 # Global constants
 
 progname = 'XRCed'
 # Global constants
 
 progname = 'XRCed'

-version = '0.1.6-4'
+version = '0.1.7-4'
+# 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 = ''
 # you comment above and can uncomment this:
 # Can be changed to set other default encoding different
 #defaultEncoding = ''
 # you comment above and can uncomment this:

-defaultEncoding = wxGetDefaultPyEncoding()
+defaultEncoding = wx.GetDefaultPyEncoding()

 
 try:
     True
 
 try:
     True


@@ -36,15 +45,15 @@ class Globals:
     tools = None
     undoMan = None
     testWin = None
     tools = None
     undoMan = None
     testWin = None

-    testWinPos = wxDefaultPosition
+    testWinPos = wx.DefaultPosition

     currentXXX = None
     currentEncoding = defaultEncoding
 
     def _makeFonts(self):
     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()
         
     def sysFont(self):
         if not hasattr(self, "_sysFont"): self._makeFonts()