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 86a402ceb11d1f288a9fcd9d98e91f3cca236fd8..202d5186e152d890ace98df2e34138c54c638c74 100644 (file)
--- a/wxPython/wx/tools/XRCed/globals.py
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -4,19 +4,31 @@
 # Created:      02.12.2002
 # RCS-ID:       $Id$
 
-from wxPython.wx import *
-from wxPython.xrc import *
+import wx
+import wx.xrc as xrc
+try:
+    import wx.wizard
+except:
+    pass
 import sys
 
 # Global constants
 
-sysFont = wxSystemSettings_GetFont(wxSYS_SYSTEM_FONT)
-labelFont = wxFont(sysFont.GetPointSize(), wxDEFAULT, wxNORMAL, wxBOLD)
-modernFont = wxFont(sysFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL)
-smallerFont = wxFont(sysFont.GetPointSize()-2, wxDEFAULT, wxNORMAL, wxNORMAL)
-
 progname = 'XRCed'
-version = '0.1.2-1'
+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:
+defaultEncoding = wx.GetDefaultPyEncoding()
 
 try:
     True
@@ -33,8 +45,28 @@ class Globals:
     tools = None
     undoMan = None
     testWin = None
-    testWinPos = wxDefaultPosition
+    testWinPos = wx.DefaultPosition
     currentXXX = None
-    currentEncoding = sys.getdefaultencoding() # wxLocale_GetSystemEncodingName()
+    currentEncoding = defaultEncoding
+
+    def _makeFonts(self):
+        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()
+        return self._sysFont
+    def labelFont(self):
+        if not hasattr(self, "_labelFont"): self._makeFonts()
+        return self._labelFont
+    def modernFont(self):
+        if not hasattr(self, "_modernFont"): self._makeFonts()
+        return self._modernFont
+    def smallerFont(self):
+        if not hasattr(self, "_smallerFont"): self._makeFonts()
+        return self._smallerFont
+    
 
 g = Globals()