copied from branch (manually)
copied from branch (manually)

git-svn-id: e171abefef93db0a74257c7d87d5b6400fe00c1f@2579 f22100f3-aa73-48fe-a4fb-fd497bb32605

antonvw/wxExtension,antonvw/wxExtension,antonvw/wxExtension