X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c693edf3bc9539378a7ac56d90d41d89c7dc7579..3372145d9daa42f680fc5aab7eb00e82d587c5a0:/src/common/resource.cpp diff --git a/src/common/resource.cpp b/src/common/resource.cpp index 95c3840d98..5e4842f6b3 100644 --- a/src/common/resource.cpp +++ b/src/common/resource.cpp @@ -191,7 +191,8 @@ bool wxResourceTable::DeleteResource(const wxString& name) // parent's child list. BeginFind(); wxNode *node = (wxNode *) NULL; - while ((node = Next())) + node = Next(); + while (node != NULL) { wxItemResource *parent = (wxItemResource *)node->Data(); if (parent->GetChildren().Member(item)) @@ -199,6 +200,7 @@ bool wxResourceTable::DeleteResource(const wxString& name) parent->GetChildren().DeleteObject(item); break; } + node = Next(); } delete item; @@ -1528,7 +1530,7 @@ static bool wxEatWhiteSpace(FILE *fd) default: ungetc(ch, fd); return TRUE; - + } } return FALSE; @@ -2041,7 +2043,8 @@ long wxParseWindowStyle(const wxString& bitListString) int i = 0; wxChar *word; long bitList = 0; - while ((word = wxResourceParseWord(WXSTRINGCAST bitListString, &i))) + word = wxResourceParseWord(WXSTRINGCAST bitListString, &i); + while (word != NULL) { bool found = FALSE; int j; @@ -2057,6 +2060,7 @@ long wxParseWindowStyle(const wxString& bitListString) wxLogWarning(_("Unrecognized style %s whilst parsing resource."), word); return 0; } + word = wxResourceParseWord(WXSTRINGCAST bitListString, &i); } return bitList; } @@ -2605,7 +2609,7 @@ bool wxEatWhiteSpaceString(char *s) default: ungetc_string(); return TRUE; - + } } return FALSE;