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

Merge pull request #1268 from tycode/dropdown-button-text-not-rendering

Browse Source 
Fix AUI dropdown button not rendering text when icon is wx.NullBitmap
This commit is contained in:
Robin Dunn
2019-07-08 20:57:39 -07:00
committed by GitHub
parent 5614bb958f 7e3844710d
commit 581f094f04
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/agw/AUI.py
View File

@@ -1169,7 +1169,7 @@ class AuiFrame(wx.Frame):
agwStyle=aui.AUI_TB_OVERFLOW | aui.AUI_TB_TEXT | aui.AUI_TB_HORZ_TEXT)
tb4.SetToolBitmapSize(wx.Size(16, 16))
tb4_bmp1 = wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, wx.Size(16, 16))
tb4.AddSimpleTool(ID_DropDownToolbarItem, "Item 1", tb4_bmp1)
tb4.AddSimpleTool(ID_DropDownToolbarItem, "Item 1", wx.NullBitmap)
tb4.AddSimpleTool(ID_SampleItem+23, "Item 2", tb4_bmp1)
tb4.AddSimpleTool(ID_SampleItem+24, "Item 3", tb4_bmp1)
tb4.AddSimpleTool(ID_SampleItem+25, "Item 4", tb4_bmp1)

6
wx/lib/agw/aui/auibar.py
View File

@@ -1123,10 +1123,8 @@ class AuiDefaultToolBarArt(object):
bmp = item.GetBitmap()
dropbmp = self._button_dropdown_bmp
if not bmp.IsOk():
return
dc.DrawBitmap(bmp, bmp_rect.x, bmp_rect.y, True)
if bmp.IsOk():
dc.DrawBitmap(bmp, bmp_rect.x, bmp_rect.y, True)
if horizontal:
dc.DrawBitmap(dropbmp, dropbmp_x, dropbmp_y, True)
else: