mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2025-08-24 03:20:21 +02:00
In Python 3.10, a change[1] was implemented where extension functions that take integer arguments will no longer silently accept non-integer arguments (e.g., floats) that can only be converted to integers with a loss of precision. This PR fixes most of these issues in the pure-Python classes and demos by explicitly converting the parameters to int before passing them to wxWidgets. There is loss of precision, but this was happening before (automatically) anyway as most wxWidgets DeviceContext functions operate using integers. Additionally, the PR fixes a few sizing issues, mostly with SpinCtrls being too small on GTK3. This is an example of the relevant exception: Traceback (most recent call last): File "/usr/lib64/python3.10/site-packages/wx/lib/agw/pygauge.py", line 355, in OnPaint r.width = w TypeError: 'float' object cannot be interpreted as an integer Fixes #2038. [1] https://bugs.python.org/issue37999
208 lines
5.6 KiB
Python
208 lines
5.6 KiB
Python
#!/usr/bin/env python
|
|
|
|
import wx
|
|
import images
|
|
|
|
|
|
pen_styles = [#"wx.PENSTYLE_INVALID",
|
|
"wx.PENSTYLE_SOLID",
|
|
"wx.PENSTYLE_DOT",
|
|
"wx.PENSTYLE_LONG_DASH",
|
|
"wx.PENSTYLE_SHORT_DASH",
|
|
"wx.PENSTYLE_DOT_DASH",
|
|
"wx.PENSTYLE_USER_DASH",
|
|
"wx.PENSTYLE_TRANSPARENT",
|
|
"wx.PENSTYLE_BDIAGONAL_HATCH",
|
|
"wx.PENSTYLE_CROSSDIAG_HATCH",
|
|
"wx.PENSTYLE_FDIAGONAL_HATCH",
|
|
"wx.PENSTYLE_CROSS_HATCH",
|
|
"wx.PENSTYLE_HORIZONTAL_HATCH",
|
|
"wx.PENSTYLE_VERTICAL_HATCH",
|
|
"wx.PENSTYLE_FIRST_HATCH",
|
|
"wx.PENSTYLE_LAST_HATCH"
|
|
]
|
|
|
|
if 'wxMSW' in wx.PlatformInfo:
|
|
pen_styles.append("wx.PENSTYLE_STIPPLE_MASK_OPAQUE")
|
|
pen_styles.append("wx.PENSTYLE_STIPPLE_MASK")
|
|
pen_styles.append("wx.PENSTYLE_STIPPLE")
|
|
|
|
brush_styles = [#"wx.BRUSHSTYLE_INVALID",
|
|
"wx.BRUSHSTYLE_SOLID",
|
|
"wx.BRUSHSTYLE_TRANSPARENT",
|
|
"wx.BRUSHSTYLE_STIPPLE_MASK_OPAQUE",
|
|
"wx.BRUSHSTYLE_STIPPLE_MASK",
|
|
"wx.BRUSHSTYLE_STIPPLE",
|
|
"wx.BRUSHSTYLE_BDIAGONAL_HATCH",
|
|
"wx.BRUSHSTYLE_CROSSDIAG_HATCH",
|
|
"wx.BRUSHSTYLE_FDIAGONAL_HATCH",
|
|
"wx.BRUSHSTYLE_CROSS_HATCH",
|
|
"wx.BRUSHSTYLE_HORIZONTAL_HATCH",
|
|
"wx.BRUSHSTYLE_VERTICAL_HATCH",
|
|
"wx.BRUSHSTYLE_FIRST_HATCH",
|
|
"wx.BRUSHSTYLE_LAST_HATCH"
|
|
]
|
|
|
|
class BasePanel(wx.Panel):
|
|
def __init__(self, parent):
|
|
wx.Panel.__init__(self, parent, style=wx.SUNKEN_BORDER|wx.WANTS_CHARS)
|
|
|
|
self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
|
|
|
|
self.Bind(wx.EVT_SIZE, self.OnSize)
|
|
self.Bind(wx.EVT_PAINT, self.OnPaint)
|
|
|
|
|
|
def OnSize(self, event):
|
|
event.Skip()
|
|
self.Refresh()
|
|
|
|
|
|
class PenPanel(BasePanel):
|
|
|
|
def __init__(self, parent, pen_name):
|
|
BasePanel.__init__(self, parent)
|
|
self.pen_name = pen_name
|
|
|
|
|
|
def OnPaint(self, event):
|
|
width, height = self.GetClientSize()
|
|
|
|
dc = wx.AutoBufferedPaintDC(self)
|
|
dc.SetBackground(wx.WHITE_BRUSH)
|
|
dc.Clear()
|
|
|
|
font = wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT)
|
|
font.MakeSmaller()
|
|
dc.SetFont(font)
|
|
w, labelHeight = dc.GetTextExtent('Wy')
|
|
|
|
name = self.pen_name
|
|
|
|
if "STIPPLE" in name:
|
|
bmp = images.Smiles.GetBitmap()
|
|
penWidth = 8 #bmp.GetHeight()
|
|
pen = wx.Pen(wx.BLUE, penWidth, eval(name))
|
|
pen.SetStipple(bmp)
|
|
else:
|
|
penWidth = 3
|
|
if 'HATCH' in name:
|
|
penWidth = 8
|
|
pen = wx.Pen(wx.BLUE, penWidth, eval(name))
|
|
|
|
if "USER" in name:
|
|
# dash values represent units on, off, on. off...
|
|
pen.SetDashes([2, 5, 2, 2])
|
|
name += " ([2, 5, 2, 2])"
|
|
|
|
dc.SetTextForeground(wx.BLACK)
|
|
dc.DrawText(name, 1, 1)
|
|
|
|
dc.SetPen(pen)
|
|
y = labelHeight + (height - labelHeight)/2
|
|
dc.DrawLine(5, int(y), width-5, int(y))
|
|
|
|
|
|
class BrushPanel(BasePanel):
|
|
def __init__(self, parent, brush_name):
|
|
BasePanel.__init__(self, parent)
|
|
self.brush_name = brush_name
|
|
|
|
|
|
def OnPaint(self, event):
|
|
width, height = self.GetClientSize()
|
|
|
|
dc = wx.AutoBufferedPaintDC(self)
|
|
dc.SetBackground(wx.WHITE_BRUSH)
|
|
dc.Clear()
|
|
|
|
font = wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT)
|
|
font.MakeSmaller()
|
|
dc.SetFont(font)
|
|
w, labelHeight = dc.GetTextExtent('Wy')
|
|
|
|
dc.SetPen(wx.TRANSPARENT_PEN)
|
|
name = self.brush_name
|
|
|
|
if "STIPPLE" in name:
|
|
bmp = images.Smiles.GetBitmap()
|
|
bmp.SetMask(None)
|
|
brush = wx.Brush(bmp)
|
|
else:
|
|
brush = wx.Brush(wx.BLUE, eval(name))
|
|
|
|
dc.SetTextForeground(wx.BLACK)
|
|
dc.DrawText(name, 1, 1)
|
|
|
|
dc.SetBrush(brush)
|
|
dc.DrawRectangle(5, labelHeight+2, width-10, height-labelHeight-5-2)
|
|
|
|
|
|
|
|
class TestPanel(wx.Panel):
|
|
def __init__(self, *args, **kw):
|
|
wx.Panel.__init__(self, *args, **kw)
|
|
|
|
font = wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT)
|
|
font.SetWeight(wx.FONTWEIGHT_BOLD)
|
|
|
|
mainSizer = wx.BoxSizer(wx.VERTICAL)
|
|
label1 = wx.StaticText(self, -1, "Pen Styles:")
|
|
label1.SetFont(font)
|
|
|
|
mainSizer.Add(label1, 0, wx.EXPAND|wx.ALL, 10)
|
|
|
|
gs1 = wx.GridSizer(rows=5, cols=4, vgap=3, hgap=3)
|
|
|
|
for pen_name in pen_styles:
|
|
small = PenPanel(self, pen_name)
|
|
gs1.Add(small, 0, wx.EXPAND)
|
|
|
|
mainSizer.Add(gs1, 1, wx.EXPAND|wx.LEFT|wx.RIGHT|wx.BOTTOM, 10)
|
|
|
|
label2 = wx.StaticText(self, -1, "Brush Styles:")
|
|
label2.SetFont(font)
|
|
|
|
mainSizer.Add(label2, 0, wx.EXPAND|wx.ALL, 10)
|
|
|
|
gs2 = wx.GridSizer(rows=4, cols=4, vgap=3, hgap=3)
|
|
|
|
for brush_name in brush_styles:
|
|
small = BrushPanel(self, brush_name)
|
|
gs2.Add(small, 0, wx.EXPAND)
|
|
|
|
mainSizer.Add(gs2, 1, wx.EXPAND|wx.LEFT|wx.RIGHT|wx.BOTTOM, 10)
|
|
|
|
self.SetSizer(mainSizer)
|
|
|
|
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
def runTest(frame, nb, log):
|
|
win = TestPanel(nb)
|
|
return win
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
|
|
|
overview = """<html><body>
|
|
<h2><center>Pen and Brush Styles</center></h2>
|
|
|
|
This sample shows an e3xample of drawing with each of the available
|
|
wx.Pen and wx.Brush styles.
|
|
|
|
</body></html>
|
|
"""
|
|
|
|
|
|
if __name__ == '__main__':
|
|
import sys,os
|
|
import run
|
|
run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])
|
|
|
|
|
|
|