Typo correction patch [ 1208110 ] Lots of typo corrections

Olly Betts git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:20:43 +00:00
parent a6905d8b55
commit 3103e8a97e
155 changed files with 279 additions and 371 deletions
--- a/build/bakefiles/wxpresets/bakefile_quickstart.txt
+++ b/build/bakefiles/wxpresets/bakefile_quickstart.txt
@@ -149,7 +149,7 @@ built. In Bakefile, you specify the target by creating a tag named with the
 target type. The possible names for targets are:

    exe         create an executable file
-    dll         create a shared libary
+    dll         create a shared library
    lib         create a static library
    module      create a library that is loaded at runtime (i.e. a plugin)

--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -34,7 +34,7 @@ FIXME: this template has (at least) the following bugs:
    <!--    In MSVC these are the different build                   -->
    <!--    configurations you can have (in the build menu),        -->
    <!--    and in autoconf is enabled with enable-xxx=xx.          -->
-    <!--    For other compilers a seperate configuration            -->
+    <!--    For other compilers a separate configuration            -->
    <!--    file is created (such as config.gcc on gcc)             -->
    <!--    which has several options a user can modify.            -->
    <!--                                                            -->
@@ -155,7 +155,7 @@ FIXME: this template has (at least) the following bugs:
    <!--                                                            -->
    <!--    The "base class" of all our build targets               -->
    <!--    This links with the appropriate native                  -->
-    <!--    libraries required by the platform, the libaries        -->
+    <!--    libraries required by the platform, the libraries       -->
    <!--    we want for our stuff, and the wxWindows libs.          -->


--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -109,11 +109,11 @@ def getVersion():
        major = minor = release = None
        for l in lines:
            if not l.startswith('#define'): continue
-            splitted = l.strip().split()
-            if splitted[0] != '#define': continue
-            if len(splitted) < 3: continue
-            name = splitted[1]
-            value = splitted[2]
+            splitline = l.strip().split()
+            if splitline[0] != '#define': continue
+            if len(splitline) < 3: continue
+            name = splitline[1]
+            value = splitline[2]
            if value == None: continue
            if name == 'wxMAJOR_VERSION': major = int(value)
            if name == 'wxMINOR_VERSION': minor = int(value)
--- a/configure.in
+++ b/configure.in
@@ -3296,7 +3296,7 @@ dnl ----------------------------------------------------------------
 IODBC_C_SRC=""


-dnl ODBC is handled seperately for MSW 
+dnl ODBC is handled separately for MSW 
 if test "$TOOLKIT" != "MSW" ; then

    if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
@@ -3468,7 +3468,7 @@ if test "$wxUSE_OPENGL" = "yes"; then

        if test "x$OPENGL_LIBS" = "x"; then
            dnl it should be an error and not a warning because OpenGL is not on
-            dnl by default and so if it had been explicitely requested, we
+            dnl by default and so if it had been explicitly requested, we
            dnl shouldn't just fall back to compiling the library without it
            AC_MSG_ERROR(OpenGL libraries not available)
        fi
--- a/contrib/docs/latex/mmedia/sndbase.tex
+++ b/contrib/docs/latex/mmedia/sndbase.tex
@@ -30,8 +30,8 @@ No base class

 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf wxSOUND\_NOERR}}{No error occured}
-\twocolitem{{\bf wxSOUND\_IOERR}}{An input/output error occured, it may concern
+\twocolitem{{\bf wxSOUND\_NOERR}}{No error occurred}
+\twocolitem{{\bf wxSOUND\_IOERR}}{An input/output error occurred, it may concern
 either a driver or a file}
 \twocolitem{{\bf wxSOUND\_INVFRMT}}{The sound format passed to the function is
 invalid. Generally, it means that you passed out of range values to the codec
@@ -271,7 +271,7 @@ Sets the event handler: if it is non-null, all events are routed to it.

 \constfunc{wxSoundError}{GetError}{\void}

-It returns the last error which occured.
+It returns the last error which occurred.

 \membersection{wxSoundStream::GetLastAccess}\label{wxsoundstreamgetlastaccess}

@@ -290,5 +290,5 @@ until the IO queue has at least one empty entry.

 \func{void}{OnSoundEvent}{\param{int }{evt}}

-It is called by the wxSoundStream when a new sound event occured.
+It is called by the wxSoundStream when a new sound event occurred.

--- a/contrib/include/wx/fl/controlbar.h
+++ b/contrib/include/wx/fl/controlbar.h
@@ -888,7 +888,7 @@ class cbBarInfo : public wxObject
 {
    DECLARE_DYNAMIC_CLASS( cbBarInfo )
 public:
-    // textual name, by which this bar is refered in layout-customization dialogs
+    // textual name, by which this bar is referred in layout-customization dialogs
    wxString      mName;

    // stores bar's bounds in pane's coordinates
--- a/contrib/include/wx/foldbar/captionbar.h
+++ b/contrib/include/wx/foldbar/captionbar.h
@@ -24,7 +24,7 @@

 #define wxFPB_EXTRA_X 10
 #define wxFPB_EXTRA_Y 4
-#define wxFPB_BMP_RIGHTSPACE 2    // pixels of the bmp to be alligned from the right filled with space
+#define wxFPB_BMP_RIGHTSPACE 2    // pixels of the bmp to be aligned from the right filled with space

 enum
 {
--- a/contrib/include/wx/foldbar/foldpanelbar.h
+++ b/contrib/include/wx/foldbar/foldpanelbar.h
@@ -96,7 +96,7 @@ WX_DEFINE_ARRAY_PTR(wxFoldPanelItem *, wxFoldPanelItemArray);

    This control is easy to use. Simply create it as a child for a panel or sash window, and populate panels with
    wxFoldPanelBar::AddFoldPanel(). Then use the wxFoldPanelBar::AddFoldPanelWindow() to add wxWindow derived controls
-    to the current fold panel. Use wxFoldPanelBar::AddFoldPanelSeperator() to put separators between the groups of
+    to the current fold panel. Use wxFoldPanelBar::AddFoldPanelSeparator() to put separators between the groups of
    controls that need a visual separator to group them together. After all is constructed, the user can fold
    the panels by doubleclicking on the bar or single click on the arrow, which will indicate the collapsed or
    expanded state.
@@ -125,12 +125,12 @@ private:
    void RefreshPanelsFrom(wxFoldPanelItem *item);

    /** Returns the length of the panels that are expanded and collapsed. This is useful to determine
-        quickly what size is used to display, and what is left at the bottom (right) to allign
+        quickly what size is used to display, and what is left at the bottom (right) to align
        the collapsed panels. */
    int GetPanelsLength(int &collapsed, int &expanded);

    /** Reposition all the collapsed panels to the bottom. When it is not possible to
-        allign them to the bottom, stick them behind the visible panels. The Rect holds the
+        align them to the bottom, stick them behind the visible panels. The Rect holds the
        slack area left between last repositioned panel and the bottom panels. This needs to
        get a refresh */
    wxRect RepositionCollapsedToBottom();
@@ -167,9 +167,9 @@ public:

    /** Adds a wxWindow derived class to the referenced wxFoldPanel. IMPORTANT: Make the to be created window,
        child of the wxFoldPanel. See example that follows. The flags to be used are:
-        - wxFPB_ALIGN_WIDTH: Which means the wxWindow to be added will be alligned to fit the width of the
+        - wxFPB_ALIGN_WIDTH: Which means the wxWindow to be added will be aligned to fit the width of the
          wxFoldPanel when it is resized. Very handy for sizer items, buttons and text boxes.
-        - wxFPB_ALIGN_LEFT: Alligns left instead of fitting the width of the child window to be added. Use either
+        - wxFPB_ALIGN_LEFT: Aligns left instead of fitting the width of the child window to be added. Use either
          this one or wxFPB_ALIGN_WIDTH.

        The wxWindow to be added can be slightly indented from left and right so it is more visibly placed
@@ -196,7 +196,7 @@ public:
            // color and also the indents and width alligning like a control.
            m_pnl->AddFoldPanelSeperator(item);

-            // now add a text ctrl. Also very easy. Allign this on width so that when the control gets wider
+            // now add a text ctrl. Also very easy. Align this on width so that when the control gets wider
            // the text control also sizes along.
            m_pnl->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, wxT("Comment")), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 20);

@@ -206,8 +206,8 @@ public:
                           int Spacing = wxFPB_DEFAULT_SPACING, int leftSpacing = wxFPB_DEFAULT_LEFTSPACING,
                           int rightSpacing = wxFPB_DEFAULT_RIGHTSPACING);

-    /** Adds a seperator line to the current wxFoldPanel. The seperator is a simple line which is drawn and is no
-        real component. It can be used to seperate groups of controls which belong to eachother. The colour is
+    /** Adds a separator line to the current wxFoldPanel. The separator is a simple line which is drawn and is no
+        real component. It can be used to separate groups of controls which belong to each other. The colour is
        adjustable, and it takes the same ySpacing, leftSpacing and rightSpacing as AddFoldPanelWindow(). */
    int AddFoldPanelSeperator(const wxFoldPanel &panel, const wxColour &color = wxColour(167,167,167),
                           int Spacing = wxFPB_DEFAULT_SPACING, int leftSpacing = wxFPB_DEFAULT_LEFTLINESPACING,
--- a/contrib/include/wx/foldbar/foldpanelitem.h
+++ b/contrib/include/wx/foldbar/foldpanelitem.h
@@ -121,13 +121,13 @@ public:
    };

    // resize the element, whatever it is. A separator or
-    // line will be always alligned by width or hight
+    // line will be always aligned by width or height
    // depending on orientation of the whole panel

    void ResizeItem(int size, bool vertical) {
        if(m_flags & wxFPB_ALIGN_WIDTH)
        {
-            // allign by taking full width
+            // align by taking full width
            int mySize = size - m_leftSpacing - m_rightSpacing;

            if(mySize < 0)
@@ -185,7 +185,7 @@ public:
    virtual ~wxFoldPanelItem();

    /** Add a window item to the list of items on this panel. The flags are wxFPB_ALIGN_LEFT for a non sizing
-        window element, and wxFPB_ALIGN_WIDTH for a width alligned item. The ySpacing parameter reserves a number
+        window element, and wxFPB_ALIGN_WIDTH for a width aligned item. The ySpacing parameter reserves a number
        of pixels before the window element, and leftSpacing is an indent. rightSpacing is only relevant when the
        style wxFPB_ALIGN_WIDTH is chosen. */
    void AddWindow(wxWindow *window, int flags, int ySpacing, int leftSpacing, int rightSpacing);
--- a/contrib/include/wx/mmedia/sndbase.h
+++ b/contrib/include/wx/mmedia/sndbase.h
@@ -45,8 +45,8 @@ typedef enum {

 // ---------------------
 // wxSoundError:
-//   - wxSOUND_NOERR: No error occured
-//   - wxSOUND_IOERR: an input/output error occured, it may concern either
+//   - wxSOUND_NOERR: No error occurred
+//   - wxSOUND_IOERR: an input/output error occurred, it may concern either
 //                    a driver or a file
 //   - wxSOUND_INVFRMT: the sound format passed to the function is invalid.
 //                      Generally, it means that you passed out of range values
@@ -83,7 +83,7 @@ class WXDLLIMPEXP_MMEDIA wxSoundStream;
 // ---------------------
 // wxSoundCallback(stream, evt, cdata): C callback for sound event.
 //    - stream: current wxSoundStream
-//    - evt: the sound event which has occured, it may be wxSOUND_INPUT,
+//    - evt: the sound event which has occurred, it may be wxSOUND_INPUT,
 //            wxSOUND_OUTPUT or wxSOUND_DUPLEX
 //    - cdata: User callback data
 // ---------------------
--- a/contrib/src/fl/dyntbar.cpp
+++ b/contrib/src/fl/dyntbar.cpp
@@ -426,7 +426,7 @@ void wxDynamicToolBar::SizeToolWindows()
                info.mRect.height = mSepartorSize;
            }

-            // Do we need to set a new size to a seperator object?
+            // Do we need to set a new size to a separator object?
            if ( info.mpToolWnd )
            {
                info.mpToolWnd->SetSize( info.mRect.x,
--- a/contrib/src/mmedia/sndcpcm.cpp
+++ b/contrib/src/mmedia/sndcpcm.cpp
@@ -377,7 +377,7 @@ bool wxSoundStreamPcm::SetSoundFormat(const wxSoundFormatBase& format)
    if (m_prebuffer)
        delete[] m_prebuffer;

-    // We try to minimize the need of dynamic memory allocation by preallocating a buffer. But
+    // We try to minimize the need for dynamic memory allocation by preallocating a buffer. But
    // to be sure it will be efficient we minimize the best size.
    if (m_multiplier_in < m_multiplier_out) {
        m_prebuffer_size = (wxUint32)(m_sndio->GetBestSize() *
--- a/contrib/src/mmedia/sndwin.cpp
+++ b/contrib/src/mmedia/sndwin.cpp
@@ -382,7 +382,7 @@ wxSoundInfoHeader *wxSoundStreamWin::AllocHeader(int mode)
 // AllocHeaders() allocates WXSOUND_MAX_QUEUE (= 128) blocks for an operation
 // queue. It uses AllocHeader() for each element.
 //
-// Once it has allocated all blocks, it returns true and if an error occured
+// Once it has allocated all blocks, it returns true and if an error occurred
 // it returns false.
 // -------------------------------------------------------------------------
 bool wxSoundStreamWin::AllocHeaders(int mode)
--- a/contrib/src/stc/scintilla/src/AutoComplete.h
+++ b/contrib/src/stc/scintilla/src/AutoComplete.h
@@ -15,7 +15,7 @@ class AutoComplete {
 	char stopChars[256];
 	char fillUpChars[256];
 	char separator;
-	char typesep; // Type seperator
+	char typesep; // Type separator

 public:
 	bool ignoreCase;
@@ -50,7 +50,7 @@ public:
 	void SetSeparator(char separator_);
 	char GetSeparator();

-	/// The typesep character is used for seperating the word from the type
+	/// The typesep character is used for separating the word from the type
 	void SetTypesep(char separator_);
 	char GetTypesep();

--- a/contrib/src/stc/scintilla/src/LexMetapost.cxx
+++ b/contrib/src/stc/scintilla/src/LexMetapost.cxx
@@ -160,8 +160,8 @@ static void ColouriseMETAPOSTDoc(
 	int currentInterface = CheckMETAPOSTInterface(startPos,length,styler,defaultInterface) ;

 	// 0  no keyword highlighting
-	// 1  metapost keyword hightlighting
-	// 2+ metafun keyword hightlighting
+	// 1  metapost keyword highlighting
+	// 2+ metafun keyword highlighting

 	int extraInterface = 0 ;

--- a/contrib/utils/convertrc/rc2wxr.cpp
+++ b/contrib/utils/convertrc/rc2wxr.cpp
@@ -399,7 +399,7 @@ wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],



-bool rc2wxr::Seperator(int ch)
+bool rc2wxr::Separator(int ch)

 {

@@ -513,7 +513,7 @@ return tok;



-while (Seperator(ch))
+while (Separator(ch))

 {

@@ -541,7 +541,7 @@ m_done=true;



-while (!Seperator(ch))
+while (!Separator(ch))

 {

--- a/contrib/utils/convertrc/rc2wxr.h
+++ b/contrib/utils/convertrc/rc2wxr.h
@@ -30,7 +30,7 @@ private:
    void ParseStaticText();
    void ParseTextCtrl();
    void ParsePushButton();
-    bool Seperator(int ch);
+    bool Separator(int ch);
    void ParseGroupBox();
    void ReadRect(int & x, int & y, int & width, int & height);
    wxString GetToken();
--- a/contrib/utils/convertrc/rc2xml.cpp
+++ b/contrib/utils/convertrc/rc2xml.cpp
@@ -342,7 +342,7 @@ void rc2xml::ParsePushButton(wxString phrase, wxString varname)
 }


-bool rc2xml::Seperator(int ch)
+bool rc2xml::Separator(int ch)
 {
 //if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|')|(ch=='\t'))
    if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='\t'))
@@ -387,7 +387,7 @@ bool rc2xml::ReadRect(int & x, int & y, int & width, int & height)
    return ret; // check for more parameters
 }

-wxString rc2xml::GetToken(bool *listseperator)
+wxString rc2xml::GetToken(bool *listseparator)
 {
    wxString token=wxEmptyString;

@@ -405,7 +405,7 @@ wxString rc2xml::GetToken(bool *listseperator)
    return token;
    }

-    while (Seperator(ch))
+    while (Separator(ch))
    {
    ReadChar(ch);
    if (m_done)
@@ -418,7 +418,7 @@ wxString rc2xml::GetToken(bool *listseperator)
    }


-    while (!Seperator(ch))
+    while (!Separator(ch))
    {
    token += (char)ch;
    ReadChar(ch);
@@ -427,8 +427,8 @@ wxString rc2xml::GetToken(bool *listseperator)
    if (ch == EOF)
        m_done = true;

-    if (listseperator)
-      *listseperator = (ch == ',');
+    if (listseparator)
+      *listseparator = (ch == ',');
    return token;
 }

--- a/contrib/utils/convertrc/rc2xml.h
+++ b/contrib/utils/convertrc/rc2xml.h
@@ -62,10 +62,10 @@ protected:
    void ParseRadioButton(wxString phrase,wxString varname);
    void ParseCheckBox(wxString phrase,wxString varname);
    void ParsePushButton(wxString phrase, wxString varname);
-    bool Seperator(int ch);
+    bool Separator(int ch);
    void ParseGroupBox(wxString phrase, wxString varname);
    bool ReadRect(int & x, int & y, int & width, int & height);
-    wxString GetToken(bool *listseperator = 0);
+    wxString GetToken(bool *listseparator = 0);
    wxString GetQuoteField();
    wxString GetStringQuote();
    void ReadChar(int &ch);
--- a/demos/bombs/readme.txt
+++ b/demos/bombs/readme.txt
@@ -7,7 +7,7 @@ under MSWindows 3.1+. Later the rules of the game will be explained for
 the lucky ones of you that have never used Windows.

 2. Installation
-If you are reading this file, I suppose you have succesfully unpacked the
+If you are reading this file, I suppose you have successfully unpacked the
 files in a directory of your hard disk :-). You should already have
 installed wxWin on your system.
 Now you have to modify makefile.bcc
--- a/demos/dbbrowse/browsedb.cpp
+++ b/demos/dbbrowse/browsedb.cpp
@@ -57,7 +57,7 @@ wxChar *GetExtendedDBErrorMsg(wxChar *ErrFile, int ErrLine)
    msg.Append (_T("\nODBC errors:\n"));
    // msg += _T("\n");
    /* Scan through each database connection displaying
-    * any ODBC errors that have occured. */
+    * any ODBC errors that have occurred. */
    wxDbList *pDbList;
    for (pDbList = PtrBegDbList; pDbList; pDbList = pDbList->PtrNext)
    {
--- a/demos/dbbrowse/dbbrowse.cpp
+++ b/demos/dbbrowse/dbbrowse.cpp
@@ -235,7 +235,7 @@ bool MainApp::OnInit(void)  // Does everything needed for a program start
    frame->pDoc->p_Splitter           = frame->p_Splitter;
    frame->pDoc->p_Splitter->pDoc     = frame->pDoc;       // ControlBase: saving the Sash
    //---------------------------------------------------------------------------------------
-    //-- Problem : GetClientSize(Width,Hight) are not the same as the values given in the ---
+    //-- Problem : GetClientSize(Width,Height) are not the same as the values given in the ---
    //--            construction of the Frame.                                            ---
    //-- Solved  : GetClientSize is called here and the difference is noted. When the     ---
    //--           Window is closed the diff. is added to the result of GetClientSize.    ---
--- a/demos/dbbrowse/de/dbbrowse.po
+++ b/demos/dbbrowse/de/dbbrowse.po
@@ -94,7 +94,7 @@ msgstr  "\n"

 #: ../browsedb.cpp:117
 msgid   "\n"
-        "-E-> BrowserDB::OnStartDB() : DB CONNECTION ERROR : A problem occured while trying to get a connection to the data source"
+        "-E-> BrowserDB::OnStartDB() : DB CONNECTION ERROR : A problem occurred while trying to get a connection to the data source"
 msgstr  "\n"
        "-E-> BrowserDB::OnStartDB() : DB VERBINDUNGSFEHLER : Verbindungsaufbau zur Datenquelle nicht m<>glich"

@@ -300,7 +300,7 @@ msgid   "-E-> unknown Format(%d) - sql(%d)"
 msgstr  "-E-> unbekannte Format(%d) - sql(%d)"

 #: ../pgmctrl.cpp:165
-msgid   "-E-> wxConfigBase.p_ProgramCfg->DeleteAll() was not succesfull !"
+msgid   "-E-> wxConfigBase.p_ProgramCfg->DeleteAll() was not successful !"
 msgstr  "-E-> wxConfigBase.p_ProgramCfg->DeleteAll() war nicht Erfolgreich !"

 #: ../pgmctrl.cpp:149
@@ -365,7 +365,7 @@ msgid   "-I-> PgmCtrl::OnSelChanged - %s"
 msgstr  "-I-> PgmCtrl::OnSelChanged - %s"

 #: ../pgmctrl.cpp:163
-msgid   "-I-> wxConfigBase.p_ProgramCfg->DeleteAll() was succesfull."
+msgid   "-I-> wxConfigBase.p_ProgramCfg->DeleteAll() was successful."
 msgstr  "-I-> wxConfigBase.p_ProgramCfg->DeleteAll() war Erfolgreich !"

 #: ../dbbrowse.cpp:115 ../dbbrowse.cpp:175
--- a/demos/dbbrowse/pgmctrl.cpp
+++ b/demos/dbbrowse/pgmctrl.cpp
@@ -166,9 +166,9 @@ void PgmCtrl::OnSelChanged(wxMouseEvent& WXUNUSED(event))
        if (Temp1 == _T("wxConfigBase Delete"))
        {
            if (p_ProgramCfg->DeleteAll()) // Default Diretory for wxFileSelector
-                Temp0 = _("-I-> wxConfigBase.p_ProgramCfg->DeleteAll() was succesfull.");
+                Temp0 = _("-I-> wxConfigBase.p_ProgramCfg->DeleteAll() was successful.");
            else
-                Temp0 = _("-E-> wxConfigBase.p_ProgramCfg->DeleteAll() was not succesfull !");
+                Temp0 = _("-E-> wxConfigBase.p_ProgramCfg->DeleteAll() was not successful !");
            wxBell();     // Ding_a_Ling
            Treffer++;
        }
--- a/distrib/msw/contrib.rsp
+++ b/distrib/msw/contrib.rsp
@@ -63,7 +63,6 @@ contrib/include/wx/animate/*.h

 contrib/samples/animate/*.cpp
 contrib/samples/animate/*.h
-contrib/samples/animate/*.def
 contrib/samples/animate/makefile*
 contrib/samples/animate/*.xbm
 contrib/samples/animate/*.xpm
@@ -86,7 +85,6 @@ contrib/include/wx/applet/*.rc

 contrib/samples/applet/*.cpp
 contrib/samples/applet/*.h
-contrib/samples/applet/*.def
 contrib/samples/applet/makefile*
 contrib/samples/applet/*.xbm
 contrib/samples/applet/*.xpm
@@ -106,7 +104,6 @@ contrib/include/wx/deprecated/*.h

 contrib/samples/deprecated/proplist/*.cpp
 contrib/samples/deprecated/proplist/*.h
-contrib/samples/deprecated/proplist/*.def
 contrib/samples/deprecated/proplist/makefile*
 contrib/samples/deprecated/proplist/*.xbm
 contrib/samples/deprecated/proplist/*.xpm
@@ -121,7 +118,6 @@ contrib/samples/deprecated/proplist/*.bkl

 contrib/samples/deprecated/resource/*.cpp
 contrib/samples/deprecated/resource/*.h
-contrib/samples/deprecated/resource/*.def
 contrib/samples/deprecated/resource/makefile*
 contrib/samples/deprecated/resource/*.xbm
 contrib/samples/deprecated/resource/*.xpm
@@ -136,7 +132,6 @@ contrib/samples/deprecated/resource/*.bkl

 contrib/samples/deprecated/treelay/*.cpp
 contrib/samples/deprecated/treelay/*.h
-contrib/samples/deprecated/treelay/*.def
 contrib/samples/deprecated/treelay/makefile*
 contrib/samples/deprecated/treelay/*.xbm
 contrib/samples/deprecated/treelay/*.xpm
@@ -159,7 +154,6 @@ contrib/samples/fl/bitmaps/*.bmp
 contrib/samples/fl/bitmaps/*.xpm
 contrib/samples/fl/*.cpp
 contrib/samples/fl/*.h
-contrib/samples/fl/*.def
 contrib/samples/fl/*.xbm
 contrib/samples/fl/*.xpm
 contrib/samples/fl/*.txt
@@ -178,7 +172,6 @@ contrib/include/wx/gizmos/*.h

 contrib/samples/gizmos/dynsash/*.cpp
 contrib/samples/gizmos/dynsash/*.h
-contrib/samples/gizmos/dynsash/*.def
 contrib/samples/gizmos/dynsash/makefile*
 contrib/samples/gizmos/dynsash/*.xbm
 contrib/samples/gizmos/dynsash/*.xpm
@@ -192,7 +185,6 @@ contrib/samples/gizmos/dynsash/*.bkl

 contrib/samples/gizmos/dynsash_switch/*.cpp
 contrib/samples/gizmos/dynsash_switch/*.h
-contrib/samples/gizmos/dynsash_switch/*.def
 contrib/samples/gizmos/dynsash_switch/makefile*
 contrib/samples/gizmos/dynsash_switch/*.xbm
 contrib/samples/gizmos/dynsash_switch/*.xpm
@@ -206,7 +198,6 @@ contrib/samples/gizmos/dynsash_switch/*.bkl

 contrib/samples/gizmos/editlbox/*.cpp
 contrib/samples/gizmos/editlbox/*.h
-contrib/samples/gizmos/editlbox/*.def
 contrib/samples/gizmos/editlbox/makefile*
 contrib/samples/gizmos/editlbox/*.xbm
 contrib/samples/gizmos/editlbox/*.xpm
@@ -220,7 +211,6 @@ contrib/samples/gizmos/editlbox/*.bkl

 contrib/samples/gizmos/led/*.cpp
 contrib/samples/gizmos/led/*.h
-contrib/samples/gizmos/led/*.def
 contrib/samples/gizmos/led/makefile*
 contrib/samples/gizmos/led/*.xbm
 contrib/samples/gizmos/led/*.xpm
@@ -234,7 +224,6 @@ contrib/samples/gizmos/led/*.bkl

 contrib/samples/gizmos/multicell/*.cpp
 contrib/samples/gizmos/multicell/*.h
-contrib/samples/gizmos/multicell/*.def
 contrib/samples/gizmos/multicell/makefile*
 contrib/samples/gizmos/multicell/*.xbm
 contrib/samples/gizmos/multicell/*.xpm
@@ -248,7 +237,6 @@ contrib/samples/gizmos/multicell/*.bkl

 contrib/samples/gizmos/splittree/*.cpp
 contrib/samples/gizmos/splittree/*.h
-contrib/samples/gizmos/splittree/*.def
 contrib/samples/gizmos/splittree/makefile*
 contrib/samples/gizmos/splittree/*.xbm
 contrib/samples/gizmos/splittree/*.xpm
@@ -269,7 +257,6 @@ contrib/include/wx/plot/*.rc

 contrib/samples/plot/*.cpp
 contrib/samples/plot/*.h
-contrib/samples/plot/*.def
 contrib/samples/plot/makefile*
 contrib/samples/plot/*.xbm
 contrib/samples/plot/*.xpm
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -166,7 +166,6 @@ utils/configure.in

 utils/hhp2cached/*.h
 utils/hhp2cached/*.cpp
-utils/hhp2cached/*.def
 utils/hhp2cached/*.rc
 utils/hhp2cached/makefile*
 utils/hhp2cached/*.bkl
@@ -184,7 +183,6 @@ samples/*.xpm

 samples/access/*.cpp
 samples/access/*.h
-samples/access/*.def
 samples/access/makefile*
 samples/access/*.xbm
 samples/access/*.xpm
@@ -195,7 +193,6 @@ samples/access/*.bkl

 samples/artprov/*.cpp
 samples/artprov/*.h
-samples/artprov/*.def
 samples/artprov/makefile*
 samples/artprov/*.xbm
 samples/artprov/*.xpm
@@ -211,7 +208,6 @@ samples/calendar/*.cpp
 samples/calendar/*.h
 samples/calendar/makefile*
 samples/calendar/*.rc
-samples/calendar/*.def
 samples/calendar/*.ico
 samples/calendar/*.xpm
 samples/calendar/*.txt
@@ -222,7 +218,6 @@ samples/caret/*.cpp
 samples/caret/*.h
 samples/caret/makefile*
 samples/caret/*.rc
-samples/caret/*.def
 samples/caret/*.bmp
 samples/caret/*.xpm
 samples/caret/*.xbm
@@ -234,7 +229,6 @@ samples/caret/*.bkl

 samples/checklst/*.cpp
 samples/checklst/*.h
-samples/checklst/*.def
 samples/checklst/*.rc
 samples/checklst/*.txt
 samples/checklst/makefile*
@@ -247,7 +241,6 @@ samples/checklst/*.bkl

 samples/config/*.cpp
 samples/config/*.h
-samples/config/*.def
 samples/config/makefile*
 samples/config/*.xbm
 samples/config/*.xpm
@@ -264,7 +257,6 @@ samples/console/*.cpp
 samples/console/*.h
 samples/console/makefile*
 samples/console/*.rc
-samples/console/*.def
 samples/console/*.bmp
 samples/console/*.xpm
 samples/console/*.xbm
@@ -276,7 +268,6 @@ samples/console/*.bkl

 samples/controls/*.cpp
 samples/controls/*.h
-samples/controls/*.def
 samples/controls/makefile*
 samples/controls/*.xbm
 samples/controls/*.xpm
@@ -293,7 +284,6 @@ samples/dialup/*.cpp
 samples/dialup/*.h
 samples/dialup/makefile*
 samples/dialup/*.rc
-samples/dialup/*.def
 samples/dialup/*.bmp
 samples/dialup/*.xpm
 samples/dialup/*.xbm
@@ -307,7 +297,6 @@ samples/display/*.cpp
 samples/display/*.h
 samples/display/makefile*
 samples/display/*.rc
-samples/display/*.def
 samples/display/*.bmp
 samples/display/*.xpm
 samples/display/*.xbm
@@ -319,7 +308,6 @@ samples/display/*.bkl

 samples/db/*.cpp
 samples/db/*.h
-samples/db/*.def
 samples/db/makefile*
 samples/db/*.xbm
 samples/db/*.xpm
@@ -333,7 +321,6 @@ samples/db/*.bkl

 samples/debugrpt/*.cpp
 samples/debugrpt/*.h
-samples/debugrpt/*.def
 samples/debugrpt/makefile*
 samples/debugrpt/*.xbm
 samples/debugrpt/*.xpm
@@ -349,7 +336,6 @@ samples/dnd/*.h
 samples/dnd/makefile*
 samples/dnd/*.rc
 samples/dnd/*.wxr
-samples/dnd/*.def
 samples/dnd/*.bmp
 samples/dnd/*.xbm
 samples/dnd/*.xpm
@@ -364,7 +350,6 @@ samples/drawing/*.cpp
 samples/drawing/*.h
 samples/drawing/makefile*
 samples/drawing/*.rc
-samples/drawing/*.def
 samples/drawing/*.bmp
 samples/drawing/*.xpm
 samples/drawing/*.xbm
@@ -376,7 +361,6 @@ samples/drawing/*.bkl

 samples/dialogs/*.h
 samples/dialogs/*.cpp
-samples/dialogs/*.def
 samples/dialogs/*.rc
 samples/dialogs/makefile*
 samples/dialogs/*.xbm
@@ -389,7 +373,6 @@ samples/dialogs/*.bkl

 samples/docview/*.h
 samples/docview/*.cpp
-samples/docview/*.def
 samples/docview/*.rc
 samples/docview/makefile*
 samples/docview/*.xbm
@@ -403,7 +386,6 @@ samples/docview/*.r

 samples/docvwmdi/*.h
 samples/docvwmdi/*.cpp
-samples/docvwmdi/*.def
 samples/docvwmdi/*.rc
 samples/docvwmdi/makefile*
 samples/docvwmdi/*.xbm
@@ -418,7 +400,6 @@ samples/dragimag/*.cpp
 samples/dragimag/*.h
 samples/dragimag/makefile*
 samples/dragimag/*.rc
-samples/dragimag/*.def
 samples/dragimag/*.ico
 samples/dragimag/*.xpm
 samples/dragimag/*.png
@@ -428,7 +409,6 @@ samples/dragimag/*.bkl

 samples/dynamic/*.cpp
 samples/dynamic/*.h
-samples/dynamic/*.def
 samples/dynamic/makefile*
 samples/dynamic/*.xbm
 samples/dynamic/*.xpm
@@ -442,7 +422,6 @@ samples/dynamic/*.bkl

 samples/erase/*.cpp
 samples/erase/*.h
-samples/erase/*.def
 samples/erase/makefile*
 samples/erase/*.xbm
 samples/erase/*.xpm
@@ -456,7 +435,6 @@ samples/erase/*.bkl

 samples/event/*.cpp
 samples/event/*.h
-samples/event/*.def
 samples/event/*.rc
 samples/event/*.inf
 samples/event/*.txt
@@ -472,7 +450,6 @@ samples/except/*.cpp
 samples/except/*.h
 samples/except/makefile*
 samples/except/*.rc
-samples/except/*.def
 samples/except/*.ico
 samples/except/*.xpm
 samples/except/*.txt
@@ -483,7 +460,6 @@ samples/exec/*.cpp
 samples/exec/*.h
 samples/exec/makefile*
 samples/exec/*.rc
-samples/exec/*.def
 samples/exec/*.ico
 samples/exec/*.xpm
 samples/exec/*.txt
@@ -494,7 +470,6 @@ samples/font/*.cpp
 samples/font/*.h
 samples/font/makefile*
 samples/font/*.rc
-samples/font/*.def
 samples/font/*.bmp
 samples/font/*.xpm
 samples/font/*.xbm
@@ -506,7 +481,6 @@ samples/font/*.bkl

 samples/grid/*.cpp
 samples/grid/*.h
-samples/grid/*.def
 samples/grid/*.rc
 samples/grid/*.txt
 samples/grid/makefile*
@@ -519,7 +493,6 @@ samples/grid/*.bkl

 samples/help/*.cpp
 samples/help/*.h
-samples/help/*.def
 samples/help/makefile*
 samples/help/*.xbm
 samples/help/*.xpm
@@ -551,7 +524,6 @@ samples/help/*.bkl

 samples/htlbox/*.cpp
 samples/htlbox/*.h
-samples/htlbox/*.def
 samples/htlbox/makefile*
 samples/htlbox/*.xpm
 samples/htlbox/*.ico
@@ -567,7 +539,6 @@ samples/html/about/*.cpp
 samples/html/about/*.h
 samples/html/about/makefile*
 samples/html/about/*.rc
-samples/html/about/*.def
 samples/html/about/*.bmp
 samples/html/about/*.xpm
 samples/html/about/*.xbm
@@ -583,7 +554,6 @@ samples/html/help/*.cpp
 samples/html/help/*.h
 samples/html/help/makefile*
 samples/html/help/*.rc
-samples/html/help/*.def
 samples/html/help/*.bmp
 samples/html/help/*.xpm
 samples/html/help/*.xbm
@@ -601,7 +571,6 @@ samples/html/htmlctrl/*.cpp
 samples/html/htmlctrl/*.h
 samples/html/htmlctrl/makefile*
 samples/html/htmlctrl/*.rc
-samples/html/htmlctrl/*.def
 samples/html/htmlctrl/*.bmp
 samples/html/htmlctrl/*.xpm
 samples/html/htmlctrl/*.xbm
@@ -616,7 +585,6 @@ samples/html/printing/*.h
 samples/html/printing/makefile*
 samples/html/printing/*.rc
 samples/html/printing/*.pro
-samples/html/printing/*.def
 samples/html/printing/*.bmp
 samples/html/printing/*.xpm
 samples/html/printing/*.xbm
@@ -630,7 +598,6 @@ samples/html/test/*.cpp
 samples/html/test/*.h
 samples/html/test/makefile*
 samples/html/test/*.rc
-samples/html/test/*.def
 samples/html/test/*.bmp
 samples/html/test/*.xpm
 samples/html/test/*.xbm
@@ -646,7 +613,6 @@ samples/html/virtual/*.cpp
 samples/html/virtual/*.h
 samples/html/virtual/makefile*
 samples/html/virtual/*.rc
-samples/html/virtual/*.def
 samples/html/virtual/*.bmp
 samples/html/virtual/*.xpm
 samples/html/virtual/*.xbm
@@ -661,7 +627,6 @@ samples/html/widget/*.cpp
 samples/html/widget/*.h
 samples/html/widget/makefile*
 samples/html/widget/*.rc
-samples/html/widget/*.def
 samples/html/widget/*.bmp
 samples/html/widget/*.xpm
 samples/html/widget/*.xbm
@@ -676,7 +641,6 @@ samples/html/zip/*.cpp
 samples/html/zip/*.h
 samples/html/zip/makefile*
 samples/html/zip/*.rc
-samples/html/zip/*.def
 samples/html/zip/*.bmp
 samples/html/zip/*.xpm
 samples/html/zip/*.xbm
@@ -692,7 +656,6 @@ samples/html/helpview/*.cpp
 samples/html/helpview/*.h
 samples/html/helpview/makefile*
 samples/html/helpview/*.rc
-samples/html/helpview/*.def
 samples/html/helpview/*.bmp
 samples/html/helpview/*.xpm
 samples/html/helpview/*.xbm
@@ -709,7 +672,6 @@ samples/image/*.cpp
 samples/image/*.h
 samples/image/makefile*
 samples/image/*.rc
-samples/image/*.def
 samples/image/*.bmp
 samples/image/*.xpm
 samples/image/*.xbm
@@ -728,7 +690,6 @@ samples/image/*.bkl

 samples/internat/*.cpp
 samples/internat/*.h
-samples/internat/*.def
 samples/internat/*.rc
 samples/internat/*.txt
 samples/internat/makefile*
@@ -773,7 +734,6 @@ samples/ipc/server.dos
 samples/ipc/client.g95
 samples/ipc/server.g95
 samples/ipc/*.rc
-samples/ipc/*.def
 samples/ipc/*.bmp
 samples/ipc/*.xpm
 samples/ipc/*.xbm
@@ -785,7 +745,6 @@ samples/ipc/*.bkl

 samples/joytest/*.h
 samples/joytest/*.cpp
-samples/joytest/*.def
 samples/joytest/*.rc
 samples/joytest/makefile.*
 samples/joytest/*.txt
@@ -796,7 +755,6 @@ samples/joytest/*.bkl

 samples/keyboard/*.cpp
 samples/keyboard/*.h
-samples/keyboard/*.def
 samples/keyboard/*.rc
 samples/keyboard/*.txt
 samples/keyboard/makefile*
@@ -809,7 +767,6 @@ samples/keyboard/*.bkl

 samples/layout/*.cpp
 samples/layout/*.h
-samples/layout/*.def
 samples/layout/makefile*
 samples/layout/*.xbm
 samples/layout/*.xpm
@@ -821,7 +778,6 @@ samples/layout/*.bkl

 samples/listbox/*.cpp
 samples/listbox/*.h
-samples/listbox/*.def
 samples/listbox/*.rc
 samples/listbox/*.txt
 samples/listbox/makefile*
@@ -830,7 +786,6 @@ samples/listbox/*.bkl

 samples/listctrl/*.cpp
 samples/listctrl/*.h
-samples/listctrl/*.def
 samples/listctrl/*.rc
 samples/listctrl/*.txt
 samples/listctrl/makefile*
@@ -847,7 +802,6 @@ samples/listctrl/*.bkl

 samples/mdi/*.cpp
 samples/mdi/*.h
-samples/mdi/*.def
 samples/mdi/makefile*
 samples/mdi/*.xbm
 samples/mdi/*.xpm
@@ -862,7 +816,6 @@ samples/mdi/*.bkl

 samples/mediaplayer/*.cpp
 samples/mediaplayer/*.h
-samples/mediaplayer/*.def
 samples/mediaplayer/makefile*
 samples/mediaplayer/*.xbm
 samples/mediaplayer/*.xpm
@@ -874,7 +827,6 @@ samples/menu/*.cpp
 samples/menu/*.h
 samples/menu/makefile*
 samples/menu/*.rc
-samples/menu/*.def
 samples/menu/*.bmp
 samples/menu/*.xpm
 samples/menu/*.xbm
@@ -886,7 +838,6 @@ samples/menu/*.bkl

 samples/memcheck/*.h
 samples/memcheck/*.cpp
-samples/memcheck/*.def
 samples/memcheck/*.rc
 samples/memcheck/makefile*
 samples/memcheck/*.xbm
@@ -899,7 +850,6 @@ samples/memcheck/*.bkl

 samples/minimal/*.cpp
 samples/minimal/*.h
-samples/minimal/*.def
 samples/minimal/makefile*
 samples/minimal/*.xbm
 samples/minimal/*.xpm
@@ -911,7 +861,6 @@ samples/minimal/*.r

 samples/minifram/*.h
 samples/minifram/*.cpp
-samples/minifram/*.def
 samples/minifram/*.rc
 samples/minifram/makefile*
 samples/minifram/*.xbm
@@ -940,7 +889,6 @@ samples/mobile/*.bkl

 samples/multimon/*.h
 samples/multimon/*.cpp
-samples/multimon/*.def
 samples/multimon/*.rc
 samples/multimon/makefile*
 samples/multimon/*.xbm
@@ -955,7 +903,6 @@ samples/notebook/*.cpp
 samples/notebook/*.h
 samples/notebook/makefile*
 samples/notebook/*.rc
-samples/notebook/*.def
 samples/notebook/*.bmp
 samples/notebook/*.xbm
 samples/notebook/*.xpm
@@ -966,7 +913,6 @@ samples/notebook/*.bkl

 samples/odbc/*.h
 samples/odbc/*.cpp
-samples/odbc/*.def
 samples/odbc/*.rc
 samples/odbc/makefile*
 samples/odbc/*.inf
@@ -1030,7 +976,6 @@ samples/popup/*.cpp
 samples/popup/*.h
 samples/popup/makefile*
 samples/popup/*.rc
-samples/popup/*.def
 samples/popup/*.bmp
 samples/popup/*.xpm
 samples/popup/*.ico
@@ -1041,7 +986,6 @@ samples/popup/*.bkl

 samples/printing/*.cpp
 samples/printing/*.h
-samples/printing/*.def
 samples/printing/makefile*
 samples/printing/*.xbm
 samples/printing/*.xpm
@@ -1055,7 +999,6 @@ samples/printing/*.bkl

 samples/propsize/*.cpp
 samples/propsize/*.h
-samples/propsize/*.def
 samples/propsize/makefile*
 samples/propsize/*.xbm
 samples/propsize/*.xpm
@@ -1067,7 +1010,6 @@ samples/propsize/*.bkl

 samples/render/*.cpp
 samples/render/*.h
-samples/render/*.def
 samples/render/makefile*
 samples/render/*.xbm
 samples/render/*.xpm
@@ -1079,7 +1021,6 @@ samples/render/*.bkl

 samples/richedit/*.cpp
 samples/richedit/*.h
-samples/richedit/*.def
 samples/richedit/makefile*
 samples/richedit/*.xbm
 samples/richedit/*.xpm
@@ -1095,17 +1036,15 @@ samples/rotate/*.cpp
 samples/rotate/*.h
 samples/rotate/makefile*
 samples/rotate/*.rc
-samples/rotate/*.def
 samples/rotate/*.ico
 samples/rotate/*.xpm
 samples/rotate/*.txt
-samples/rotate/*.bmp
+samples/rotate/*.png
 samples/rotate/*.pro
 samples/rotate/*.bkl

 samples/sashtest/*.cpp
 samples/sashtest/*.h
-samples/sashtest/*.def
 samples/sashtest/*.rc
 samples/sashtest/*.txt
 samples/sashtest/makefile*
@@ -1119,7 +1058,6 @@ samples/scroll/*.cpp
 samples/scroll/*.h
 samples/scroll/makefile*
 samples/scroll/*.rc
-samples/scroll/*.def
 samples/scroll/*.bmp
 samples/scroll/*.xpm
 samples/scroll/*.xbm
@@ -1133,7 +1071,6 @@ samples/scrollsub/*.cpp
 samples/scrollsub/*.h
 samples/scrollsub/makefile*
 samples/scrollsub/*.rc
-samples/scrollsub/*.def
 samples/scrollsub/*.bmp
 samples/scrollsub/*.xpm
 samples/scrollsub/*.xbm
@@ -1147,7 +1084,6 @@ samples/shaped/*.cpp
 samples/shaped/*.h
 samples/shaped/makefile*
 samples/shaped/*.rc
-samples/shaped/*.def
 samples/shaped/*.bmp
 samples/shaped/*.xpm
 samples/shaped/*.xbm
@@ -1159,7 +1095,6 @@ samples/shaped/*.bkl

 samples/splash/*.h
 samples/splash/*.cpp
-samples/splash/*.def
 samples/splash/*.rc
 samples/splash/makefile*
 samples/splash/*.xbm
@@ -1174,7 +1109,6 @@ samples/splash/*.bkl

 samples/splitter/*.cpp
 samples/splitter/*.h
-samples/splitter/*.def
 samples/splitter/*.rc
 samples/splitter/*.txt
 samples/splitter/makefile*
@@ -1187,7 +1121,6 @@ samples/splitter/*.bkl

 samples/sockets/*.cpp
 samples/sockets/*.h
-samples/sockets/*.def
 samples/sockets/makefile*
 samples/sockets/client.wat
 samples/sockets/server.wat
@@ -1212,7 +1145,6 @@ samples/sound/*.cpp
 samples/sound/*.h
 samples/sound/makefile*
 samples/sound/*.rc
-samples/sound/*.def
 samples/sound/*.ico
 samples/sound/*.xpm
 samples/sound/*.bmp
@@ -1224,7 +1156,6 @@ samples/statbar/*.cpp
 samples/statbar/*.h
 samples/statbar/makefile*
 samples/statbar/*.rc
-samples/statbar/*.def
 samples/statbar/*.ico
 samples/statbar/*.xpm
 samples/statbar/*.bmp
@@ -1236,7 +1167,6 @@ samples/taskbar/*.cpp
 samples/taskbar/*.h
 samples/taskbar/makefile.*
 samples/taskbar/*.rc
-samples/taskbar/*.def
 samples/taskbar/*.bmp
 samples/taskbar/*.ico
 samples/taskbar/*.txt
@@ -1246,7 +1176,6 @@ samples/text/*.cpp
 samples/text/*.h
 samples/text/makefile*
 samples/text/*.rc
-samples/text/*.def
 samples/text/*.bmp
 samples/text/*.xpm
 samples/text/*.xbm
@@ -1260,7 +1189,6 @@ samples/thread/*.cpp
 samples/thread/*.h
 samples/thread/makefile*
 samples/thread/*.rc
-samples/thread/*.def
 samples/thread/*.bmp
 samples/thread/*.xpm
 samples/thread/*.xbm
@@ -1272,7 +1200,6 @@ samples/thread/*.bkl

 samples/typetest/*.cpp
 samples/typetest/*.h
-samples/typetest/*.def
 samples/typetest/*.rc
 samples/typetest/*.txt
 samples/typetest/makefile*
@@ -1284,7 +1211,6 @@ samples/typetest/*.bkl

 samples/toolbar/*.cpp
 samples/toolbar/*.h
-samples/toolbar/*.def
 samples/toolbar/makefile*
 samples/toolbar/*.txt
 samples/toolbar/*.xbm
@@ -1300,7 +1226,6 @@ samples/toolbar/*.bkl

 samples/treectrl/*.cpp
 samples/treectrl/*.h
-samples/treectrl/*.def
 samples/treectrl/*.rc
 samples/treectrl/*.txt
 samples/treectrl/makefile*
@@ -1317,7 +1242,6 @@ samples/treectrl/*.bkl

 samples/validate/*.cpp
 samples/validate/*.h
-samples/validate/*.def
 samples/validate/*.rc
 samples/validate/*.inf
 samples/validate/*.txt
@@ -1339,7 +1263,6 @@ samples/widgets/*.cpp
 samples/widgets/*.h
 samples/widgets/makefile*
 samples/widgets/*.rc
-samples/widgets/*.def
 samples/widgets/*.ico
 samples/widgets/*.xpm
 samples/widgets/*.txt
@@ -1352,7 +1275,6 @@ samples/wizard/*.cpp
 samples/wizard/*.h
 samples/wizard/makefile*
 samples/wizard/*.rc
-samples/wizard/*.def
 samples/wizard/*.bmp
 samples/wizard/*.xpm
 samples/wizard/*.xbm
@@ -1367,7 +1289,6 @@ demos/makefile*

 demos/bombs/*.cpp
 demos/bombs/*.h
-demos/bombs/*.def
 demos/bombs/makefile*
 demos/bombs/*.xbm
 demos/bombs/*.xpm
@@ -1382,7 +1303,6 @@ demos/forty/*.cpp
 demos/forty/*.h
 demos/forty/makefile*
 demos/forty/*.rc
-demos/forty/*.def
 demos/forty/*.bmp
 demos/forty/*.xpm
 demos/forty/*.xbm
@@ -1396,7 +1316,6 @@ demos/forty/*.htm

 demos/fractal/*.cpp
 demos/fractal/*.h
-demos/fractal/*.def
 demos/fractal/makefile*
 demos/fractal/*.xbm
 demos/fractal/*.xpm
@@ -1410,7 +1329,6 @@ demos/life/*.inc
 demos/life/*.h
 demos/life/makefile*
 demos/life/*.rc
-demos/life/*.def
 demos/life/*.ico
 demos/life/*.xpm
 demos/life/*.txt
@@ -1422,7 +1340,6 @@ demos/life/*.bkl

 demos/poem/*.cpp
 demos/poem/*.h
-demos/poem/*.def
 demos/poem/*.rc
 demos/poem/*.inf
 demos/poem/*.txt
@@ -1437,7 +1354,6 @@ demos/poem/*.bkl

 demos/dbbrowse/*.cpp
 demos/dbbrowse/*.h
-demos/dbbrowse/*.def
 demos/dbbrowse/*.rc
 demos/dbbrowse/*.inf
 demos/dbbrowse/*.txt
--- a/distrib/msw/utils.rsp
+++ b/distrib/msw/utils.rsp
@@ -1,6 +1,5 @@
 utils/HelpGen/src/*.h
 utils/HelpGen/src/*.cpp
-utils/HelpGen/src/*.def
 utils/HelpGen/src/*.rc
 utils/HelpGen/src/makefile*
 utils/HelpGen/src/*.bkl
@@ -26,7 +25,6 @@ utils/emulator/src/*.sty
 utils/emulator/src/*.ini
 utils/emulator/src/*.bmp
 utils/emulator/src/*.ico
-utils/emulator/src/*.def
 utils/emulator/src/*.rc
 utils/emulator/src/*.wxe
 utils/emulator/src/*.jpg
@@ -36,7 +34,6 @@ utils/emulator/docs/*.jpg

 utils/helpview/src/*.h
 utils/helpview/src/*.cpp
-utils/helpview/src/*.def
 utils/helpview/src/*.rc
 utils/helpview/src/makefile*
 utils/helpview/src/*.xbm
@@ -51,7 +48,6 @@ utils/helpview/src/bitmaps/*.xpm

 utils/configtool/src/*.h
 utils/configtool/src/*.cpp
-utils/configtool/src/*.def
 utils/configtool/src/*.rc
 utils/configtool/src/makefile*
 utils/configtool/src/*.xbm
--- a/docs/latex/wx/array.tex
+++ b/docs/latex/wx/array.tex
@@ -164,7 +164,7 @@ provokes warnings from some compilers and to avoid them you should use the
 pointers to {\tt double} you should use.

 Note that the above macros are generally only useful for 
-wxObject types.  There are seperate macros for declaring an array of a simple type, 
+wxObject types.  There are separate macros for declaring an array of a simple type, 
 such as an int.

 The following simple types are supported:\\
--- a/docs/latex/wx/datetime.tex
+++ b/docs/latex/wx/datetime.tex
@@ -97,7 +97,7 @@ Likewise, Sun, Mon, Tue, Wed, Thu, Fri, Sat, and Inv\_WeekDay are the values in
 Finally, Inv\_Year is defined to be an invalid value for year parameter.

 \helpref{GetMonthName()}{wxdatetimegetmonthname} and
-\helpref{GetWeekDayName}{wxdatetimegetweekdayname} functions use the followign
+\helpref{GetWeekDayName}{wxdatetimegetweekdayname} functions use the following
 flags:

 \begin{verbatim}
--- a/docs/latex/wx/debugrpt.tex
+++ b/docs/latex/wx/debugrpt.tex
@@ -166,7 +166,7 @@ creates the file with the given \arg{name} and writes \arg{text} to it, then
 adds the file to the report. The \arg{filename} shouldn't contain the path.

 Returns \true if file could be added successfully, \false if an IO error
-occured.
+occurred.


 \membersection{wxDebugReport::DoAddCustomContext}\label{wxdebugreportdoaddcustomcontext}
--- a/docs/latex/wx/keyevent.tex
+++ b/docs/latex/wx/keyevent.tex
@@ -41,7 +41,7 @@ running the \helpref{text}{sampletext} wxWidgets sample and pressing some keys
 in any of the text controls shown in it.

 {\bf Note:} If a key down ({\tt EVT\_KEY\_DOWN}) event is caught and
-the event handler does not call {\tt event.Skip()} then the coresponding
+the event handler does not call {\tt event.Skip()} then the corresponding
 char event ({\tt EVT\_CHAR}) will not happen.  This is by design and
 enables the programs that handle both types of events to be a bit
 simpler.
--- a/docs/latex/wx/sizeritem.tex
+++ b/docs/latex/wx/sizeritem.tex
@@ -145,7 +145,7 @@ Get the userData item attribute.

 \constfunc{wxWindow*}{GetWindow}{\void}

-If this item is trackign a window then return it.  NULL otherwise.
+If this item is tracking a window then return it.  NULL otherwise.

 \membersection{wxSizerItem::IsShown}\label{wxsizeritemisshown}

--- a/docs/latex/wx/socket.tex
+++ b/docs/latex/wx/socket.tex
@@ -560,8 +560,8 @@ The {\bf wxSOCKET\_REUSEADDR} flag controls the use of the SO\_REUSEADDR standar
 setsockopt() flag. This flag allows the socket to bind to a port that is already in use.
 This is mostly used on UNIX-based systems to allow rapid starting and stopping of a server - 
 otherwise you may have to wait several minutes for the port to become available.
-This option can have suprising platform dependent behavior, check the documentation for
-your platforms implementation of setsockopt().
+This option can have surprising platform dependent behavior, check the documentation for
+your platform's implementation of setsockopt().

 So:

--- a/docs/latex/wx/uri.tex
+++ b/docs/latex/wx/uri.tex
@@ -98,7 +98,7 @@ Copies this URI from another URI.

 \constfunc{wxString}{BuildURI}{\void}

-Builds the URI from its individual components and adds proper seperators.
+Builds the URI from its individual components and adds proper separators.

 If the URI is not a reference or is not resolved, 
 the URI that is returned from Get is the same one 
@@ -109,7 +109,7 @@ passed to Create.

 \constfunc{wxString}{BuildUnescapedURI}{\void}

-Builds the URI from its individual components, adds proper seperators, and
+Builds the URI from its individual components, adds proper separators, and
 returns escape sequences to normal characters.

 Note that it is preferred to call this over Unescape(BuildURI()) since
--- a/docs/latex/wx/wxstring.tex
+++ b/docs/latex/wx/wxstring.tex
@@ -1257,7 +1257,7 @@ buffer (which must be writable, of course) you might call it like this:
 \end{verbatim}

 Note that the exact usage of this depends on whether on not wxUSE\_STL is enabled.  If
-wxUSE\_STL is enabled, wxStringBuffer creates a seperate empty character buffer, and
+wxUSE\_STL is enabled, wxStringBuffer creates a separate empty character buffer, and
 if wxUSE\_STL is disabled, it uses GetWriteBuf() from wxString, keeping the same buffer
 wxString uses intact.  In other words, relying on wxStringBuffer containing the old 
 wxString data is probably not a good idea if you want to build your program in both
@@ -1322,7 +1322,7 @@ of the string, you might call it like this:
 \end{verbatim}

 Note that the exact usage of this depends on whether on not wxUSE\_STL is enabled.  If
-wxUSE\_STL is enabled, wxStringBuffer creates a seperate empty character buffer, and
+wxUSE\_STL is enabled, wxStringBuffer creates a separate empty character buffer, and
 if wxUSE\_STL is disabled, it uses GetWriteBuf() from wxString, keeping the same buffer
 wxString uses intact.  In other words, relying on wxStringBuffer containing the old 
 wxString data is probably not a good idea if you want to build your program in both
--- a/docs/tech/tn0014.txt
+++ b/docs/tech/tn0014.txt
@@ -111,7 +111,7 @@ is allowed to register new object handlers within XRC and extend it to accept
 new <object> classes (and therefore different <object>'s child nodes).

 <object_ref> node is identical to <object>, except that it does _not_ have
-"class" property and has additional required property "ref". It's concept is
+"class" property and has additional required property "ref". Its concept is
 similar to Unix symlinks: value of the "ref" property is equal to the value of
 "name" property of some existing node (called referred node) in the resources
 (not necessary top-level).  Referred node's "class" property and all subnodes
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -11,7 +11,7 @@

 // VC++ IDE predefines _DEBUG and _UNICODE for the new projects itself, but
 // the other symbols (WXUSINGDLL, __WXUNIVERSAL__, ...) should be defined
-// explicitely!
+// explicitly!

 #ifdef _MSC_VER
    #ifdef _UNICODE
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -263,7 +263,7 @@ public:
    // version does the normal processing (i.e. shows the usual assert failure
    // dialog box)
    //
-    // the arguments are the place where the assert occured, the text of the
+    // the arguments are the place where the assert occurred, the text of the
    // assert itself and the user-specified message
 #ifdef __WXDEBUG__
    virtual void OnAssert(const wxChar *file,
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -174,7 +174,7 @@ public:

    // parse the command line, return 0 if ok, -1 if "-h" or "--help" option
    // was encountered and the help message was given or a positive value if a
-    // syntax error occured
+    // syntax error occurred
    //
    // if showUsage is true, Usage() is called in case of syntax error or if
    // help was requested
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -1150,7 +1150,7 @@ public:
        return wxTimeSpan(*this).Multiply(n);
    }

-        // return this timespan with inversed sign
+        // return this timespan with opposite sign
    wxTimeSpan Negate() const { return wxTimeSpan(-GetValue()); }
        // negate the value of the timespan
    wxTimeSpan& Neg() { m_diff = -GetValue(); return *this; }
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -789,7 +789,7 @@ wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMaxLength, wxChar *DsDesc,
 // Change this to 0 to remove use of all deprecated functions
 #if wxODBC_BACKWARD_COMPATABILITY
 //#################################################################################
-//############### DEPRECATED functions for backward compatability #################
+//############### DEPRECATED functions for backward compatibility #################
 //#################################################################################

 // Backward compability structures/classes.  This will eventually go away
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -360,7 +360,7 @@ public:
 // Change this to 0 to remove use of all deprecated functions
 #if wxODBC_BACKWARD_COMPATABILITY
 //#################################################################################
-//############### DEPRECATED functions for backward compatability #################
+//############### DEPRECATED functions for backward compatibility #################
 //#################################################################################

 // Backward compability.  These will eventually go away
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1899,7 +1899,7 @@ enum
    wxTOOL_RIGHT
 };

-/*  the values of the format constants should be the same as correspondign */
+/*  the values of the format constants should be the same as corresponding */
 /*  CF_XXX constants in Windows API */
 enum wxDataFormatId
 {
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -249,7 +249,7 @@ public:

    // return all modules/shared libraries in the address space of this process
    //
-    // returns an empty array if not implemented or an error occured
+    // returns an empty array if not implemented or an error occurred
    static wxDynamicLibraryDetailsArray ListLoaded();

    // return platform-specific name of dynamic library with proper extension
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -2410,7 +2410,7 @@ protected:
    // NB: This method is intentionally *not* inside wxUSE_VALIDATORS!
    //     It is part of wxBase which doesn't use validators and the code
    //     is compiled out when building wxBase w/o GUI classes, which affects
-    //     binary compatiblity and wxBase library can't be used by GUI
+    //     binary compatibility and wxBase library can't be used by GUI
    //     ports.
    virtual bool TryValidator(wxEvent& WXUNUSED(event)) { return false; }

--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -62,7 +62,7 @@ public:
    // read all data from the file into a string (useful for text files)
  bool ReadAll(wxString *str, wxMBConv& conv = wxConvUTF8);
    // returns number of bytes read - use Eof() and Error() to see if an error
-    // occured or not
+    // occurred or not
  size_t Read(void *pBuf, size_t nCount);
    // returns the number of bytes written
  size_t Write(const void *pBuf, size_t nCount);
@@ -92,7 +92,7 @@ public:
  bool IsOpened() const { return m_fp != NULL; }
    // is end of file reached?
  bool Eof() const { return feof(m_fp) != 0; }
-    // is an error occured?
+    // has an error occurred?
  bool Error() const { return ferror(m_fp) != 0; }
    // get the file name
  const wxString& GetName() const { return m_name; }
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -125,7 +125,7 @@ public:
  bool IsOpened() const { return m_fd != fd_invalid; }
    // is end of file reached?
  bool Eof() const;
-    // has an error occured?
+    // has an error occurred?
  bool Error() const { return m_error; }
    // type such as disk or pipe
  wxFileKind GetKind() const { return wxGetFileKind(m_fd); }
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -226,7 +226,7 @@ private:
    // the currently default encoding: by default, it's the default system
    // encoding, but may be changed by the application using
    // SetDefaultEncoding() to make all subsequent fonts created without
-    // specifing encoding parameter using this encoding
+    // specifying encoding parameter using this encoding
    static wxFontEncoding ms_encodingDefault;
 };

--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -153,8 +153,8 @@ private:
 };


-// State information of a search action. I'd have prefered to make this a nested
-// class inside wxHtmlHelpData, but that's against coding standards :-(
+// State information of a search action. I'd have preferred to make this a
+// nested class inside wxHtmlHelpData, but that's against coding standards :-(
 // Never construct this class yourself, obtain a copy from
 // wxHtmlHelpData::PrepareKeywordSearch(const wxString& key)
 class WXDLLIMPEXP_HTML wxHtmlSearchStatus
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -89,7 +89,7 @@ public:
    // Set HTML page and display it. !! source is HTML document itself,
    // it is NOT address/filename of HTML document. If you want to
    // specify document location, use LoadPage() istead
-    // Return value : false if an error occured, true otherwise
+    // Return value : false if an error occurred, true otherwise
    bool SetPage(const wxString& source);

    // Append to current page
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -378,7 +378,7 @@ public:
             const wxChar *szShort = (const wxChar *) NULL,      // dir prefix (for msg files)
             const wxChar *szLocale = (const wxChar *) NULL,     // locale (for setlocale)
             bool bLoadDefault = true,                           // preload wxstd.mo?
-             bool bConvertEncoding = false)                      // convert Win<->Unix if neccessary?
+             bool bConvertEncoding = false)                      // convert Win<->Unix if necessary?
        {
            DoCommonInit();

@@ -407,7 +407,7 @@ public:
        // restores old locale
    ~wxLocale();

-    // Try to get user's (or OS's) prefered language setting.
+    // Try to get user's (or OS's) preferred language setting.
    // Return wxLANGUAGE_UNKNOWN if language-guessing algorithm failed
    static int GetSystemLanguage();

--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -984,7 +984,7 @@
 #define wxODBC_FWD_ONLY_CURSORS	 1

 // Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatability with the
+// member variables.  With a setting of 1, full backward compatibility with the
 // 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
 // as future development will be done only on the non-deprecated
 // functions/classes/member variables/etc.
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -129,7 +129,7 @@ protected:
                 *m_subMenu;        // our sub menu or NULL
    wxString      m_text,           // label of the item
                  m_help;           // the help string for the item
-    wxItemKind    m_kind;           // seperator/normal/check/radio item?
+    wxItemKind    m_kind;           // separator/normal/check/radio item?
    bool          m_isChecked;      // is checked?
    bool          m_isEnabled;      // is enabled?

--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -320,7 +320,7 @@ public:
    wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);

    // other operations: return true if there were no errors or false if there
-    // were some unreckognized entries (the good entries are always read anyhow)
+    // were some unrecognized entries (the good entries are always read anyhow)
    //
    // FIXME: These ought to be private ??

--- a/include/wx/msw/crashrpt.h
+++ b/include/wx/msw/crashrpt.h
@@ -24,7 +24,7 @@ struct _EXCEPTION_POINTERS;

 enum
 {
-    // we always report where the crash occured
+    // we always report where the crash occurred
    wxCRASH_REPORT_LOCATION = 0,

    // if this flag is given, the call stack is dumped
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -46,7 +46,7 @@ public:
    wxWindowDC(wxWindow *win);

 protected:
-    // intiialize the newly created DC
+    // initialize the newly created DC
    void InitDC();

    // override some base class virtuals
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -201,7 +201,7 @@ public:
    // get the accel table for all the menus
    const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }

-    // update the accel table (must be called after adding/deletign a menu)
+    // update the accel table (must be called after adding/deleting a menu)
    void RebuildAccelTable();
 #endif // wxUSE_ACCEL

--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -983,7 +983,7 @@
 #define wxODBC_FWD_ONLY_CURSORS	 1

 // Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatability with the
+// member variables.  With a setting of 1, full backward compatibility with the
 // 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
 // as future development will be done only on the non-deprecated
 // functions/classes/member variables/etc.
--- a/include/wx/msw/setup_microwin.h
+++ b/include/wx/msw/setup_microwin.h
@@ -825,7 +825,7 @@
 #define wxODBC_FWD_ONLY_CURSORS	 1

 // Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatability with the
+// member variables.  With a setting of 1, full backward compatibility with the
 // 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
 // as future development will be done only on the non-deprecated
 // functions/classes/member variables/etc.
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -983,7 +983,7 @@
 #define wxODBC_FWD_ONLY_CURSORS	 1

 // Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatability with the
+// member variables.  With a setting of 1, full backward compatibility with the
 // 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
 // as future development will be done only on the non-deprecated
 // functions/classes/member variables/etc.
--- a/include/wx/os2/menu.h
+++ b/include/wx/os2/menu.h
@@ -245,7 +245,7 @@ public:
    const wxAcceleratorTable& GetAccelTable(void) const { return m_vAccelTable; }

    //
-    // Update the accel table (must be called after adding/deletign a menu)
+    // Update the accel table (must be called after adding/deleting a menu)
    //
    void                      RebuildAccelTable(void);
 #endif // wxUSE_ACCEL
--- a/include/wx/os2/stdpaths.h
+++ b/include/wx/os2/stdpaths.h
@@ -24,7 +24,7 @@ public:
    // The program directory can be determined automatically from argv[0],
    // this function is automatically called from application initialisation.
    // If you override the initialisation routine, you should call it
-    // explicitely yourself.
+    // explicitly yourself.
    static void SetInstallPrefix(const wxString& prefix);

    // get the program installation prefix
--- a/include/wx/palmos/dcclient.h
+++ b/include/wx/palmos/dcclient.h
@@ -46,7 +46,7 @@ public:
    wxWindowDC(wxWindow *win);

 protected:
-    // intiialize the newly created DC
+    // initialize the newly created DC
    void InitDC();

    // override some base class virtuals
--- a/include/wx/palmos/menu.h
+++ b/include/wx/palmos/menu.h
@@ -174,7 +174,7 @@ public:
    // get the accel table for all the menus
    const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }

-    // update the accel table (must be called after adding/deletign a menu)
+    // update the accel table (must be called after adding/deleting a menu)
    void RebuildAccelTable();
 #endif // wxUSE_ACCEL

--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -939,7 +939,7 @@
 #define wxODBC_FWD_ONLY_CURSORS 0

 // Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatability with the
+// member variables.  With a setting of 1, full backward compatibility with the
 // 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
 // as future development will be done only on the non-deprecated
 // functions/classes/member variables/etc.
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -129,7 +129,7 @@ protected:
                         const wxString& arg = wxEmptyString);

    // get the server reply, return the first character of the reply code,
-    // '1'..'5' for normal FTP replies, 0 (*not* '0') if an error occured
+    // '1'..'5' for normal FTP replies, 0 (*not* '0') if an error occurred
    char GetResult();

    // check that the result is equal to expected value
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -153,7 +153,7 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;

 // the (most common) native bitmap format without alpha support
 #if defined(__WXMSW__)
-    // under MSW the RGB components are inversed, they're in BGR order
+    // under MSW the RGB components are reversed, they're in BGR order
    typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat;

    #define wxPIXEL_FORMAT_ALPHA 3
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -964,7 +964,7 @@
 #define wxODBC_FWD_ONLY_CURSORS	 1

 // Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatability with the
+// member variables.  With a setting of 1, full backward compatibility with the
 // 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
 // as future development will be done only on the non-deprecated
 // functions/classes/member variables/etc.
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -39,7 +39,7 @@
 class WXDLLEXPORT wxSpinButtonBase : public wxControl
 {
 public:
-    // ctor intiializes the range with the default (0..100) values
+    // ctor initializes the range with the default (0..100) values
    wxSpinButtonBase() { m_min = 0; m_max = 100; }

    // accessors
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -223,7 +223,7 @@ public:
 protected:
    // do read up to size bytes of data into the provided buffer
    //
-    // this method should return 0 if EOF has been reached or an error occured
+    // this method should return 0 if EOF has been reached or an error occurred
    // (m_lasterror should be set accordingly as well) or the number of bytes
    // read
    virtual size_t OnSysRead(void *buffer, size_t size) = 0;
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -359,7 +359,7 @@ END_DECLARE_EVENT_TYPES()
 #define EVT_TREE_BEGIN_DRAG(id, fn) wx__DECLARE_TREEEVT(BEGIN_DRAG, id, fn)
 #define EVT_TREE_BEGIN_RDRAG(id, fn) wx__DECLARE_TREEEVT(BEGIN_RDRAG, id, fn)

-// GetItem() is the item on which the drop occured (if any) and GetPoint() the
+// GetItem() is the item on which the drop occurred (if any) and GetPoint() the
 // current mouse coords
 #define EVT_TREE_END_DRAG(id, fn) wx__DECLARE_TREEEVT(END_DRAG, id, fn)

--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -1021,7 +1021,7 @@
 #define wxODBC_FWD_ONLY_CURSORS 0

 // Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatability with the
+// member variables.  With a setting of 1, full backward compatibility with the
 // 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
 // as future development will be done only on the non-deprecated
 // functions/classes/member variables/etc.
--- a/include/wx/unix/stdpaths.h
+++ b/include/wx/unix/stdpaths.h
@@ -23,7 +23,7 @@ public:
    //
    // under some systems (currently only Linux) the program directory can be
    // determined automatically but for portable programs you should always set
-    // it explicitely
+    // it explicitly
    void SetInstallPrefix(const wxString& prefix);

    // get the program installation prefix
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -310,7 +310,7 @@ public:
    // Creates an object (menu, dialog, control, ...) from an XML node.
    // Should check for validity.
    // parent is a higher-level object (usually window, dialog or panel)
-    // that is often neccessary to create the resource.
+    // that is often necessary to create the resource.
    // If instance is non-NULL it should not create a new instance via 'new' but
    // should rather use this one, and call its Create method.
    wxObject *CreateResource(wxXmlNode *node, wxObject *parent,
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -2995,7 +2995,7 @@ static void TestVCardRead()

        wxPrintf(_T("Full name from wxVCard API: %s\n"), value.c_str());

-        // now show how to deal with multiply occuring properties
+        // now show how to deal with multiply occurring properties
        DumpVCardAddresses(vcard);
        DumpVCardPhoneNumbers(vcard);

--- a/samples/db/listdb.cpp
+++ b/samples/db/listdb.cpp
@@ -79,7 +79,7 @@ extern wxApp *DatabaseDemoApp;

 /*
 * This function will return the exact string(s) from the database engine
- * indicating all error conditions which have just occured during the
+ * indicating all error conditions which have just occurred during the
 * last call to the database engine.
 *
 * This demo uses the returned string by displaying it in a wxMessageBox.  The
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -1369,7 +1369,12 @@ SettingsDialog::SettingsDialog(wxWindow* win)
 {
    SetExtraStyle(wxDIALOG_EX_CONTEXTHELP|wxWS_EX_VALIDATE_RECURSIVELY);

-    Create(win, -1, _("Preferences"), wxDefaultPosition, wxDefaultSize);
+    Create(win, -1, _("Preferences"), wxDefaultPosition, wxDefaultSize,
+        wxDEFAULT_DIALOG_STYLE
+#ifndef __WXWINCE__
+        |wxRESIZE_BORDER
+#endif        
+    );
    CreateButtons(wxOK|wxCANCEL|wxHELP);

    wxBookCtrlBase* notebook = GetBookCtrl();
--- a/samples/dialup/nettest.cpp
+++ b/samples/dialup/nettest.cpp
@@ -272,7 +272,7 @@ void MyFrame::OnHangUp(wxCommandEvent& WXUNUSED(event))
 {
    if ( wxGetApp().GetDialer()->HangUp() )
    {
-        wxLogStatus(this, wxT("Connection was succesfully terminated."));
+        wxLogStatus(this, wxT("Connection was successfully terminated."));
    }
    else
    {
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -1730,7 +1730,7 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event)
    {
        default:
        case wxDragError:
-            wxLogError(wxT("An error occured during drag and drop operation"));
+            wxLogError(wxT("An error occurred during drag and drop operation"));
            break;

        case wxDragNone:
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -669,7 +669,7 @@ void MyCanvas::DrawDefault(wxDC& dc)

    // Added by JACS to demonstrate bizarre behaviour.
    // With a size of 70, we get a missing red RHS,
-    // and the hight is too small, so we get yellow
+    // and the height is too small, so we get yellow
    // showing. With a size of 40, it draws as expected:
    // it just shows a white rectangle with red outline.
    int totalWidth = 70;
--- a/samples/except/except.cpp
+++ b/samples/except/except.cpp
@@ -79,7 +79,7 @@ public:
    // program startup
    virtual bool OnInit();

-    // 2nd-level exception handling: we get all the exceptions occuring in any
+    // 2nd-level exception handling: we get all the exceptions occurring in any
    // event handler here
    virtual bool OnExceptionInMainLoop();

--- a/samples/html/test/test.htm
+++ b/samples/html/test/test.htm
@@ -82,7 +82,7 @@ nested item</LI>
 <LI>
 <UL>
 <LI>
-deeper nesting for check of mark allignment </LI>
+deeper nesting for check of mark alignment </LI>

 <LI>
 nested item 2</LI>
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@@ -17,7 +17,7 @@
 //
 // To use this sample, simply select Open File from the file menu,
 // select the file you want to play - and MediaPlayer will play the file in a
-// new notebook page, showing video if neccessary.
+// new notebook page, showing video if necessary.
 //
 // You can select one of the menu options, or move the slider around
 // to manipulate what is playing.
--- a/samples/richedit/kbList.cpp
+++ b/samples/richedit/kbList.cpp
@@ -6,6 +6,10 @@
 * $Id$          *
 *                                                                  *
 * $Log$
+ * Revision 1.4  2005/05/31 09:19:38  JS
+ * Typo correction patch [ 1208110 ] Lots of typo corrections
+ * Olly Betts
+ *
 * Revision 1.3  2004/08/06 17:27:18  ABX
 * Deleting void is undefined.
 *
@@ -27,7 +31,7 @@
 *    always failed, must mkdir("~/.M") first)
 * 2) "redesign" of "Folder properties" dialog and bug corrected, small change to
 *    MInputBox (it was too wide)
- * 3) bug in ProvFC when it didn't reckognize the books as being in the correct
+ * 3) bug in ProvFC when it didn't recognize the books as being in the correct
 *    format (=> messages "can't reopen book") corrected
 * 4) I tried to enhance MDialog_About(), but it didn't really work... oh well,
 *    I've never said I was an artist
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -290,7 +290,7 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
  //
  // Connect(addr, false) will issue a nonblocking connection request
  // and return immediately. If the return value is true, then the
-  // connection has been already succesfully established. If it is
+  // connection has been already successfully established. If it is
  // false, you must wait for the request to complete, either with
  // WaitOnConnect() or by watching wxSOCKET_CONNECTION / LOST
  // events (please read the documentation).
--- a/src/cocoa/combobox.mm
+++ b/src/cocoa/combobox.mm
@@ -13,11 +13,11 @@

 //
 // Impl notes:
-// There is no custom data source because doing so unneccesaraly sacrifices
+// There is no custom data source because doing so unnecessarily sacrifices
 // some native autocompletion behavior (we would have to make our own - 
 // the SimpleComboBox sample does so in the developer folder that
 // comes with OSX).  One reason you might want this would be to have
-// only one array or be able to display numbers by returned an NSNumber
+// only one array or be able to display numbers returned by an NSNumber
 // from the methods.
 //
 // One problem though is that wxCB_SORT isn't implemented...
--- a/src/cocoa/mediactrl.mm
+++ b/src/cocoa/mediactrl.mm
@@ -202,7 +202,7 @@ wxQTMediaBackend::~wxQTMediaBackend()
    if(m_timer)
        Cleanup();

-    //Note that ExitMovies() is not neccessary...
+    //Note that ExitMovies() is not necessary...
    ExitMovies();
 }

@@ -324,7 +324,7 @@ void wxQTMediaBackend::FinishLoad()
    //
    //Here, if the parent of the control has a sizer - we
    //tell it to recalculate the size of this control since
-    //the user opened a seperate media file
+    //the user opened a separate media file
    //
    m_ctrl->InvalidateBestSize();
    m_ctrl->GetParent()->Layout();
--- a/src/cocoa/utilsexc.mm
+++ b/src/cocoa/utilsexc.mm
@@ -159,21 +159,21 @@ long wxExecute(const wxString& command,
    NSArray* theQuoteArguments = 
        [wxNSStringWithWxString(command) componentsSeparatedByString:@"\""];
        
-    NSMutableArray* theSeperatedArguments = 
+    NSMutableArray* theSeparatedArguments = 
        [NSMutableArray arrayWithCapacity:10];
        
    for (unsigned i = 0; i < [theQuoteArguments count]; ++i)
    {
-        [theSeperatedArguments addObjectsFromArray:
+        [theSeparatedArguments addObjectsFromArray:
            [[theQuoteArguments objectAtIndex:i] componentsSeparatedByString:@" "]
        ];
        
        if(++i < [theQuoteArguments count])
-            [theSeperatedArguments addObject:[theQuoteArguments objectAtIndex:i]];
+            [theSeparatedArguments addObject:[theQuoteArguments objectAtIndex:i]];
    }
    
-    [theTask setLaunchPath:[theSeperatedArguments objectAtIndex:0]];
-    [theTask setArguments:theSeperatedArguments];
+    [theTask setLaunchPath:[theSeparatedArguments objectAtIndex:0]];
+    [theTask setArguments:theSeparatedArguments];
    [theTask launch];
    
    if(sync & wxEXEC_ASYNC)
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -128,7 +128,7 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
            bestSize.y = childBestSize.y;
    }

-    // convert display area to window area, adding the size neccessary for the
+    // convert display area to window area, adding the size necessary for the
    // tabs
    wxSize best = CalcSizeFromPage(bestSize);
    CacheBestSize(best);
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -2309,12 +2309,12 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                    // find the YEAR which is a year in the strftime() range (1970
                    // - 2038) whose Jan 1 falls on the same week day as the Jan 1
                    // of the real year. Then make a copy of the format and
-                    // replace all occurences of YEAR in it with some unique
+                    // replace all occurrences of YEAR in it with some unique
                    // string not appearing anywhere else in it, then use
                    // strftime() to format the date in year YEAR and then replace
                    // YEAR back by the real year and the unique replacement
-                    // string back with YEAR. Notice that "all occurences of YEAR"
-                    // means all occurences of 4 digit as well as 2 digit form!
+                    // string back with YEAR. Notice that "all occurrences of YEAR"
+                    // means all occurrences of 4 digit as well as 2 digit form!
                    //
                    // the bugs: we assume that neither of %c nor %x contains any
                    // fields which may change between the YEAR and real year. For
@@ -2372,8 +2372,8 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                        strYear.Printf(_T("%d"), year);
                        strYear2.Printf(_T("%d"), year % 100);

-                        // find two strings not occuring in format (this is surely
-                        // not optimal way of doing it... improvements welcome!)
+                        // find two strings not occurring in format (this is surely
+                        // not the optimal way of doing it... improvements welcome!)
                        wxString fmt = format;
                        wxString replacement = (wxChar)-1;
                        while ( fmt.Find(replacement) != wxNOT_FOUND )
@@ -2387,7 +2387,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                            replacement << (wxChar)-2;
                        }

-                        // replace all occurences of year with it
+                        // replace all occurrences of year with it
                        bool wasReplaced = fmt.Replace(strYear, replacement) > 0;
                        if ( !wasReplaced )
                            wasReplaced = fmt.Replace(strYear2, replacement2) > 0;
@@ -2414,14 +2414,14 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                                                                  : _T("%x"),
                                                    &tmAdjusted);

-                        // now replace the occurence of 1999 with the real year
+                        // now replace the occurrence of 1999 with the real year
                        wxString strYearReal, strYearReal2;
                        strYearReal.Printf(_T("%04d"), yearReal);
                        strYearReal2.Printf(_T("%02d"), yearReal % 100);
                        str.Replace(strYear, strYearReal);
                        str.Replace(strYear2, strYearReal2);

-                        // and replace back all occurences of replacement string
+                        // and replace back all occurrences of replacement string
                        if ( wasReplaced )
                        {
                            str.Replace(replacement2, strYear2);
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -179,7 +179,7 @@ bool wxDbConnectInf::AllocHenv()
    // Initialize the ODBC Environment for Database Operations
    if (SQLAllocEnv(&Henv) != SQL_SUCCESS)
    {
-        wxLogDebug(wxT("A problem occured while trying to get a connection to the data source"));
+        wxLogDebug(wxT("A problem occurred while trying to get a connection to the data source"));
        return false;
    }

@@ -1781,16 +1781,16 @@ bool wxDb::DispAllErrors(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
 /*
 * This function is called internally whenever an error condition prevents the user's
 * request from being executed.  This function will query the datasource as to the
- * actual error(s) that just occured on the previous request of the datasource.
+ * actual error(s) that just occurred on the previous request of the datasource.
 *
 * The function will retrieve each error condition from the datasource and
 * Printf the codes/text values into a string which it then logs via logError().
 * If in DBDEBUG_CONSOLE mode, the constructed string will be displayed in the console
 * window and program execution will be paused until the user presses a key.
 *
- * This function always returns a false, so that functions which call this function
+ * This function always returns false, so that functions which call this function
 * can have a line like "return (DispAllErrors(henv, hdbc));" to indicate the failure
- * of the users request, so that the calling code can then process the error msg log
+ * of the user's request, so that the calling code can then process the error message log.
 */
 {
    wxString odbcErrMsg;
@@ -2507,7 +2507,7 @@ wxDbColInf *wxDb::GetColumns(wxChar *tableName[], const wxChar *userID)
 *        1) The last array element of the tableName[] argument must be zero (null).
 *            This is how the end of the array is detected.
 *        2) This function returns an array of wxDbColInf structures.  If no columns
- *            were found, or an error occured, this pointer will be zero (null).  THE
+ *            were found, or an error occurred, this pointer will be zero (null).  THE
 *            CALLING FUNCTION IS RESPONSIBLE FOR DELETING THE MEMORY RETURNED WHEN IT
 *            IS FINISHED WITH IT.  i.e.
 *
@@ -2597,7 +2597,7 @@ wxDbColInf *wxDb::GetColumns(wxChar *tableName[], const wxChar *userID)
                                     NULL, 0);                               // All columns
            }
            if (retcode != SQL_SUCCESS)
-            {  // Error occured, abort
+            {  // Error occurred, abort
                DispAllErrors(henv, hdbc, hstmt);
                if (colInf)
                    delete [] colInf;
@@ -2655,7 +2655,7 @@ wxDbColInf *wxDb::GetColumns(wxChar *tableName[], const wxChar *userID)
                }
            }
            if (retcode != SQL_NO_DATA_FOUND)
-            {  // Error occured, abort
+            {  // Error occurred, abort
                DispAllErrors(henv, hdbc, hstmt);
                if (colInf)
                    delete [] colInf;
@@ -2753,7 +2753,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, UWORD *numCols, const wx
                                 NULL, 0);                                // All columns
        }
        if (retcode != SQL_SUCCESS)
-        {  // Error occured, abort
+        {  // Error occurred, abort
            DispAllErrors(henv, hdbc, hstmt);
            if (colInf)
                delete [] colInf;
@@ -2829,7 +2829,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, UWORD *numCols, const wx
            }
        }
        if (retcode != SQL_NO_DATA_FOUND)
-        {  // Error occured, abort
+        {  // Error occurred, abort
            DispAllErrors(henv, hdbc, hstmt);
            if (colInf)
                delete [] colInf;
@@ -3009,7 +3009,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
                                 NULL, 0);                             // All columns
        }
        if (retcode != SQL_SUCCESS)
-        {  // Error occured, abort
+        {  // Error occurred, abort
            DispAllErrors(henv, hdbc, hstmt);
            if (colInf)
                delete [] colInf;
@@ -3105,7 +3105,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
            }
        }
        if (retcode != SQL_NO_DATA_FOUND)
-        {  // Error occured, abort
+        {  // Error occurred, abort
            DispAllErrors(henv, hdbc, hstmt);
            if (colInf)
                delete [] colInf;
@@ -3257,7 +3257,7 @@ int wxDb::GetColumnCount(const wxString &tableName, const wxChar *userID)
                             NULL, 0);                               // All columns
    }
    if (retcode != SQL_SUCCESS)
-    {  // Error occured, abort
+    {  // Error occurred, abort
        DispAllErrors(henv, hdbc, hstmt);
        SQLFreeStmt(hstmt, SQL_CLOSE);
        return(-1);
@@ -3268,7 +3268,7 @@ int wxDb::GetColumnCount(const wxString &tableName, const wxChar *userID)
        noCols++;

    if (retcode != SQL_NO_DATA_FOUND)
-    {  // Error occured, abort
+    {  // Error occurred, abort
        DispAllErrors(henv, hdbc, hstmt);
        SQLFreeStmt(hstmt, SQL_CLOSE);
        return(-1);
@@ -3289,7 +3289,7 @@ wxDbInf *wxDb::GetCatalog(const wxChar *userID)
 * --          : uses SQLTables and fills pTableInf;              ------
 * --          : pColInf is set to NULL and numCols to 0;         ------
 * --          : returns pDbInf (wxDbInf)                         ------
- * --            - if unsuccesfull (pDbInf == NULL)               ------
+ * --            - if unsuccessful (pDbInf == NULL)               ------
 * --          : pColInf can be filled with GetColumns(..);       ------
 * --          : numCols   can be filled with GetColumnCount(..); ------
 * ---------------------------------------------------------------------
@@ -4333,7 +4333,7 @@ int wxDbCreateDataSource(const wxString &driverName, const wxString &dsn, const
    // embedded nulls in strings
    setupStr.Printf(wxT("DSN=%s%cDescription=%s%cDefaultDir=%s%c"),dsn,2,description,2,defDir,2);

-    // Replace the separator from above with the '\0' seperator needed
+    // Replace the separator from above with the '\0' separator needed
    // by the SQLConfigDataSource() function
    int k;
    do
@@ -4415,7 +4415,7 @@ bool wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMaxLength, wxChar *DsDes
 ********************************************************************
 *
 * The following functions are all DEPRECATED and are included for
- * backward compatability reasons only
+ * backward compatibility reasons only
 *
 ********************************************************************
 ********************************************************************/
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -373,7 +373,7 @@ void wxDCBase::DoDrawSpline( wxList *points )


 // Each element of the widths array will be the width of the string up to and
-// including the coresponding character in text.  This is the generic
+// including the corresponding character in text.  This is the generic
 // implementation, the port-specific classes should do this with native APIs
 // if available and if faster.  Note: pango_layout_index_to_pos is much slower
 // than calling GetTextExtent!!
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -183,8 +183,8 @@ void wxPathList::AddEnvList (const wxString& envVariable)
        path such as "C:\Program Files" would be split into 2 paths:
        "C:\Program" and "Files"
        */
-//        wxT(" ;"); // Don't seperate with colon in DOS (used for drive)
-        wxT(";"); // Don't seperate with colon in DOS (used for drive)
+//        wxT(" ;"); // Don't separate with colon in DOS (used for drive)
+        wxT(";"); // Don't separate with colon in DOS (used for drive)
 #else
        wxT(" :;");
 #endif
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -387,7 +387,7 @@ bool wxFTP::SetTransferMode(TransferMode transferMode)
        return false;
    }

-    // If we get here the operation has been succesfully completed
+    // If we get here the operation has been successfully completed
    // Set the status-member
    m_currentTransfermode = transferMode;

--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -509,7 +509,7 @@ int wxGIFDecoder::dgif(GIFImage *img, int interl, int bits)
                    /* loop until a valid y coordinate has been
                    found, Or if the maximum number of passes has
                    been reached, exit the loop, and stop image
-                    decoding (At this point the image is succesfully
+                    decoding (At this point the image is successfully
                    decoded).
                    If we don't loop, but merely set y to some other
                    value, that new value might still be invalid depending
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1792,7 +1792,7 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
         (langFull.Len() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) )
    {
        // 0. Make sure the lang is according to latest ISO 639
-        //    (this is neccessary because glibc uses iw and in instead
+        //    (this is necessary because glibc uses iw and in instead
        //    of he and id respectively).

        // the language itself (second part is the dialect/sublang)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -491,7 +491,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)

    wxPoint pos = event.GetPosition();

-    // scrollbar on which the click occured
+    // scrollbar on which the click occurred
    wxWindow *sbar = NULL;

    wxWindow *win = (wxWindow *)event.GetEventObject();
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -296,7 +296,7 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const
            return true;

        default:
-            // an error occured
+            // an error occurred
            wxLogError(_("Failed to match '%s' in regular expression: %s"),
                       str, GetErrorMsg(rc, !conv).c_str());
            // fall through
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -75,7 +75,7 @@ wxString wxStandardPathsBase::AppendAppName(const wxString& dir)
 {
    wxString subdir(dir);

-    // empty string indicates that an error has occured, don't touch it then
+    // empty string indicates that an error has occurred, don't touch it then
    if ( !subdir.empty() )
    {
        const wxString appname = wxTheApp->GetAppName();
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -270,9 +270,9 @@ const wxWCharBuffer wxMBConv::cMB2WC(const char *szString, size_t nStringLen, si
        }

        //Increment to next (sub)string
-        //Note that we have to use strlen here instead of nLen
-        //here because XX2XX gives us the size of the output buffer,
-        //not neccessarly the length of the string
+        //Note that we have to use strlen instead of nLen here
+        //because XX2XX gives us the size of the output buffer,
+        //which is not necessarily the length of the string
        szPos += strlen(szPos) + 1;
    }

@@ -332,9 +332,9 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *szString, size_t nStringLen,
        }

        //Increment to next (sub)string
-        //Note that we have to use wxWcslen here instead of nLen
-        //here because XX2XX gives us the size of the output buffer,
-        //not neccessarly the length of the string
+        //Note that we have to use wxWcslen instead of nLen here
+        //because XX2XX gives us the size of the output buffer,
+        //which is not necessarily the length of the string
        szPos += wxWcslen(szPos) + 1;
    }

--- a/Show More
+++ b/Show More