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

whilst -> while

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Hock
2005-01-06 15:51:05 +00:00
parent 9d6a9fdd13
commit 5b5035ce5b
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
contrib/src/deprecated/resource.cpp
View File

@@ -1837,7 +1837,7 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
wxChar buf[300];
wxStrcpy(buf, _("Found "));
wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource."));
wxLogWarning(buf);
return false;
}
@@ -1845,28 +1845,28 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
// char
if (!wxGetResourceToken(fd))
{
wxLogWarning(_("Unexpected end of file whilst parsing resource."));
wxLogWarning(_("Unexpected end of file while parsing resource."));
*eof = true;
return false;
}
if (strcmp(wxResourceBuffer, "char") != 0)
{
wxLogWarning(_("Expected 'char' whilst parsing resource."));
wxLogWarning(_("Expected 'char' while parsing resource."));
return false;
}
// *name
if (!wxGetResourceToken(fd))
{
wxLogWarning(_("Unexpected end of file whilst parsing resource."));
wxLogWarning(_("Unexpected end of file while parsing resource."));
*eof = true;
return false;
}
if (wxResourceBuffer[0] != '*')
{
wxLogWarning(_("Expected '*' whilst parsing resource."));
wxLogWarning(_("Expected '*' while parsing resource."));
return false;
}
wxChar nameBuf[100];
@@ -1876,21 +1876,21 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
// =
if (!wxGetResourceToken(fd))
{
wxLogWarning(_("Unexpected end of file whilst parsing resource."));
wxLogWarning(_("Unexpected end of file while parsing resource."));
*eof = true;
return false;
}
if (strcmp(wxResourceBuffer, "=") != 0)
{
wxLogWarning(_("Expected '=' whilst parsing resource."));
wxLogWarning(_("Expected '=' while parsing resource."));
return false;
}
// String
if (!wxGetResourceToken(fd))
{
wxLogWarning(_("Unexpected end of file whilst parsing resource."));
wxLogWarning(_("Unexpected end of file while parsing resource."));
*eof = true;
return false;
}
@@ -1967,7 +1967,7 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
wxChar buf[300];
wxStrcpy(buf, _("Found "));
wxStrncat(buf, wxConvLibc.cMB2WX(wxResourceBuffer), 30);
wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource."));
wxLogWarning(buf);
return false;
}
@@ -1975,28 +1975,28 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
// char
if (!wxGetResourceToken(fd))
{
wxLogWarning(_("Unexpected end of file whilst parsing resource."));
wxLogWarning(_("Unexpected end of file while parsing resource."));
*eof = true;
return false;
}
if (strcmp(wxResourceBuffer, "char") != 0)
{
wxLogWarning(_("Expected 'char' whilst parsing resource."));
wxLogWarning(_("Expected 'char' while parsing resource."));
return false;
}
// *name
if (!wxGetResourceToken(fd))
{
wxLogWarning(_("Unexpected end of file whilst parsing resource."));
wxLogWarning(_("Unexpected end of file while parsing resource."));
*eof = true;
return false;
}
if (wxResourceBuffer[0] != '*')
{
wxLogWarning(_("Expected '*' whilst parsing resource."));
wxLogWarning(_("Expected '*' while parsing resource."));
return false;
}
char nameBuf[100];
@@ -2005,21 +2005,21 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
// =
if (!wxGetResourceToken(fd))
{
wxLogWarning(_("Unexpected end of file whilst parsing resource."));
wxLogWarning(_("Unexpected end of file while parsing resource."));
*eof = true;
return false;
}
if (strcmp(wxResourceBuffer, "=") != 0)
{
wxLogWarning(_("Expected '=' whilst parsing resource."));
wxLogWarning(_("Expected '=' while parsing resource."));
return false;
}
// String
if (!wxGetResourceToken(fd))
{
wxLogWarning(_("Unexpected end of file whilst parsing resource."));
wxLogWarning(_("Unexpected end of file while parsing resource."));
*eof = true;
return false;
}
@@ -2364,7 +2364,7 @@ long wxParseWindowStyle(const wxString& bitListString)
}
if (!found)
{
wxLogWarning(_("Unrecognized style %s whilst parsing resource."), word);
wxLogWarning(_("Unrecognized style %s while parsing resource."), word);
return 0;
}
word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
@@ -3059,7 +3059,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
wxChar buf[300];
wxStrcpy(buf, _("Found "));
wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource."));
wxLogWarning(buf);
return false;
}
@@ -3067,28 +3067,28 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
// char
if (!wxGetResourceTokenString(s))
{
wxLogWarning(_("Unexpected end of file whilst parsing resource."));
wxLogWarning(_("Unexpected end of file while parsing resource."));
*eof = true;
return false;
}
if (strcmp(wxResourceBuffer, "char") != 0)
{
wxLogWarning(_("Expected 'char' whilst parsing resource."));
wxLogWarning(_("Expected 'char' while parsing resource."));
return false;
}
// *name
if (!wxGetResourceTokenString(s))
{
wxLogWarning(_("Unexpected end of file whilst parsing resource."));
wxLogWarning(_("Unexpected end of file while parsing resource."));
*eof = true;
return false;
}
if (wxResourceBuffer[0] != '*')
{
wxLogWarning(_("Expected '*' whilst parsing resource."));
wxLogWarning(_("Expected '*' while parsing resource."));
return false;
}
wxChar nameBuf[100];
@@ -3098,21 +3098,21 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
// =
if (!wxGetResourceTokenString(s))
{
wxLogWarning(_("Unexpected end of file whilst parsing resource."));
wxLogWarning(_("Unexpected end of file while parsing resource."));
*eof = true;
return false;
}
if (strcmp(wxResourceBuffer, "=") != 0)
{
wxLogWarning(_("Expected '=' whilst parsing resource."));
wxLogWarning(_("Expected '=' while parsing resource."));
return false;
}
// String
if (!wxGetResourceTokenString(s))
{
wxLogWarning(_("Unexpected end of file whilst parsing resource."));
wxLogWarning(_("Unexpected end of file while parsing resource."));
*eof = true;
return false;
}

2
contrib/src/ogl/mfutils.cpp
View File

@@ -111,7 +111,7 @@ wxXMetaFile::wxXMetaFile(const wxChar *file)
[3] | -> wxPen
The handle table works as follows.
When a GDI object is created whilst reading in the
When a GDI object is created while reading in the
metafile, the (e.g.) createpen record is added to the
first free entry in the handle table. The createpen
record's param1 is a pointer to the actual wxPen, and