Return the correct encoding for X font spec construction

[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 74ac8bd28f9d5dfb06e81a760de480576394e607..9d274483f3cbd074d94923280c408af7470a4631 100644 (file)
--- a/wxPython/wx/tools/XRCed/globals.py
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -6,12 +6,20 @@
 
 from wxPython.wx import *
 from wxPython.xrc import *
+try:
+    from wxPython.wizard import *
+except:
+    pass
 import sys
 
 # Global constants
 
 progname = 'XRCed'
-version = '0.1.2-1'
+version = '0.1.5-3'
+# Can be changed to set other default encoding different
+#defaultEncoding = ''
+# you comment above and can uncomment this:
+defaultEncoding = wxGetDefaultPyEncoding()
 
 try:
     True
@@ -30,7 +38,7 @@ class Globals:
     testWin = None
     testWinPos = wxDefaultPosition
     currentXXX = None
-    currentEncoding = sys.getdefaultencoding() # wxLocale_GetSystemEncodingName()
+    currentEncoding = defaultEncoding
 
     def _makeFonts(self):
         self._sysFont = wxSystemSettings_GetFont(wxSYS_SYSTEM_FONT)
@@ -51,6 +59,5 @@ class Globals:
         if not hasattr(self, "_smallerFont"): self._makeFonts()
         return self._smallerFont
     
-        
 
 g = Globals()