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

final part of SF patch #904166 (DMC fix)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2004-03-03 10:46:59 +00:00
parent 6898822480
commit b2247ee93b
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/utils/convertrc/rc2wxr.cpp
View File

@@ -979,7 +979,8 @@ void rc2wxr::ParseSlider(wxString WXUNUSED(label), wxString varname)
wxString tok; wxString tok;
while (ReadOrs(tok)); while (ReadOrs(tok))
;
wxFprintf(m_wxr,_T(" control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',"),m_controlid,varname.c_str()); 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; wxString tok;
while (ReadOrs(tok)); while (ReadOrs(tok))
;
wxFprintf(m_wxr,_T(" control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',"),m_controlid,varname.c_str()); 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()); 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); 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()); 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); ReadRect(x,y,width,height);

6
contrib/utils/convertrc/rc2xml.cpp
View File

@@ -1077,9 +1077,11 @@ void rc2xml::ParseMenuItem()
ptoken.MakeUpper(); ptoken.MakeUpper();
if (token==_T("CHECKED")) if (token==_T("CHECKED"))
m_xmlfile.Write(_T("\t\t\t<checkable>1</checkable>\n")); m_xmlfile.Write(_T("\t\t\t<checkable>1</checkable>\n"));
else if (token==_T("MENUBREAK")); else if (token==_T("MENUBREAK"))
;
//m_xmlfile.Write("\t\t\t</break>\n"); //m_xmlfile.Write("\t\t\t</break>\n");
else if (token==_T("GRAYED")); else if (token==_T("GRAYED"))
;
else else
wxLogError(_T("Unknown Menu Item token:")+token); wxLogError(_T("Unknown Menu Item token:")+token);

3
src/expat/lib/xmlparse.c
View File

@@ -4038,7 +4038,8 @@ doProlog(XML_Parser parser,
name = el->name; name = el->name;
dtd->scaffold[myindex].name = name; dtd->scaffold[myindex].name = name;
nameLen = 0; nameLen = 0;
for (; name[nameLen++]; ); for (; name[nameLen++]; )
;
dtd->contentStringLen += nameLen; dtd->contentStringLen += nameLen;
if (elementDeclHandler) if (elementDeclHandler)
handleDefault = XML_FALSE; handleDefault = XML_FALSE;

3
src/msw/ole/automtn.cpp
View File

@@ -1049,7 +1049,8 @@ BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest)
// Month number always >= n/32, so save some loop time */ // Month number always >= n/32, so save some loop time */
for (tmDest.tm_mon = (n4Day >> 5) + 1; 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]); tmDest.tm_mday = (int)(n4Day - rgMonthDays[tmDest.tm_mon-1]);