Ported XRCed to the wx namespace, and also enabled the selected,

[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 e2a470d9946d905a4948a9c2c3eb8a4dec6bed2e..202d5186e152d890ace98df2e34138c54c638c74 100644 (file)
--- a/wxPython/wx/tools/XRCed/globals.py
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -4,10 +4,10 @@
 # Created:      02.12.2002
 # RCS-ID:       $Id$
 
-from wxPython.wx import *
-from wxPython.xrc import *
+import wx
+import wx.xrc as xrc
 try:
-    from wxPython.wizard import *
+    import wx.wizard
 except:
     pass
 import sys
@@ -16,19 +16,19 @@ import sys
 
 progname = 'XRCed'
 version = '0.1.7-4'
-# Minimal wxWindows version
+# Minimal wxWidgets version
 MinWxVersion = (2,6,0)
-if wxVERSION[:3] < MinWxVersion:
+if wx.VERSION[: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.
+  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 = wxGetDefaultPyEncoding()
+defaultEncoding = wx.GetDefaultPyEncoding()
 
 try:
     True
@@ -45,15 +45,15 @@ class Globals:
     tools = None
     undoMan = None
     testWin = None
-    testWinPos = wxDefaultPosition
+    testWinPos = wx.DefaultPosition
     currentXXX = None
     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)
+        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()