X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/197dd9af26230291b156c504506fed47a4d7420b..6f349458f6903083bd967f52624a5e639733ad5d:/src/common/resource.cpp?ds=sidebyside diff --git a/src/common/resource.cpp b/src/common/resource.cpp index c51def975a..61ad5cf33d 100644 --- a/src/common/resource.cpp +++ b/src/common/resource.cpp @@ -1623,7 +1623,7 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer)); wxGetResourceToken(fd); wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer)); - if (wxIsalpha(value[0])) + if (wxIsdigit(value[0])) { int val = (int)wxAtol(value); wxResourceAddIdentifier(name, val, table); @@ -1813,6 +1813,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] = { _T("wxTE_READONLY"), wxTE_READONLY}, { _T("wxTE_PROCESS_ENTER"), wxTE_PROCESS_ENTER}, { _T("wxTE_MULTILINE"), wxTE_MULTILINE}, + { _T("wxTE_NO_VSCROLL"), wxTE_NO_VSCROLL}, /* wxRadioBox/wxRadioButton */ { _T("wxRB_GROUP"), wxRB_GROUP }, @@ -1935,6 +1936,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] = { _T("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW}, { _T("wxNO_BORDER"), wxNO_BORDER}, { _T("wxCLIP_CHILDREN"), wxCLIP_CHILDREN}, + { _T("wxTAB_TRAVERSAL"), 0}, // Compatibility only { _T("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ}, { _T("wxTINY_CAPTION_VERT"), wxTINY_CAPTION_VERT}, @@ -2702,7 +2704,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer)); wxGetResourceTokenString(s); wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer)); - if (wxIsalpha(value[0])) + if (wxIsdigit(value[0])) { int val = (int)wxAtol(value); wxResourceAddIdentifier(name, val, table);