Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 09:40:07 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1569 from pbrod/Fix_issue1554

Browse Source 
Fixes issue # 1554:
This commit is contained in:
Robin Dunn
2020-03-23 15:35:41 -07:00
committed by GitHub
parent 00640cab39 fc1823315b
commit 41c5af9cde
50 changed files with 174 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
demo/agw/HyperTreeList.py
View File

@@ -929,7 +929,7 @@ class HyperTreeHeaderRenderer(object):
def DrawHeaderButton(self, dc, rect, flags=0, params=None):
if params != None:
if params is not None:
text_align = params.m_labelAlignment
bitmap = params.m_labelBitmap
text_color = params.m_labelColour
@@ -965,7 +965,7 @@ class HyperTreeHeaderRenderer(object):
dc.SetBackgroundMode(wx.TRANSPARENT)
if params == None:
if params is None:
return
# We need to draw the text and/or icon bitmap
@@ -1445,14 +1445,14 @@ class HyperTreeListDemo(wx.Frame):
next = item
while next != None:
while next is not None:
self.tree.SetItemBackgroundColour(next, colour, col)
cookie=0
child, cockie = self.tree.GetNextChild(next, cookie)
while child != None:
while child is not None:
ColourItems(child, colour, col)
child, cookie = self.tree.GetNextChild(next, cookie)
@@ -1466,7 +1466,7 @@ class HyperTreeListDemo(wx.Frame):
columnBackgroundColour = event.GetValue()
selectedColumn = self.columnchoice.GetCurrentSelection()
self.columnBackgroundColours[selectedColumn] = columnBackgroundColour
self.ColourColumnItems(columnBackgroundColour, selectedColumn)
event.Skip()

6
demo/agw/RibbonBar.py
View File

@@ -517,7 +517,7 @@ class RibbonFrame(wx.Frame):
data = gallery.GetItemClientData(item)
if name != None:
if name is not None:
name = data.GetName()
return data.GetColour(), name
@@ -531,7 +531,7 @@ class RibbonFrame(wx.Frame):
gallery = event.GetGallery()
provider = gallery.GetArtProvider()
if event.GetGalleryItem() != None:
if event.GetGalleryItem() is not None:
if provider == self._ribbon.GetArtProvider():
provider = provider.Clone()
gallery.SetArtProvider(provider)
@@ -835,7 +835,7 @@ class RibbonFrame(wx.Frame):
item = None
# Colour not in gallery - add it
if item == None:
if item is None:
item = self.AddColourToGallery(gallery, clr.GetAsString(wx.C2S_HTML_SYNTAX), self._bitmap_creation_dc,
clr)
gallery.Realize()