Got some compiler warnings in non-Unicode build. Fixed them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -733,7 +733,7 @@ void wxExpr::WriteExpr(ostream& stream) // Write as any other subexpression
|
||||
{
|
||||
stream << "\"";
|
||||
int i;
|
||||
wxWX2MBbuf val = wxConv_libc.cWX2MB(value.string);
|
||||
const wxWX2MBbuf val = wxConv_libc.cWX2MB(value.string);
|
||||
int len = strlen(val);
|
||||
for (i = 0; i < len; i++)
|
||||
{
|
||||
@@ -749,7 +749,7 @@ void wxExpr::WriteExpr(ostream& stream) // Write as any other subexpression
|
||||
case wxExprWord:
|
||||
{
|
||||
bool quote_it = FALSE;
|
||||
wxWX2MBbuf val = wxConv_libc.cWX2MB(value.word);
|
||||
const wxWX2MBbuf val = wxConv_libc.cWX2MB(value.word);
|
||||
int len = strlen(val);
|
||||
if ((len == 0) || (len > 0 && (val[0] > 64 && val[0] < 91)))
|
||||
quote_it = TRUE;
|
||||
@@ -1070,7 +1070,7 @@ bool wxExprDatabase::ReadFromString(const wxString& buffer)
|
||||
noErrors = 0;
|
||||
thewxExprDatabase = this;
|
||||
|
||||
wxWX2MBbuf buf = buffer.mb_str();
|
||||
const wxWX2MBbuf buf = buffer.mb_str();
|
||||
LexFromString(MBSTRINGCAST buf);
|
||||
yyparse();
|
||||
wxExprCleanUp();
|
||||
@@ -1195,7 +1195,7 @@ char *wxmake_string(char *str)
|
||||
{
|
||||
wxChar *s, *t;
|
||||
int len, i;
|
||||
wxMB2WXbuf sbuf = wxConv_libc.cMB2WX(str);
|
||||
const wxMB2WXbuf sbuf = wxConv_libc.cMB2WX(str);
|
||||
|
||||
str++; /* skip leading quote */
|
||||
len = wxStrlen(sbuf) - 1; /* ignore trailing quote */
|
||||
|
Reference in New Issue
Block a user