Merge in from trunk r68626 - r68683

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-13 16:01:47 +00:00
parent 603cfe4218 9f4e2e269c
commit 3beb50e570
8 changed files with 3604 additions and 3031 deletions
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -452,6 +452,7 @@ All (GUI):
 - Add wxDataViewEvent::IsEditCancelled() (Allonii).
 - Allow marking wxTreeBook nodes to expand initially in XRC (RedTide).
 - Added customizable wxDocManager::OnMRUFileNotExist() virtual method.
+- Fix stock labels when not using mnemonics for Chinese (cw.ahbong).

 OSX: