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

Got some compiler warnings in non-Unicode build. Fixed them.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-13 16:22:43 +00:00
parent d9a56bdeaf
commit fde7d98ecd
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/ftp.cpp
View File

@@ -155,7 +155,7 @@ bool wxFTP::SendCommand(const wxString& command, char exp_ret)
return FALSE; return FALSE;
} }
tmp_str = command + _T("\r\n"); tmp_str = command + _T("\r\n");
wxWX2MBbuf tmp_buf = tmp_str.mb_str(); const wxWX2MBbuf tmp_buf = tmp_str.mb_str();
if (Write(MBSTRINGCAST tmp_buf, strlen(tmp_buf)).Error()) { if (Write(MBSTRINGCAST tmp_buf, strlen(tmp_buf)).Error()) {
m_lastError = wxPROTO_NETERR; m_lastError = wxPROTO_NETERR;
return FALSE; return FALSE;

4
src/common/http.cpp
View File

@@ -106,7 +106,7 @@ void wxHTTP::SendHeaders()
wxString buf; wxString buf;
buf.Printf(_T("%s: %s\n\r"), head->GetKeyString(), str->GetData()); buf.Printf(_T("%s: %s\n\r"), head->GetKeyString(), str->GetData());
wxWX2MBbuf cbuf = buf.mb_str(); const wxWX2MBbuf cbuf = buf.mb_str();
Write(cbuf, strlen(cbuf)); Write(cbuf, strlen(cbuf));
head = head->Next(); head = head->Next();
@@ -187,7 +187,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
{ {
char *tmp_buf; char *tmp_buf;
char buf[HTTP_BSIZE]; char buf[HTTP_BSIZE];
wxWX2MBbuf pathbuf = path.mb_str(); const wxWX2MBbuf pathbuf = path.mb_str();
switch (req) { switch (req) {
case wxHTTP_GET: case wxHTTP_GET:

8
src/common/wxexpr.cpp
View File

@@ -733,7 +733,7 @@ void wxExpr::WriteExpr(ostream& stream) // Write as any other subexpression
{ {
stream << "\""; stream << "\"";
int i; int i;
wxWX2MBbuf val = wxConv_libc.cWX2MB(value.string); const wxWX2MBbuf val = wxConv_libc.cWX2MB(value.string);
int len = strlen(val); int len = strlen(val);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
@@ -749,7 +749,7 @@ void wxExpr::WriteExpr(ostream& stream) // Write as any other subexpression
case wxExprWord: case wxExprWord:
{ {
bool quote_it = FALSE; bool quote_it = FALSE;
wxWX2MBbuf val = wxConv_libc.cWX2MB(value.word); const wxWX2MBbuf val = wxConv_libc.cWX2MB(value.word);
int len = strlen(val); int len = strlen(val);
if ((len == 0) || (len > 0 && (val[0] > 64 && val[0] < 91))) if ((len == 0) || (len > 0 && (val[0] > 64 && val[0] < 91)))
quote_it = TRUE; quote_it = TRUE;
@@ -1070,7 +1070,7 @@ bool wxExprDatabase::ReadFromString(const wxString& buffer)
noErrors = 0; noErrors = 0;
thewxExprDatabase = this; thewxExprDatabase = this;
wxWX2MBbuf buf = buffer.mb_str(); const wxWX2MBbuf buf = buffer.mb_str();
LexFromString(MBSTRINGCAST buf); LexFromString(MBSTRINGCAST buf);
yyparse(); yyparse();
wxExprCleanUp(); wxExprCleanUp();
@@ -1195,7 +1195,7 @@ char *wxmake_string(char *str)
{ {
wxChar *s, *t; wxChar *s, *t;
int len, i; int len, i;
wxMB2WXbuf sbuf = wxConv_libc.cMB2WX(str); const wxMB2WXbuf sbuf = wxConv_libc.cMB2WX(str);
str++; /* skip leading quote */ str++; /* skip leading quote */
len = wxStrlen(sbuf) - 1; /* ignore trailing quote */ len = wxStrlen(sbuf) - 1; /* ignore trailing quote */