Moved the pending pos and size into wxWindowMSW

[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 01040c69612f740cd3f0fd16f79904ac405b8d5f..18dae74e4a2093c024d71dc04e18742d89adc5f6 100644 (file)
--- a/wxPython/wx/tools/XRCed/globals.py
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -4,19 +4,22 @@
 # Created:      02.12.2002
 # RCS-ID:       $Id$
 
+import wx
 from wxPython.wx import *
 from wxPython.xrc import *
+try:
+    from wxPython.wizard import *
+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.1-4'
+version = '0.1.5-2'
+# Can be changed to set other default encoding different
+#defaultEncoding = sys.getdefaultencoding()
+defaultEncoding = wx.GetDefaultPyEncoding()
 
 try:
     True
@@ -35,6 +38,26 @@ 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)
+        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)
+        
+    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()