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 74ac8bd28f9d5dfb06e81a760de480576394e607..e2a470d9946d905a4948a9c2c3eb8a4dec6bed2e 100644 (file)
--- a/wxPython/wx/tools/XRCed/globals.py
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -6,12 +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
 
 progname = 'XRCed'
 import sys
 
 # Global constants
 
 progname = 'XRCed'

-version = '0.1.2-1'
+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


@@ -30,7 +47,7 @@ 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)
 
     def _makeFonts(self):
         self._sysFont = wxSystemSettings_GetFont(wxSYS_SYSTEM_FONT)


@@ -51,6 +68,5 @@ class Globals:
         if not hasattr(self, "_smallerFont"): self._makeFonts()
         return self._smallerFont
     
         if not hasattr(self, "_smallerFont"): self._makeFonts()
         return self._smallerFont
     

-        

 
 g = Globals()
 
 g = Globals()