Replaced incorrect or inefficient usage of char_str() by wx_str().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1673,7 +1673,6 @@ void wxWindowOS2::GetTextExtent( const wxString& rString,
|
||||
int l;
|
||||
FONTMETRICS vFM; // metrics structure
|
||||
BOOL bRc = FALSE;
|
||||
char* pStr;
|
||||
HPS hPS;
|
||||
|
||||
hPS = ::WinGetPS(GetHwnd());
|
||||
@@ -1681,14 +1680,12 @@ void wxWindowOS2::GetTextExtent( const wxString& rString,
|
||||
l = rString.length();
|
||||
if (l > 0L)
|
||||
{
|
||||
pStr = rString.char_str();
|
||||
|
||||
//
|
||||
// In world coordinates.
|
||||
//
|
||||
bRc = ::GpiQueryTextBox( hPS,
|
||||
l,
|
||||
pStr,
|
||||
(char*) rString.wx_str(),
|
||||
TXTBOX_COUNT,// return maximum information
|
||||
avPoint // array of coordinates points
|
||||
);
|
||||
|
Reference in New Issue
Block a user