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

AGW on Phoenix: fix wrong rendering of text colour for CustomTreeCtrl tree items and correctly cast sip pointers to ints to be able to draw nice panes in wx.lib.agw.aui.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Andrea Gavana
2014-01-09 21:10:15 +00:00
parent 0f0c183730
commit 5f3c5e8bbb
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wx/lib/agw/__init__.py
View File

@@ -120,7 +120,7 @@ andrea.gavana@maerskoil.com
AGW version: 0.9.7
Last updated: 03 January 2014, 23.00 GMT
Last updated: 09 January 2014, 23.00 GMT
"""

2
wx/lib/agw/aui/__init__.py
View File

@@ -278,7 +278,7 @@ License And Version
AUI library is distributed under the wxPython license.
Latest Revision: Andrea Gavana @ 16 Mar 2013, 21.00 GMT
Latest Revision: Andrea Gavana @ 09 Jan 2014, 22.00 GMT
Version 1.3.

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

@@ -1066,9 +1066,9 @@ class ModernDockArt(AuiDefaultDockArt):
rc.bottom = rect.y + rect.height
if active:
winxptheme.DrawThemeBackground(self.hTheme1, dc.GetHandle(), 5, 1, (rc.top, rc.left, rc.right, rc.bottom), None)
winxptheme.DrawThemeBackground(self.hTheme1, int(dc.GetHandle()), 5, 1, (rc.top, rc.left, rc.right, rc.bottom), None)
else:
winxptheme.DrawThemeBackground(self.hTheme1, dc.GetHandle(), 5, 2, (rc.top, rc.left, rc.right, rc.bottom), None)
winxptheme.DrawThemeBackground(self.hTheme1, int(dc.GetHandle()), 5, 2, (rc.top, rc.left, rc.right, rc.bottom), None)
else:
@@ -1181,7 +1181,7 @@ class ModernDockArt(AuiDefaultDockArt):
raise Exception("ERROR: Unknown State.")
try:
winxptheme.DrawThemeBackground(hTheme, dc.GetHandle(), btntype, state, (rc.top, rc.left, rc.right, rc.bottom), None)
winxptheme.DrawThemeBackground(hTheme, int(dc.GetHandle()), btntype, state, (rc.top, rc.left, rc.right, rc.bottom), None)
except TypeError:
return

12
wx/lib/agw/customtreectrl.py
View File

@@ -3,7 +3,7 @@
# Inspired By And Heavily Based On wxGenericTreeCtrl.
#
# Andrea Gavana, @ 17 May 2006
# Latest Revision: 03 Jan 2014, 23.00 GMT
# Latest Revision: 09 Jan 2014, 23.00 GMT
#
#
# TODO List
@@ -299,7 +299,7 @@ License And Version
:class:`CustomTreeCtrl` is distributed under the wxPython license.
Latest Revision: Andrea Gavana @ 03 Jan 2014, 23.00 GMT
Latest Revision: Andrea Gavana @ 09 Jan 2014, 23.00 GMT
Version 2.6
@@ -900,7 +900,7 @@ class TreeItemAttr(object):
:return: ``True`` if the text colour attribute has been set, ``False`` otherwise.
"""
return self._colText != wx.NullColour
return self._colText != wx.NullColour and self._colText.IsOk()
def HasBackgroundColour(self):
@@ -910,7 +910,7 @@ class TreeItemAttr(object):
:return: ``True`` if the background colour attribute has been set, ``False`` otherwise.
"""
return self._colBack != wx.NullColour
return self._colBack != wx.NullColour and self._colBack.IsOk()
def HasBorderColour(self):
@@ -922,7 +922,7 @@ class TreeItemAttr(object):
.. versionadded:: 0.9.6
"""
return self._colBorder != wx.NullColour
return self._colBorder != wx.NullColour and self._colBorder.IsOk()
def HasFont(self):
@@ -932,7 +932,7 @@ class TreeItemAttr(object):
:return: ``True`` if the font attribute has been set, ``False`` otherwise.
"""
return self._font != wx.NullFont
return self._font != wx.NullFont and self._font.IsOk()
# getters