Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced incorrect or inefficient usage of char_str() by wx_str().

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2007-04-07 12:21:15 +00:00
parent 6a74af89fc
commit 404aba09e5
10 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/os2/choice.cpp
View File

@@ -134,7 +134,7 @@ int wxChoice::DoAppend(
nIndex = (int)::WinSendMsg( GetHwnd() nIndex = (int)::WinSendMsg( GetHwnd()
,LM_INSERTITEM ,LM_INSERTITEM
,(MPARAM)nIndexType ,(MPARAM)nIndexType
,(MPARAM)rsItem.char_str() ,(MPARAM)rsItem.wx_str()
); );
return nIndex; return nIndex;
} // end of wxChoice::DoAppend } // end of wxChoice::DoAppend
@@ -157,7 +157,7 @@ int wxChoice::DoInsert( const wxString& rsItem, unsigned int pos )
nIndex = (int)::WinSendMsg( GetHwnd() nIndex = (int)::WinSendMsg( GetHwnd()
,LM_INSERTITEM ,LM_INSERTITEM
,(MPARAM)nIndexType ,(MPARAM)nIndexType
,(MPARAM)rsItem.char_str() ,(MPARAM)rsItem.wx_str()
); );
return nIndex; return nIndex;
} // end of wxChoice::DoInsert } // end of wxChoice::DoInsert
@@ -232,7 +232,7 @@ void wxChoice::SetString(unsigned int n, const wxString& rsStr)
::WinSendMsg( GetHwnd() ::WinSendMsg( GetHwnd()
,LM_INSERTITEM ,LM_INSERTITEM
,(MPARAM)nIndexType ,(MPARAM)nIndexType
,(MPARAM)rsStr.char_str() ,(MPARAM)rsStr.wx_str()
); );
if (pData) if (pData)

6
src/os2/dc.cpp
View File

@@ -1753,12 +1753,10 @@ void wxDC::DrawAnyText( const wxString& rsText,
vPtlStart.y = vY; vPtlStart.y = vY;
} }
PCH pzStr = rsText.char_str();
::GpiMove(m_hPS, &vPtlStart); ::GpiMove(m_hPS, &vPtlStart);
lHits = ::GpiCharString( m_hPS lHits = ::GpiCharString( m_hPS
,rsText.length() ,rsText.length()
,pzStr ,rsText.wx_str()
); );
if (lHits != GPI_OK) if (lHits != GPI_OK)
{ {
@@ -2178,7 +2176,7 @@ void wxDC::DoGetTextExtent(
// //
bRc = ::GpiQueryTextBox( m_hPS bRc = ::GpiQueryTextBox( m_hPS
,l ,l
,rsString.char_str() ,(char *)rsString.wx_str()
,TXTBOX_COUNT // return maximum information ,TXTBOX_COUNT // return maximum information
,avPoint // array of coordinates points ,avPoint // array of coordinates points
); );

4
src/os2/dcprint.cpp
View File

@@ -41,8 +41,8 @@ wxPrinterDC::wxPrinterDC( const wxString& rsDriverName,
bool bInteractive, bool bInteractive,
int nOrientation ) int nOrientation )
{ {
DEVOPENSTRUC vDevOpen = { rsDeviceName.char_str() DEVOPENSTRUC vDevOpen = { (char*)rsDeviceName.wx_str()
,rsDriverName.char_str() ,(char*)rsDriverName.wx_str()
,NULL ,NULL
,NULL ,NULL
,NULL ,NULL

8
src/os2/listbox.cpp
View File

@@ -281,7 +281,7 @@ int wxListBox::DoAppend(const wxString& rsItem)
else else
lIndexType = LIT_END; lIndexType = LIT_END;
lIndex = (long)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)rsItem.char_str()); lIndex = (long)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)rsItem.wx_str());
m_nNumItems++; m_nNumItems++;
#if wxUSE_OWNER_DRAWN #if wxUSE_OWNER_DRAWN
@@ -318,7 +318,7 @@ void wxListBox::DoSetItems( const wxArrayString& raChoices,
lIndexType = LIT_SORTASCENDING; lIndexType = LIT_SORTASCENDING;
else else
lIndexType = LIT_END; lIndexType = LIT_END;
::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)raChoices[i].char_str()); ::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)raChoices[i].wx_str());
if (ppClientData) if (ppClientData)
{ {
@@ -563,7 +563,7 @@ void wxListBox::DoInsertItems(const wxArrayString& asItems, unsigned int nPos)
int nIndex = (int)::WinSendMsg( GetHwnd(), int nIndex = (int)::WinSendMsg( GetHwnd(),
LM_INSERTITEM, LM_INSERTITEM,
MPFROMLONG((LONG)(i + nPos)), MPFROMLONG((LONG)(i + nPos)),
(MPARAM)asItems[i].char_str() ); (MPARAM)asItems[i].wx_str() );
wxOwnerDrawn* pNewItem = CreateItem(nIndex); wxOwnerDrawn* pNewItem = CreateItem(nIndex);
@@ -613,7 +613,7 @@ void wxListBox::SetString(unsigned int n, const wxString& rsString)
::WinSendMsg( GetHwnd() ::WinSendMsg( GetHwnd()
,LM_INSERTITEM ,LM_INSERTITEM
,(MPARAM)nNewN ,(MPARAM)nNewN
,(MPARAM)rsString.char_str() ,(MPARAM)rsString.wx_str()
); );
// //

12
src/os2/menu.cpp
View File

@@ -323,7 +323,7 @@ bool wxMenu::DoInsertOrAppend( wxMenuItem* pItem,
// //
rItem.afStyle |= MIS_TEXT; rItem.afStyle |= MIS_TEXT;
} }
pData = pItem->GetText().char_str(); pData = (char*) pItem->GetText().wx_str();
} }
if (nPos == (size_t)-1) if (nPos == (size_t)-1)
@@ -804,7 +804,7 @@ WXHMENU wxMenuBar::Create()
(*it)->m_vMenuData.iPosition = (SHORT)i; (*it)->m_vMenuData.iPosition = (SHORT)i;
rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&(*it)->m_vMenuData, (MPARAM)m_titles[i].char_str()); rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&(*it)->m_vMenuData, (MPARAM)m_titles[i].wx_str());
if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR) if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR)
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
@@ -879,7 +879,7 @@ void wxMenuBar::SetLabelTop(
} }
nId = vItem.id; nId = vItem.id;
if (::WinSendMsg(GetHmenu(), MM_SETITEMTEXT, MPFROMSHORT(nId), (MPARAM)rLabel.char_str())); if (::WinSendMsg(GetHmenu(), MM_SETITEMTEXT, MPFROMSHORT(nId), (MPARAM)rLabel.wx_str()));
{ {
wxLogLastError(wxT("ModifyMenu")); wxLogLastError(wxT("ModifyMenu"));
} }
@@ -925,7 +925,7 @@ wxMenu* wxMenuBar::Replace(
if (IsAttached()) if (IsAttached())
{ {
::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0); ::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.char_str()); ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str());
#if wxUSE_ACCEL #if wxUSE_ACCEL
if (pMenuOld->HasAccels() || pMenu->HasAccels()) if (pMenuOld->HasAccels() || pMenu->HasAccels())
@@ -958,7 +958,7 @@ bool wxMenuBar::Insert( size_t nPos,
::WinSendMsg( (HWND)m_hMenu ::WinSendMsg( (HWND)m_hMenu
,MM_INSERTITEM ,MM_INSERTITEM
,(MPARAM)&pMenu->m_vMenuData ,(MPARAM)&pMenu->m_vMenuData
,(MPARAM)sTitle.char_str() ,(MPARAM)sTitle.wx_str()
); );
#if wxUSE_ACCEL #if wxUSE_ACCEL
if (pMenu->HasAccels()) if (pMenu->HasAccels())
@@ -990,7 +990,7 @@ bool wxMenuBar::Append( wxMenu* pMenu,
if ( IsAttached() ) if ( IsAttached() )
{ {
pMenu->m_vMenuData.iPosition = MIT_END; pMenu->m_vMenuData.iPosition = MIT_END;
::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.char_str()); ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str());
#if wxUSE_ACCEL #if wxUSE_ACCEL
if (pMenu->HasAccels()) if (pMenu->HasAccels())
{ {

2
src/os2/menuitem.cpp
View File

@@ -427,7 +427,7 @@ void wxMenuItem::SetText( const wxString& rText )
#endif //owner drawn #endif //owner drawn
{ {
uFlagsOld |= MIS_TEXT; uFlagsOld |= MIS_TEXT;
pData = m_text.char_str(); pData = (char*) m_text.wx_str();
} }
// //

4
src/os2/ownerdrw.cpp
View File

@@ -351,7 +351,7 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
::GpiCharStringAt( rDC.GetHPS() ::GpiCharStringAt( rDC.GetHPS()
,&vPntStart ,&vPntStart
,sFullString.length() ,sFullString.length()
,sFullString.char_str() ,sFullString.wx_str()
); );
if (bFoundMnemonic) if (bFoundMnemonic)
{ {
@@ -389,7 +389,7 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
::GpiCharStringAt( rDC.GetHPS() ::GpiCharStringAt( rDC.GetHPS()
,&vPntStart ,&vPntStart
,sAccel.length() ,sAccel.length()
,sAccel.char_str() ,sAccel.wx_str()
); );
} }

5
src/os2/textctrl.cpp
View File

@@ -329,7 +329,8 @@ void wxTextCtrl::SetupColours()
wxString wxTextCtrl::GetValue() const wxString wxTextCtrl::GetValue() const
{ {
wxString sStr = wxGetWindowText(GetHWND()); wxString sStr = wxGetWindowText(GetHWND());
char* zStr = sStr.char_str(); wxCharBuffer buf(sStr.char_str());
char* zStr = buf.data();
for ( ; *zStr; zStr++ ) for ( ; *zStr; zStr++ )
{ {
@@ -370,7 +371,7 @@ void wxTextCtrl::WriteText(
) )
{ {
if (m_bIsMLE) if (m_bIsMLE)
::WinSendMsg(GetHwnd(), MLM_INSERT, MPARAM(rsValue.char_str()), MPARAM(0)); ::WinSendMsg(GetHwnd(), MLM_INSERT, MPARAM(rsValue.wx_str()), MPARAM(0));
else else
::WinSetWindowText(GetHwnd(), rsValue.c_str()); ::WinSetWindowText(GetHwnd(), rsValue.c_str());
AdjustSpaceLimit(); AdjustSpaceLimit();

2
src/os2/utils.cpp
View File

@@ -157,7 +157,7 @@ bool wxShell( const wxString& rCommand )
SData.PgmName = (char*)zShell; SData.PgmName = (char*)zShell;
sInputs = _T("/C ") + rCommand; sInputs = _T("/C ") + rCommand;
SData.PgmInputs = (BYTE*)sInputs.char_str(); SData.PgmInputs = (BYTE*)sInputs.wx_str();
SData.TermQ = 0; SData.TermQ = 0;
SData.Environment = 0; SData.Environment = 0;
SData.InheritOpt = SSF_INHERTOPT_SHELL; SData.InheritOpt = SSF_INHERTOPT_SHELL;

5
src/os2/window.cpp
View File

@@ -1673,7 +1673,6 @@ void wxWindowOS2::GetTextExtent( const wxString& rString,
int l; int l;
FONTMETRICS vFM; // metrics structure FONTMETRICS vFM; // metrics structure
BOOL bRc = FALSE; BOOL bRc = FALSE;
char* pStr;
HPS hPS; HPS hPS;
hPS = ::WinGetPS(GetHwnd()); hPS = ::WinGetPS(GetHwnd());
@@ -1681,14 +1680,12 @@ void wxWindowOS2::GetTextExtent( const wxString& rString,
l = rString.length(); l = rString.length();
if (l > 0L) if (l > 0L)
{ {
pStr = rString.char_str();
// //
// In world coordinates. // In world coordinates.
// //
bRc = ::GpiQueryTextBox( hPS, bRc = ::GpiQueryTextBox( hPS,
l, l,
pStr, (char*) rString.wx_str(),
TXTBOX_COUNT,// return maximum information TXTBOX_COUNT,// return maximum information
avPoint // array of coordinates points avPoint // array of coordinates points
); );