Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 03:20:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix additional Python 3.10 issues with AGW FlatNotebook

Browse Source 
(cherry picked from commit aa3dca0e40)
This commit is contained in:
Scott Talbert
2021-12-27 19:48:55 -05:00
parent 8c43b40baf
commit ca9c9165db
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wx/lib/agw/flatnotebook.py
View File

@@ -925,14 +925,14 @@ def DrawButton(dc, rect, focus, upperTabs):
if focus:
if upperTabs:
leftPt = wx.Point(rect.x, rect.y + (rect.height / 10)*8)
rightPt = wx.Point(rect.x + rect.width - 2, rect.y + (rect.height / 10)*8)
leftPt = wx.Point(rect.x, int(rect.y + (rect.height / 10)*8))
rightPt = wx.Point(rect.x + rect.width - 2, int(rect.y + (rect.height / 10)*8))
else:
leftPt = wx.Point(rect.x, rect.y + (rect.height / 10)*5)
rightPt = wx.Point(rect.x + rect.width - 2, rect.y + (rect.height / 10)*5)
leftPt = wx.Point(rect.x, int(rect.y + (rect.height / 10)*5))
rightPt = wx.Point(rect.x + rect.width - 2, int(rect.y + (rect.height / 10)*5))
else:
leftPt = wx.Point(rect.x, rect.y + (rect.height / 2))
rightPt = wx.Point(rect.x + rect.width - 2, rect.y + (rect.height / 2))
leftPt = wx.Point(rect.x, int(rect.y + (rect.height / 2)))
rightPt = wx.Point(rect.x + rect.width - 2, int(rect.y + (rect.height / 2)))
# Define the top region
top = wx.Rect(rect.GetTopLeft(), rightPt)
@@ -2769,7 +2769,7 @@ class FNBRendererFirefox2(FNBRenderer):
if pageTextColour is not None:
dc.SetTextForeground(pageTextColour)
dc.DrawText(pc.GetPageText(tabIdx), posx + textOffset, imageYCoord)
dc.DrawText(pc.GetPageText(tabIdx), int(posx + textOffset), imageYCoord)
# draw 'x' on tab (if enabled)
if pc.HasAGWFlag(FNB_X_ON_TAB) and tabIdx == pc.GetSelection():