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

Avoid warnings about literals-to-char* conversions in wxMotif

Browse Source 
Suppress -Wwrite-strings warnings.
This commit is contained in:
Vadim Zeitlin
2020-07-06 13:06:57 +02:00
parent 655b343246
commit 42108c64f6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/motif/toplevel.cpp
View File

@@ -118,7 +118,7 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
// Intercept CLOSE messages from the window manager // Intercept CLOSE messages from the window manager
Widget shell = (Widget)GetShellWidget(); Widget shell = (Widget)GetShellWidget();
Atom WM_DELETE_WINDOW = XmInternAtom( XtDisplay( shell ), Atom WM_DELETE_WINDOW = XmInternAtom( XtDisplay( shell ),
"WM_DELETE_WINDOW", False ); (char*)"WM_DELETE_WINDOW", False );
// Remove and add WM_DELETE_WINDOW so ours is only handler // Remove and add WM_DELETE_WINDOW so ours is only handler
// This only appears to be necessary for wxDialog, but does not hurt // This only appears to be necessary for wxDialog, but does not hurt

2
src/motif/window.cpp
View File

@@ -2608,7 +2608,7 @@ void wxGetTextExtent(const wxWindow* window, const wxString& str,
if (table == NULL) if (table == NULL)
table = XmeGetDefaultRenderTable(w, XmTEXT_RENDER_TABLE); table = XmeGetDefaultRenderTable(w, XmTEXT_RENDER_TABLE);
rendition = XmRenderTableGetRendition( table, "" ); rendition = XmRenderTableGetRendition( table, (char*)"" );
XtSetArg( args[count], XmNfont, 0 ); ++count; XtSetArg( args[count], XmNfont, 0 ); ++count;
XtSetArg( args[count], XmNfontType, 0 ); ++count; XtSetArg( args[count], XmNfontType, 0 ); ++count;
XmRenditionRetrieve( rendition, args, count ); XmRenditionRetrieve( rendition, args, count );