more non-const string literal warnings correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9122d155ab
commit
da8cf7236e
@ -185,7 +185,7 @@ int wxMessageDialog::ShowModal()
|
||||
|
||||
// do create message box
|
||||
|
||||
Widget wMsgBox = (*dialogCreateFunction)(wParent, "", args, ac);
|
||||
Widget wMsgBox = (*dialogCreateFunction)(wParent, wxMOTIF_STR(""), args, ac);
|
||||
|
||||
wxCHECK_MSG( wMsgBox, wxID_CANCEL, "msg box creation failed" );
|
||||
|
||||
|
@ -119,7 +119,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||
XtSetArg (args[2], XmNadjustLast, False);
|
||||
|
||||
Widget radioBoxWidget =
|
||||
XmCreateRadioBox ((Widget)m_mainWidget, "radioBoxWidget", args, 3);
|
||||
XmCreateRadioBox ((Widget)m_mainWidget, wxMOTIF_STR("radioBoxWidget"), args, 3);
|
||||
|
||||
m_radioButtons.reserve(n);
|
||||
m_radioButtonLabels.reserve(n);
|
||||
|
@ -407,7 +407,7 @@ void wxTextCtrl::AppendText(const wxString& text)
|
||||
|
||||
void wxTextCtrl::Clear()
|
||||
{
|
||||
XmTextSetString ((Widget) m_mainWidget, "");
|
||||
XmTextSetString ((Widget) m_mainWidget, wxMOTIF_STR(""));
|
||||
m_modified = false;
|
||||
}
|
||||
|
||||
@ -661,12 +661,13 @@ wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
|
||||
NULL );
|
||||
|
||||
if( !value )
|
||||
value = "|";
|
||||
value = wxMOTIF_STR("|");
|
||||
|
||||
int x, y;
|
||||
window->GetTextExtent( value, &x, &y );
|
||||
|
||||
if( x < 100 ) x = 100;
|
||||
if( x < 100 )
|
||||
x = 100;
|
||||
|
||||
return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
|
||||
// MBN: +2 necessary: Lesstif bug or mine?
|
||||
|
Loading…
Reference in New Issue
Block a user