Add another missing #if wxUSE_MARKUP check.

[wxWidgets.git] / docs / changes.txt

diff --git a/docs/changes.txt b/docs/changes.txt
index 421b92db464fb0b6a82486b1f9cb8ce8ae2e964a..8687861a39921d6748065491a8357d14be81e669 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -184,6 +184,10 @@ Changes in behaviour not resulting in compilation errors, please read this!
   wxAutomationInstance_SilentIfNone flag to prevent the error message if no
   currently running instances of this object are available.
 
+- Signatures of wxDataViewCustomRenderer::Activate(), LeftClick() and
+  StartDrag() virtual methods changed.  You will need to change them in your
+  derived renderer class too if you override them.
+
 
 Changes in behaviour which may result in compilation errors
 -----------------------------------------------------------
@@ -441,6 +445,7 @@ Unix:
 
 All (GUI):
 
+- Implement support for markup in wxButton and wxStaticText.
 - Added wxRichMessageDialog (Rickard Westerlund, GSoC 2010 project).
 - Added wxCommandLinkButton (Rickard Westerlund, GSoC 2010 project).
 - Added wxUIActionSimulator (Steven Lamerton, GSoC 2010 project).
@@ -494,7 +499,7 @@ OSX:
 2.9.1:
 ------
 
-INCOMPATIBLE CHANGE SINCE 2.9.0
+INCOMPATIBLE CHANGES SINCE 2.9.0
 
 - wxStandardPaths doesn't use vendor name by default under MSW and OSX to
   remain compatible with 2.8 behaviour but this makes it incompatible with