merging back r60180, r60184, r60212, r60214, r60215, r60234

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@60241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-19 07:20:34 +00:00
parent b43e5fea41
commit fe2b2391ff
4 changed files with 25 additions and 19 deletions
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -209,7 +209,7 @@ inline int Stricmp(const char *psz1, const char *psz2)

 // Lightweight object returned by wxString::c_str() and implicitly convertible
 // to either const char* or const wchar_t*.
-class WXDLLIMPEXP_BASE wxCStrData
+class wxCStrData
 {
 private:
    // Ctors; for internal use by wxString and wxCStrData only