Ported XRCed to the wx namespace, and also enabled the selected,
focus, and disabled bitmaps of wxBitmapButton to actually be treated like bitmaps. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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()
|
||||
|
Reference in New Issue
Block a user