From b2247ee93bd093d52417ea063720f4165d8a0da8 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Wed, 3 Mar 2004 10:46:59 +0000 Subject: [PATCH 1/1] final part of SF patch #904166 (DMC fix) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/utils/convertrc/rc2wxr.cpp | 12 ++++++++---- contrib/utils/convertrc/rc2xml.cpp | 6 ++++-- src/expat/lib/xmlparse.c | 3 ++- src/msw/ole/automtn.cpp | 3 ++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp index 44f75d959c..13b4b8406a 100644 --- a/contrib/utils/convertrc/rc2wxr.cpp +++ b/contrib/utils/convertrc/rc2wxr.cpp @@ -979,7 +979,8 @@ void rc2wxr::ParseSlider(wxString WXUNUSED(label), wxString varname) wxString tok; -while (ReadOrs(tok)); +while (ReadOrs(tok)) + ; wxFprintf(m_wxr,_T(" control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',"),m_controlid,varname.c_str()); @@ -1009,7 +1010,8 @@ void rc2wxr::ParseProgressBar(wxString WXUNUSED(label), wxString varname) wxString tok; -while (ReadOrs(tok)); +while (ReadOrs(tok)) + ; wxFprintf(m_wxr,_T(" control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',"),m_controlid,varname.c_str()); @@ -1071,7 +1073,8 @@ if (tok==_T("BS_AUTOCHECKBOX")) wxFprintf(m_wxr,_T(" control = [%i,wxCheckBox,'%s','0','%s',"),m_controlid,label.c_str(),varname.c_str()); - while (ReadOrs(tok)); + while (ReadOrs(tok)) + ; ReadRect(x,y,width,height); @@ -1089,7 +1092,8 @@ if (tok==_T("BS_AUTORADIOBUTTON")) wxFprintf(m_wxr,_T(" control = [%i,wxRadioButton,'%s','0','%s',"),m_controlid,label.c_str(),varname.c_str()); - while(ReadOrs(tok)); + while(ReadOrs(tok)) + ; ReadRect(x,y,width,height); diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp index d4db74abed..371f4aa489 100644 --- a/contrib/utils/convertrc/rc2xml.cpp +++ b/contrib/utils/convertrc/rc2xml.cpp @@ -1077,9 +1077,11 @@ void rc2xml::ParseMenuItem() ptoken.MakeUpper(); if (token==_T("CHECKED")) m_xmlfile.Write(_T("\t\t\t1\n")); - else if (token==_T("MENUBREAK")); + else if (token==_T("MENUBREAK")) + ; //m_xmlfile.Write("\t\t\t\n"); - else if (token==_T("GRAYED")); + else if (token==_T("GRAYED")) + ; else wxLogError(_T("Unknown Menu Item token:")+token); diff --git a/src/expat/lib/xmlparse.c b/src/expat/lib/xmlparse.c index 09002dbbb9..c55c768002 100644 --- a/src/expat/lib/xmlparse.c +++ b/src/expat/lib/xmlparse.c @@ -4038,7 +4038,8 @@ doProlog(XML_Parser parser, name = el->name; dtd->scaffold[myindex].name = name; nameLen = 0; - for (; name[nameLen++]; ); + for (; name[nameLen++]; ) + ; dtd->contentStringLen += nameLen; if (elementDeclHandler) handleDefault = XML_FALSE; diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp index 6b948f8baa..f80d6d8216 100644 --- a/src/msw/ole/automtn.cpp +++ b/src/msw/ole/automtn.cpp @@ -1049,7 +1049,8 @@ BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest) // Month number always >= n/32, so save some loop time */ for (tmDest.tm_mon = (n4Day >> 5) + 1; - n4Day > rgMonthDays[tmDest.tm_mon]; tmDest.tm_mon++); + n4Day > rgMonthDays[tmDest.tm_mon]; tmDest.tm_mon++) + ; tmDest.tm_mday = (int)(n4Day - rgMonthDays[tmDest.tm_mon-1]); -- 2.45.2