Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-07-17 21:45:30 +00:00
parent 8e05125981
commit ca1863c2cc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/docs/CHANGES.txt
View File

@@ -179,8 +179,8 @@ record operations on a DC and then play them back later.
Upgraded to Scintilla 1.70 for wx.stc.StyledTextCtrl. Upgraded to Scintilla 1.70 for wx.stc.StyledTextCtrl.
Added CanSetTransparent and SetTransparent methods to the Added CanSetTransparent and SetTransparent methods to the
wx.TopLevelWindow class. wx.TopLevelWindow class, with implementations (so far) for wxMSW and
wxMac.