more changes to make wx compile without implicit wxString->char* conversion (for STL build)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-20 07:44:45 +00:00
parent d38f70b249
commit e0a050e347
55 changed files with 183 additions and 169 deletions
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -1748,7 +1748,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,

    SIZE sizeRect;
    const size_t len = string.length();
-    if ( !::GetTextExtentPoint32(GetHdc(), string, len, &sizeRect) )
+    if ( !::GetTextExtentPoint32(GetHdc(), string.wx_str(), len, &sizeRect) )
    {
        wxLogLastError(_T("GetTextExtentPoint32()"));
    }