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

more non-const string literal warnings correction

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-14 14:21:16 +00:00
parent 9122d155ab
commit da8cf7236e
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/motif/msgdlg.cpp
View File

@@ -185,7 +185,7 @@ int wxMessageDialog::ShowModal()
// do create message box // 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" ); wxCHECK_MSG( wMsgBox, wxID_CANCEL, "msg box creation failed" );

2
src/motif/radiobox.cpp
View File

@@ -119,7 +119,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
XtSetArg (args[2], XmNadjustLast, False); XtSetArg (args[2], XmNadjustLast, False);
Widget radioBoxWidget = Widget radioBoxWidget =
XmCreateRadioBox ((Widget)m_mainWidget, "radioBoxWidget", args, 3); XmCreateRadioBox ((Widget)m_mainWidget, wxMOTIF_STR("radioBoxWidget"), args, 3);
m_radioButtons.reserve(n); m_radioButtons.reserve(n);
m_radioButtonLabels.reserve(n); m_radioButtonLabels.reserve(n);

7
src/motif/textctrl.cpp
View File

@@ -407,7 +407,7 @@ void wxTextCtrl::AppendText(const wxString& text)
void wxTextCtrl::Clear() void wxTextCtrl::Clear()
{ {
XmTextSetString ((Widget) m_mainWidget, ""); XmTextSetString ((Widget) m_mainWidget, wxMOTIF_STR(""));
m_modified = false; m_modified = false;
} }
@@ -661,12 +661,13 @@ wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
NULL ); NULL );
if( !value ) if( !value )
value = "|"; value = wxMOTIF_STR("|");
int x, y; int x, y;
window->GetTextExtent( value, &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, return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
// MBN: +2 necessary: Lesstif bug or mine? // MBN: +2 necessary: Lesstif bug or mine?