whilst -> while

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/docs/latex/fl/body.tex b/contrib/docs/latex/fl/body.tex
index 0d3cac65f157500e920d95cdb0bf53e0cc20f7c3..a900fd7dda8fd57c39f570c65e2f158496f14d78 100644 (file)
--- a/contrib/docs/latex/fl/body.tex
+++ b/contrib/docs/latex/fl/body.tex
@@ -30,7 +30,7 @@ is given as the moving bar displaces other bars.
 Other features: the splitter bar shows a dotted thick line as
 it's dragged. Single-clicking on a row handle minimizes it to
 a horizontal tab which is given its own narrow row. This allows
 Other features: the splitter bar shows a dotted thick line as
 it's dragged. Single-clicking on a row handle minimizes it to
 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.
 
 A close button (x) hides a bar completely. You can get it back again
 to it when required.
 
 A close button (x) hides a bar completely. You can get it back again

diff --git a/contrib/docs/latex/ogl/sample.tex b/contrib/docs/latex/ogl/sample.tex
index 4e0a437d3958f959789a3f1bdf80983ee9766856..da0c61325671846cd9f1d404181f03bb9aabccba 100644 (file)
--- a/contrib/docs/latex/ogl/sample.tex
+++ b/contrib/docs/latex/ogl/sample.tex
@@ -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
 Cut will only undo one command at a time - not a one to one
 correspondence with the original command - but it's a reasonable
 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
 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.
 
 \section{Possible enhancements}
 simple.
 
 \section{Possible enhancements}

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index 0475a8d8253cf3be8b7c9cdb379c925500f5eafd..a2055edd7c52316899fd348c273a10a8ce11d4b6 100644 (file)
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -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);
         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;
     }
         wxLogWarning(buf);
         return false;
     }


@@ -1845,28 +1845,28 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
     // char
     if (!wxGetResourceToken(fd))
     {
     // 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)
     {
         *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))
     {
         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] != '*')
     {
         *eof = true;
         return false;
     }
 
     if (wxResourceBuffer[0] != '*')
     {

-        wxLogWarning(_("Expected '*' whilst parsing resource."));
+        wxLogWarning(_("Expected '*' while parsing resource."));

         return false;
     }
     wxChar nameBuf[100];
         return false;
     }
     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;
         return false;
     }
 
     if (strcmp(wxResourceBuffer, "=") != 0)
     {
         *eof = true;
         return false;
     }
 
     if (strcmp(wxResourceBuffer, "=") != 0)
     {

-        wxLogWarning(_("Expected '=' whilst parsing resource."));
+        wxLogWarning(_("Expected '=' while parsing resource."));

         return false;
     }
 
     // String
     if (!wxGetResourceToken(fd))
     {
         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;
     }
         *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);
         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;
     }
         wxLogWarning(buf);
         return false;
     }


@@ -1975,28 +1975,28 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
     // char
     if (!wxGetResourceToken(fd))
     {
     // 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)
     {
         *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))
     {
         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] != '*')
     {
         *eof = true;
         return false;
     }
 
     if (wxResourceBuffer[0] != '*')
     {

-        wxLogWarning(_("Expected '*' whilst parsing resource."));
+        wxLogWarning(_("Expected '*' while parsing resource."));

         return false;
     }
     char nameBuf[100];
         return false;
     }
     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;
         return false;
     }
 
     if (strcmp(wxResourceBuffer, "=") != 0)
     {
         *eof = true;
         return false;
     }
 
     if (strcmp(wxResourceBuffer, "=") != 0)
     {

-        wxLogWarning(_("Expected '=' whilst parsing resource."));
+        wxLogWarning(_("Expected '=' while parsing resource."));

         return false;
     }
 
     // String
     if (!wxGetResourceToken(fd))
     {
         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;
     }
         *eof = true;
         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;
             }
             word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
                 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);
         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;
     }
         wxLogWarning(buf);
         return false;
     }


@@ -3067,28 +3067,28 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
     // char
     if (!wxGetResourceTokenString(s))
     {
     // 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)
     {
         *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))
     {
         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] != '*')
     {
         *eof = true;
         return false;
     }
 
     if (wxResourceBuffer[0] != '*')
     {

-        wxLogWarning(_("Expected '*' whilst parsing resource."));
+        wxLogWarning(_("Expected '*' while parsing resource."));

         return false;
     }
     wxChar nameBuf[100];
         return false;
     }
     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;
         return false;
     }
 
     if (strcmp(wxResourceBuffer, "=") != 0)
     {
         *eof = true;
         return false;
     }
 
     if (strcmp(wxResourceBuffer, "=") != 0)
     {

-        wxLogWarning(_("Expected '=' whilst parsing resource."));
+        wxLogWarning(_("Expected '=' while parsing resource."));

         return false;
     }
 
     // String
     if (!wxGetResourceTokenString(s))
     {
         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;
     }
         *eof = true;
         return false;
     }

diff --git a/contrib/src/ogl/mfutils.cpp b/contrib/src/ogl/mfutils.cpp
index 046a2164fd70af8356f81ed7aa1acbc450e514e2..e5fbccd33afd7b174fe1a30599933f24a2412d4e 100644 (file)
--- a/contrib/src/ogl/mfutils.cpp
+++ b/contrib/src/ogl/mfutils.cpp
@@ -111,7 +111,7 @@ wxXMetaFile::wxXMetaFile(const wxChar *file)
   [3]             | -> wxPen
 
  The handle table works as follows.
   [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
  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

diff --git a/docs/latex/wx/dc.tex b/docs/latex/wx/dc.tex
index febf46d1503fdbcec37f71441fc11ab1a433991e..ef70d00a79d3d7f82a290f3c0a664e2cff23b53e 100644 (file)
--- a/docs/latex/wx/dc.tex
+++ b/docs/latex/wx/dc.tex
@@ -1115,7 +1115,7 @@ Sets the user scaling factor, useful for applications which require
 \func{bool}{StartDoc}{\param{const wxString\& }{message}}
 
 Starts a document (only relevant when outputting to a printer).
 \func{bool}{StartDoc}{\param{const wxString\& }{message}}
 
 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}

diff --git a/utils/tex2rtf/docs/tex2rtf.tex b/utils/tex2rtf/docs/tex2rtf.tex
index f62b6c3bb57968690871ea0079d573115a1e095b..3e3696d4b145e0a76d51ca1094281c8ec79021b1 100644 (file)
--- a/utils/tex2rtf/docs/tex2rtf.tex
+++ b/utils/tex2rtf/docs/tex2rtf.tex
@@ -3273,7 +3273,7 @@ system on the Internet.
 
 A typesetting language implemented as a set of \TeX\ macros. It is
 distinguished for allowing specification of the document structure,
 
 A typesetting language implemented as a set of \TeX\ macros. It is
 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.
 
 \gloss{RTF}\label{rtf}
 end of the spectrum from WYSIWYG word processors.
 
 \gloss{RTF}\label{rtf}