Allow art provider IDs for the extra bitmaps in a wxBitmapButton. (The

[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..e2a470d9946d905a4948a9c2c3eb8a4dec6bed2e 100644 (file)
--- a/wxPython/wx/tools/XRCed/globals.py
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -6,17 +6,29 @@
 
 from wxPython.wx import *
 from wxPython.xrc import *
 
 from wxPython.wx import *
 from wxPython.xrc import *

+try:
+    from wxPython.wizard import *
+except:
+    pass

 import sys
 
 # Global constants
 
 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'
 progname = 'XRCed'

-version = '0.1.1-4'
+version = '0.1.7-4'
+# Minimal wxWindows version
+MinWxVersion = (2,6,0)
+if wxVERSION[:3] < MinWxVersion:
+    print '''\
+******************************* WARNING **************************************
+  This version of XRCed may not work correctly on your version of wxWidgets.
+  Please upgrade wxWindows 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 = wxGetDefaultPyEncoding()

 
 try:
     True
 
 try:
     True


@@ -35,6 +47,26 @@ class Globals:
     testWin = None
     testWinPos = wxDefaultPosition
     currentXXX = None
     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()
 
 g = Globals()