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

2
contrib/docs/latex/fl/body.tex
View File

@@ -30,7 +30,7 @@ is given as the moving bar displaces other bars.
Other features: the splitter bar shows a dotted thick line as Other features: the splitter bar shows a dotted thick line as
it's dragged. Single-clicking on a row handle minimizes it to it's dragged. Single-clicking on a row handle minimizes it to
a horizontal tab which is given its own narrow row. This allows a horizontal tab which is given its own narrow row. This allows
the user to temporarily hide a row whilst allowing quick access the user to temporarily hide a row while allowing quick access
to it when required. to it when required.
A close button (x) hides a bar completely. You can get it back again A close button (x) hides a bar completely. You can get it back again

2
contrib/docs/latex/ogl/sample.tex
View File

@@ -63,7 +63,7 @@ copes with this by treating each arc deletion as a separate command, and
sending Cut commands recursively, providing an undo path. Undoing such a sending Cut commands recursively, providing an undo path. Undoing such a
Cut will only undo one command at a time - not a one to one Cut will only undo one command at a time - not a one to one
correspondence with the original command - but it's a reasonable correspondence with the original command - but it's a reasonable
compromise and preserves Do/Undo whilst keeping our DiagramCommand class compromise and preserves Do/Undo while keeping our DiagramCommand class
simple. simple.
\section{Possible enhancements} \section{Possible enhancements}

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

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

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

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

2
docs/latex/wx/dc.tex
View File

@@ -1115,7 +1115,7 @@ Sets the user scaling factor, useful for applications which require
\func{bool}{StartDoc}{\param{const wxString\& }{message}} \func{bool}{StartDoc}{\param{const wxString\& }{message}}
Starts a document (only relevant when outputting to a printer). Starts a document (only relevant when outputting to a printer).
Message is a message to show whilst printing. Message is a message to show while printing.
\membersection{wxDC::StartPage}\label{wxdcstartpage} \membersection{wxDC::StartPage}\label{wxdcstartpage}

2
utils/tex2rtf/docs/tex2rtf.tex
View File

@@ -3273,7 +3273,7 @@ system on the Internet.
A typesetting language implemented as a set of \TeX\ macros. It is A typesetting language implemented as a set of \TeX\ macros. It is
distinguished for allowing specification of the document structure, distinguished for allowing specification of the document structure,
whilst taking care of most layout concerns. It represents the opposite while taking care of most layout concerns. It represents the opposite
end of the spectrum from WYSIWYG word processors. end of the spectrum from WYSIWYG word processors.
\gloss{RTF}\label{rtf} \gloss{RTF}\label{rtf}