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

added wxMOTIF_STR() macro casting away string literal constness for use with Motif functions taking char *; use it when needed to suppress warnings about string literals being treated as non-const

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-13 16:49:07 +00:00
parent 3f62badb5f
commit f1db433a3b
7 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/motif/app.cpp
View File

@@ -187,23 +187,19 @@ void wxApp::HandlePropertyChange(WXEvent *event)
XtDispatchEvent((XEvent*) event); /* let Motif do the work */
}
// some compilers (e.g. Sun CC) give warnings when treating string literals as
// (non const) "char *" so use this macro to suppress them when we know it's ok
#define STR(x) wx_const_cast(char *, x)
static char *fallbackResources[] = {
// better defaults for CDE under Irix
//
// TODO: do something similar for the other systems, the hardcoded defaults
// below are ugly
#ifdef __SGI__
STR("*sgiMode: True"),
STR("*useSchemes: all"),
wxMOTIF_STR("*sgiMode: True"),
wxMOTIF_STR("*useSchemes: all"),
#else // !__SGI__
STR("*menuBar.marginHeight: 0"),
STR("*menuBar.shadowThickness: 1"),
STR("*background: #c0c0c0"),
STR("*foreground: black"),
wxMOTIF_STR("*menuBar.marginHeight: 0"),
wxMOTIF_STR("*menuBar.shadowThickness: 1"),
wxMOTIF_STR("*background: #c0c0c0"),
wxMOTIF_STR("*foreground: black"),
#endif // __SGI__/!__SGI__
NULL
};
@@ -245,7 +241,7 @@ bool wxApp::OnInitGui()
// Add general resize proc
XtActionsRec rec;
rec.string = STR("resize");
rec.string = wxMOTIF_STR("resize");
rec.proc = (XtActionProc)wxWidgetResizeProc;
XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1);