More name changes

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

contrib/include/wx/deprecated/tbarsmpl.h

@@ -25,7 +25,7 @@
 class WXDLLEXPORT wxMemoryDC;
 
 // ----------------------------------------------------------------------------
-// wxToolBarSimple is a generic toolbar implementation in pure wxWindows
+// wxToolBarSimple is a generic toolbar implementation in pure wxWidgets
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_DEPRECATED wxToolBarSimple : public wxToolBarBase

contrib/include/wx/mmedia/vidbase.h

@@ -27,7 +27,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/stream.h"

contrib/include/wx/mmedia/vidwin.h

@@ -30,7 +30,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/stream.h"

contrib/include/wx/mmedia/vidxanm.h

@@ -26,7 +26,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/string.h"

contrib/include/wx/net/email.h

@@ -32,7 +32,7 @@ public:
 //// Operations
 
     // Send a message.
-    // Specify profile, or leave it to wxWindows to find the current user name
+    // Specify profile, or leave it to wxWidgets to find the current user name
     static bool Send(wxMailMessage& message, const wxString& profileName = wxEmptyString,
         const wxString& sendMail = wxT("/usr/lib/sendmail -t"));
     

contrib/include/wx/stc/stc.h

@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        stc.h
-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
+// Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, and in fact there
 //              is no mention of Scintilla classes at all in this header.

contrib/include/wx/xrc/xmlres.h

@@ -59,7 +59,7 @@ class wxXmlResourceModule;
 //     older versions of the library may ignore it.
 //   - if you change version number, follow these steps:
 //       - set major, minor and release numbers to respective version numbers of
-//         the wxWindows library (see wx/version.h)
+//         the wxWidgets library (see wx/version.h)
 //       - reset revision to 0 unless the first three are same as before,
 //         in which case you should increase revision by one
 #define WX_XMLRES_CURRENT_VERSION_MAJOR            2
@@ -127,7 +127,7 @@ public:
 
     // Initialize handlers for all supported controls/windows. This will
     // make the executable quite big because it forces linking against
-    // most of the wxWindows library.
+    // most of the wxWidgets library.
     void InitAllHandlers();
 
     // Initialize only a specific handler (or custom handler). Convention says
@@ -274,7 +274,7 @@ private:
 
 // This macro translates string identifier (as used in XML resource,
 // e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
-// wxWindows event tables.
+// wxWidgets event tables.
 // Example:
 //    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 //       EVT_MENU(XRCID("quit"), MyFrame::OnQuit)
@@ -463,9 +463,9 @@ WXDLLIMPEXP_XRC void wxXmlInitResourceModule();
 
 // This class is used to create instances of XRC "object" nodes with "subclass"
 // property. It is _not_ supposed to be used by XRC users, you should instead
-// register your subclasses via wxWindows' RTTI mechanism. This class is useful
+// register your subclasses via wxWidgets' RTTI mechanism. This class is useful
 // only for language bindings developer who need a way to implement subclassing
-// in wxWindows ports that don't support wxRTTI (e.g. wxPython).
+// in wxWidgets ports that don't support wxRTTI (e.g. wxPython).
 class WXDLLIMPEXP_XRC wxXmlSubclassFactory
 {
 public:

contrib/samples/animate/anitest.cpp

@@ -139,7 +139,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-    (void)wxMessageBox(_T("wxWindows 2 Animation Demo\n")
+    (void)wxMessageBox(_T("wxWidgets 2 Animation Demo\n")
                        _T("Author: Julian Smart (c) 2001\n"),
                        _T("About Animation Demo"));
 }

contrib/samples/deprecated/resource/resource.cpp

@@ -41,7 +41,7 @@
 
 // If we wanted to demonstrate total platform independence,
 // then we'd use the dynamic file loading form for all platforms.
-// But this shows how to embed the wxWindows resources
+// But this shows how to embed the wxWidgets resources
 // in the program code/executable for UNIX and Windows
 // platforms.
 
@@ -104,7 +104,7 @@ bool MyApp::OnInit(void)
 
     // Create the main frame window
     frame = new MyFrame( (wxFrame *) NULL, -1,
-                         wxT("wxWindows Resource Sample"),
+                         wxT("wxWidgets Resource Sample"),
                          wxPoint(-1, -1), wxSize(300, 250) );
 
     // Give it a status line
@@ -172,8 +172,8 @@ MyFrame::MyFrame
 
 void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
-    wxMessageBox(wxT("wxWindows resource sample.\n")
-                 wxT("(c) Julian Smart"), wxT("About wxWindows sample"),
+    wxMessageBox(wxT("wxWidgets resource sample.\n")
+                 wxT("(c) Julian Smart"), wxT("About wxWidgets sample"),
                  wxICON_INFORMATION | wxOK);
 }
 
@@ -191,7 +191,7 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
         wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName(wxT("multitext3"), dialog);
         if (text)
         {
-            text->SetValue(wxT("wxWindows resource demo"));
+            text->SetValue(wxT("wxWidgets resource demo"));
         }
 
         dialog->ShowModal();

contrib/samples/deprecated/treelay/treelay.cpp

@@ -185,7 +185,7 @@ void MyFrame::OnTopBottom(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-      (void)wxMessageBox(_T("wxWindows tree library demo Vsn 2.0\nAuthor: Julian Smart (c) 1998"), _T("About tree test"));
+      (void)wxMessageBox(_T("wxWidgets tree library demo Vsn 2.0\nAuthor: Julian Smart (c) 1998"), _T("About tree test"));
 }
 
 void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

contrib/samples/fl/fl_demo1.cpp

@@ -124,7 +124,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 }
 
 MyFrame::MyFrame(wxFrame *frame)
-    : wxFrame( frame, -1, _("wxWindows 2.0 wxFrameLayout Test Application"), wxDefaultPosition, 
+    : wxFrame( frame, -1, _("wxWidgets 2.0 wxFrameLayout Test Application"), wxDefaultPosition, 
           wxSize( 700, 500 ), 
           wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | 
           wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION, 

contrib/samples/fl/fl_demo2.cpp

@@ -24,7 +24,7 @@
 #include "wx/wx.h"
 #endif
 
-// wxWindows headers.
+// wxWidgets headers.
 #include "wx/treectrl.h"
 #include "wx/imaglist.h"
 #include "wx/notebook.h" 
@@ -55,7 +55,7 @@ IMPLEMENT_APP    (MyApp)
 bool MyApp::OnInit(void)
 {
     // Create the main frame window
-    MyFrame *frame = new MyFrame(NULL, _("wxWindows 2.0 wxFrameLayout demo"), 50, 50, 650, 540);
+    MyFrame *frame = new MyFrame(NULL, _("wxWidgets 2.0 wxFrameLayout demo"), 50, 50, 650, 540);
     
     // Give it an icon
 #ifdef __WINDOWS__
@@ -170,7 +170,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h
 
     mpInternalFrm = (wxPanel*)this;
     
-    mAboutBox.Create( this, -1,  _T("About box in wxWindows style..."),
+    mAboutBox.Create( this, -1,  _T("About box in wxWidgets style..."),
                       wxDefaultPosition,
                       wxSize( 385,220),
                       wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL );
@@ -665,7 +665,7 @@ wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
     
     pClassView->SetImageList( &mImageList );
     
-    wxTreeItemId rootId = pClassView->AddRoot( wxT("wxWindows 2.0 classes"), 0 );
+    wxTreeItemId rootId = pClassView->AddRoot( wxT("wxWidgets 2.0 classes"), 0 );
     
     pClassView->AppendItem( rootId, _("wxWin Dynamic classes (grabbed at run-time)"), 0 );
     pClassView->AppendItem( rootId, _("serializer-classes (grabbed at run-time)"),    0 );

contrib/samples/fl/fl_sample1.cpp

@@ -67,7 +67,7 @@ IMPLEMENT_APP    (MyApp)
 
 bool MyApp::OnInit(void)
 {
-    // wxWindows boiler-plate:
+    // wxWidgets boiler-plate:
     
     MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
     

contrib/samples/fl/fl_sample2.cpp

@@ -68,7 +68,7 @@ IMPLEMENT_APP    (MyApp)
 
 bool MyApp::OnInit(void)
 {
-    // wxWindows boiler-plate:
+    // wxWidgets boiler-plate:
     
     MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
     

contrib/samples/fl/fl_sample3.cpp

@@ -72,7 +72,7 @@ IMPLEMENT_APP    (MyApp)
 
 bool MyApp::OnInit(void)
 {
-    // wxWindows boiler-plate:
+    // wxWidgets boiler-plate:
     
     MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
     

contrib/samples/gizmos/dynsash/dynsash.cpp

@@ -18,7 +18,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif

contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp

@@ -20,7 +20,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif

contrib/samples/gizmos/editlbox/test.cpp

@@ -6,7 +6,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif

contrib/samples/gizmos/led/led.cpp

@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -91,7 +91,7 @@ public:
 private:
     MyPanel  *m_panel;
 
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 
@@ -123,10 +123,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -141,7 +141,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(LED_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and

contrib/samples/gizmos/splittree/tree.cpp

@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tree.cpp
-// Purpose:     Minimal wxWindows sample
+// Purpose:     Minimal wxWidgets sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -29,7 +29,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -103,10 +103,10 @@ static char * icon2_xpm[] = {
 #endif
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -114,7 +114,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and

contrib/samples/gizmos/splittree/tree.h

@@ -49,7 +49,7 @@ protected:
     TestValueWindow*		m_valueWindow;
 
 private:
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 

contrib/samples/mmedia/mmbman.cpp

@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif

contrib/samples/mmedia/mmboard.cpp

@@ -28,7 +28,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -91,7 +91,7 @@ public:
     void CloseVideoWindow();
     
 private:
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 
 private:
@@ -132,7 +132,7 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MMBoardFrame, wxFrame)
@@ -274,7 +274,7 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(3);
-    SetStatusText(wxT("Welcome to wxWindows!"));
+    SetStatusText(wxT("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 
     // Misc variables
@@ -398,8 +398,8 @@ void MMBoardFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MMBoardFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
-    msg.Printf( wxT("wxWindows Multimedia board v1.0a, wxMMedia v2.0a:\n")
-                wxT("an example of the capabilities of the wxWindows multimedia classes.\n")
+    msg.Printf( wxT("wxWidgets Multimedia board v1.0a, wxMMedia v2.0a:\n")
+                wxT("an example of the capabilities of the wxWidgets multimedia classes.\n")
 		wxT("Copyright 1999, 2000, Guilhem Lavaux.\n"));
  
     wxMessageBox(msg, _T("About MMBoard"), wxOK | wxICON_INFORMATION, this);

contrib/samples/ogl/studio/mainfrm.cpp

@@ -186,7 +186,7 @@ void csFrame::OnIdle(wxIdleEvent& event)
         // window doesn't cause the proper refresh. Just refreshing the
         // client doesn't work (presumably because it's clipping the
         // children).
-        // FIXED in wxWindows, by intercepting wxMDIClientWindow::DoSetSize
+        // FIXED in wxWidgets, by intercepting wxMDIClientWindow::DoSetSize
         // and checking if the position has changed, before redrawing the
         // child windows.
 #if 0

contrib/samples/ogl/studio/studio.cpp

@@ -161,7 +161,7 @@ bool csApp::OnInit(void)
   frame->SetMenuBar(menuBar);
 
   // Load the file history
-  wxConfig config(_T("OGL Studio"), _T("wxWindows"));
+  wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
   m_docManager->FileHistoryLoad(config);
 
   frame->CreateStatusBar();
@@ -491,7 +491,7 @@ void csApp::CreateDiagramToolBar(wxFrame* parent)
 // Read/write configuration information
 bool csApp::ReadOptions()
 {
-    wxConfig config(_T("OGL Studio"), _T("wxWindows"));
+    wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
 
     config.Read(_T("mainX"), & m_mainFramePos.x);
     config.Read(_T("mainY"), & m_mainFramePos.y);
@@ -505,7 +505,7 @@ bool csApp::ReadOptions()
 
 bool csApp::WriteOptions()
 {
-    wxConfig config(_T("OGL Studio"), _T("wxWindows"));
+    wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
 
     config.Write(_T("mainX"), (long) m_mainFramePos.x);
     config.Write(_T("mainY"), (long) m_mainFramePos.y);

contrib/samples/stc/defsext.h

@@ -15,7 +15,7 @@
 // headers
 //----------------------------------------------------------------------------
 
-//! wxWindows headers
+//! wxWidgets headers
 #include <wx/print.h>    // printing support
 #include <wx/printdlg.h> // printing dialog
 

contrib/samples/stc/edit.cpp

@@ -25,12 +25,12 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
+// need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
 #endif
 
-//! wxWindows headers
+//! wxWidgets headers
 #include <wx/file.h>     // raw file io support
 #include <wx/filename.h> // filename support
 

contrib/samples/stc/edit.h

@@ -20,9 +20,9 @@
 // headers
 //----------------------------------------------------------------------------
 
-//! wxWindows headers
+//! wxWidgets headers
 
-//! wxWindows/contrib headers
+//! wxWidgets/contrib headers
 #include <wx/stc/stc.h>  // styled text control
 
 //! application headers

contrib/samples/stc/prefs.cpp

@@ -20,14 +20,14 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
+// need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
 #endif
 
-//! wxWindows headers
+//! wxWidgets headers
 
-//! wxWindows/contrib headers
+//! wxWidgets/contrib headers
 
 //! application headers
 #include "defsext.h"     // Additional definitions

contrib/samples/stc/prefs.h

@@ -20,9 +20,9 @@
 // headers
 //----------------------------------------------------------------------------
 
-//! wxWindows headers
+//! wxWidgets headers
 
-//! wxWindows/contrib headers
+//! wxWidgets/contrib headers
 #include <wx/stc/stc.h>  // styled text control
 
 //! application headers

contrib/samples/stc/stctest.cpp

@@ -20,12 +20,12 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
+// need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
 #endif
 
-//! wxWindows headers
+//! wxWidgets headers
 #include <wx/config.h>   // configuration support
 #include <wx/filedlg.h>  // file dialog support
 #include <wx/filename.h> // filename support
@@ -57,14 +57,14 @@
 #define APP_DESCR _("See http://wxguide.sourceforge.net/")
 
 #define APP_MAINT _T("Otto Wyss")
-#define APP_VENDOR _T("wxWindows")
+#define APP_VENDOR _T("wxWidgets")
 #define APP_COPYRIGTH _T("(C) 2003 Otto Wyss")
-#define APP_LICENCE _T("wxWindows")
+#define APP_LICENCE _T("wxWidgets")
 
 #define APP_VERSION _T("0.1.alpha")
 #define APP_BUILD __DATE__
 
-#define APP_WEBSITE _T("http://www.wxWindows.org")
+#define APP_WEBSITE _T("http://www.wxWidgets.org")
 #define APP_MAIL _T("mailto://???")
 
 #define NONAME _("<untitled>")
@@ -99,7 +99,7 @@ private:
 
 };
 
-// created dynamically by wxWindows
+// created dynamically by wxWidgets
 DECLARE_APP (App);
 
 //----------------------------------------------------------------------------

contrib/samples/svg/svgtest.cpp

@@ -252,7 +252,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-    (void)wxMessageBox(wxT("wxWindows 2.0 SVG 1.0 Test\n")
+    (void)wxMessageBox(wxT("wxWidgets 2.0 SVG 1.0 Test\n")
         wxT("Author: Chris Elliott (c) 2002\n")
         wxT("Usage: svg.exe \nClick File | New to show tests\n\n"), wxT("About SVG Test"));
 }

contrib/samples/xrc/custclas.cpp

@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -62,7 +62,7 @@ enum {
 };
 
 //-----------------------------------------------------------------------------
-// wxWindows macro: implement dynamic class
+// wxWidgets macro: implement dynamic class
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS( MyResizableListCtrl, wxListCtrl )

contrib/samples/xrc/custclas.h

@@ -35,8 +35,8 @@
 //! A custom listctrl that resizes itself and pops up a context-sensitive menu.
 class MyResizableListCtrl : public wxListCtrl
 {
-    // Very helpful wxWindows macro required for wxWindows-RTTI tracing: By using this
-    // you will see "Leaked one object of type myResizeableListCtrl" in the debug log, 
+    // Very helpful wxWidgets macro required for wxWidgets-RTTI tracing: By using this
+    // you will see "Leaked one object of type myResizeableListCtrl" in the debug log,
     // along with which line you if was created, but you forget to free the memory.
     // NOTE: Using this REQUIRES a default constructor: that means either: giving a 
     // default value for all parameters in your constructor, or else having a dummy
@@ -47,14 +47,14 @@ public:
 
     // Constructor.        
     /*
-        These parameters are the same as a wxWindows constructor.
+        These parameters are the same as a wxWidgets constructor.
         \param parent The parent window.
         \param id The id of the progress_listbox. Will usually be -1 unless multiple
             of them on the same dialog.
         \param pos The pixel position of the listctrl on its parent window
         \param size The pixel size of the listctrl
-        \param style Style of the listbox. See wxWindows wxListBox docs for details.
-        \param validator Window validator. See wxWindows docs for details.
+        \param style Style of the listbox. See wxWidgets wxListBox docs for details.
+        \param validator Window validator. See wxWidgets docs for details.
         \param name Windows name (rarely used).
         \param exclusion_column_caption The label of header of listctrl's exclusion
             column.
@@ -76,7 +76,7 @@ protected:
     // A custom function for a context sensitive menu. 
     void ContextSensitiveMenu( wxMouseEvent& event );       
     
-    // This is a wxWindows function that we are going to override with our own behaviour.
+    // This is a wxWidgets function that we are going to override with our own behaviour.
     void OnSize( wxSizeEvent &event );
     
     // A custom function. What is called in the constructor, and in an OnSize()
@@ -84,7 +84,7 @@ protected:
     
 private:
 
-    // wxWindows macro, required to be able to use Event tables in the .cpp file.
+    // wxWidgets macro, required to be able to use Event tables in the .cpp file.
     DECLARE_EVENT_TABLE()
     
 };

contrib/samples/xrc/derivdlg.cpp

@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif

contrib/samples/xrc/derivdlg.h

@@ -59,7 +59,7 @@ private:
     // Override base class functions of a wxDialog.
     void OnOK( wxCommandEvent &event );
 
-    // Any class wishing to process wxWindows events must use this macro
+    // Any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 
 };

contrib/samples/xrc/myframe.cpp

@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -73,14 +73,14 @@
 // Event table: connect the events to the handler functions to process them
 //-----------------------------------------------------------------------------
 
-// The event tables connect the wxWindows events with the functions (event
+// The event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 // The reason why the menuitems and tools are given the same name in the 
 // XRC file, is that both a tool (a toolbar item) and a menuitem are designed
 // to fire the same kind of event (an EVT_MENU) and thus I give them the same 
 // ID name to help new users emphasize this point which is often overlooked 
-// when starting out with wxWindows.
+// when starting out with wxWidgets.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(XRCID("exit_tool_or_menuitem"),  MyFrame::OnExitToolOrMenuCommand)
     EVT_MENU(XRCID("non_derived_dialog_tool_or_menuitem"), MyFrame::OnNonDerivedDialogToolOrMenuCommand) 

contrib/samples/xrc/myframe.h

@@ -55,7 +55,7 @@ private:
     void OnArtProviderToolOrMenuCommand(wxCommandEvent& event);
     void OnVariableExpansionToolOrMenuCommand(wxCommandEvent& event);
 
-    // Any class wishing to process wxWindows events must use this macro
+    // Any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 
 };

contrib/samples/xrc/rc/artprov.xrc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxDialog" name="art_provider_dialog">
     <title>wxArtProvider Example</title>

contrib/samples/xrc/rc/basicdlg.xrc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxDialog" name="non_derived_dialog">
     <title>Non-Derived Dialog Example</title>

contrib/samples/xrc/rc/controls.xrc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxDialog" name="controls_dialog">
     <title>Controls Example</title>

contrib/samples/xrc/rc/custclas.xrc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxDialog" name="custom_class_dialog">
     <title>Custom Class Example</title>
@@ -19,7 +19,7 @@
             <object class="wxTextCtrl" name="message_textctrl">
                 <size>500,150</size>
                 <style>wxTE_MULTILINE</style>
-                <value>You can embed your own custom classes into an XRC file. This is referred to as attaching an unknown control.\n\nThere are 3 main cases when you would want to do this:\n\n(A) Most commonly: you have derived a class from one of the main wxWindows controls, so that it can manage its own state and look after its own events, because it is better management to have a portable class with all the code for that control in there with the class, instead of being having many event handlers for that control scattered up in its parent dialog (which is allowed, but gets messy if a control has alot of methods). For example, if you require a wxListCtrl that popups a menu when right-clicked on an item, and you want the wxListCtrl to resize its columns in response to an OnSize(), and a few more methods, it makes better sourcecode logic to package all these methods into by a standalone derived wxListCtrl class, instead of having the parent dialog manage all these events and other functions. This is what the example below shows: it does a custom behaviour of resizing its first column to appropriately fill up the width of the control on a resize event, and it pops up a context-menu in response to a left click (and shades out popup menu item appropriately if there is no item currenty selected in the listctrl).\n\n(B)You have an utterly new widget that has no equivalent in the wxWindows class heirarchy, so you thus need to embed your class to get the needed functionality.\n\n(C) You are using one of the rarely used wxWindows controls that doesn't have an XRC handler in the XRC library. However, all of the major controls: wxButton, wxTextCtrl, etc have an XRC handler, so this is pretty rare, and you could always write your own XRC handler for that control if you wanted. You can choose the "Controls example" from the XRC demo menu to see all the controls that have an XRC handler.\n\nThe typical formula for attaching an unknown control is:\n\n(1) If you are deriving your own custom class to be embedded into the XRC, describe that class with its own .cpp and .h file. In this example it is custclass.cpp and custclass.h\n\n(2)Specify an "unknown" tag in the XRC file that you want to embed it into (see the unknown tag in custclass.xrc). This will be the placeholder of the new class.\n\n(3) Load the XRC dialog as usual, but before you show the dialog to the user, construct an instance of your custom control, and then use wxXmlResource::Get()-&gt;AttachUnknownControl() to put the custom class into its "unknown" placeholder in the XRC file.\n\nThe result is what you see below, a custom class control that fits in seemlessly with the whole dialog, the same as if it was read from XRC directly. Try out resizing this dialog, and watch the listctrl column resize, and right-click to call up its popup menu. By the way, if you look at the source of this XRC dialog, you will that this dialog node has a set of style flags that includes wxRESIZE__BORDER--that is why this dialog is resizable, whereas most of the rest of the dialogs in the XRC sample that don't include this tag, are not resizable.</value>
+                <value>You can embed your own custom classes into an XRC file. This is referred to as attaching an unknown control.\n\nThere are 3 main cases when you would want to do this:\n\n(A) Most commonly: you have derived a class from one of the main wxWidgets controls, so that it can manage its own state and look after its own events, because it is better management to have a portable class with all the code for that control in there with the class, instead of being having many event handlers for that control scattered up in its parent dialog (which is allowed, but gets messy if a control has alot of methods). For example, if you require a wxListCtrl that popups a menu when right-clicked on an item, and you want the wxListCtrl to resize its columns in response to an OnSize(), and a few more methods, it makes better sourcecode logic to package all these methods into by a standalone derived wxListCtrl class, instead of having the parent dialog manage all these events and other functions. This is what the example below shows: it does a custom behaviour of resizing its first column to appropriately fill up the width of the control on a resize event, and it pops up a context-menu in response to a left click (and shades out popup menu item appropriately if there is no item currenty selected in the listctrl).\n\n(B)You have an utterly new widget that has no equivalent in the wxWindows class heirarchy, so you thus need to embed your class to get the needed functionality.\n\n(C) You are using one of the rarely used wxWindows controls that doesn't have an XRC handler in the XRC library. However, all of the major controls: wxButton, wxTextCtrl, etc have an XRC handler, so this is pretty rare, and you could always write your own XRC handler for that control if you wanted. You can choose the "Controls example" from the XRC demo menu to see all the controls that have an XRC handler.\n\nThe typical formula for attaching an unknown control is:\n\n(1) If you are deriving your own custom class to be embedded into the XRC, describe that class with its own .cpp and .h file. In this example it is custclass.cpp and custclass.h\n\n(2)Specify an "unknown" tag in the XRC file that you want to embed it into (see the unknown tag in custclass.xrc). This will be the placeholder of the new class.\n\n(3) Load the XRC dialog as usual, but before you show the dialog to the user, construct an instance of your custom control, and then use wxXmlResource::Get()-&gt;AttachUnknownControl() to put the custom class into its "unknown" placeholder in the XRC file.\n\nThe result is what you see below, a custom class control that fits in seemlessly with the whole dialog, the same as if it was read from XRC directly. Try out resizing this dialog, and watch the listctrl column resize, and right-click to call up its popup menu. By the way, if you look at the source of this XRC dialog, you will that this dialog node has a set of style flags that includes wxRESIZE__BORDER--that is why this dialog is resizable, whereas most of the rest of the dialogs in the XRC sample that don't include this tag, are not resizable.</value>
             </object>
         </object>
         <object class="sizeritem">

contrib/samples/xrc/rc/derivdlg.xrc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxDialog" name="derived_dialog">
     <title>Derived Dialog Example</title>

contrib/samples/xrc/rc/frame.xrc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxFrame" name="main_frame">
     <title>XML Resources Demo</title>
@@ -18,7 +18,7 @@
             <object class="wxTextCtrl" name="message_textctrl">
                 <size>500,280</size>
                 <style>wxTE_MULTILINE</style>
-                <value>Welcome to the wxWindows XmlResource (XRC) sample! Using wxWindows XML resources makes your GUI C++ programming much faster and easier.\n\nView the examples under the "Basic" menu to learn how to get up and running with XRC quickly, and later have a look at the examples under the "Advanced" menu for advanced techniques.\n\nThe XML file that described this frame is the sample's frame.xrc file, with the menu in menu.xrc, and the toolbar in toolbar.xrc. The frame XRC file structure is exactly the same as the XRC files for the dialogs, except that the top level node is a wxFrame, not a wxDialog. Each of the other dialog in this example is a separate XRC file, each of which can be examined for how they work.</value>
+                <value>Welcome to the wxWidgets XmlResource (XRC) sample! Using wxWidgets XML resources makes your GUI C++ programming much faster and easier.\n\nView the examples under the "Basic" menu to learn how to get up and running with XRC quickly, and later have a look at the examples under the "Advanced" menu for advanced techniques.\n\nThe XML file that described this frame is the sample's frame.xrc file, with the menu in menu.xrc, and the toolbar in toolbar.xrc. The frame XRC file structure is exactly the same as the XRC files for the dialogs, except that the top level node is a wxFrame, not a wxDialog. Each of the other dialog in this example is a separate XRC file, each of which can be examined for how they work.</value>
             </object>
         </object>
     </object>

contrib/samples/xrc/rc/menu.xrc

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxMenuBar" name="main_menu">
 <style>wxMB_DOCKABLE</style>
@@ -28,7 +28,7 @@
         <object class="wxMenuItem" name="controls_tool_or_menuitem">
             <label>_Controls Example</label>
             <bitmap>controls.xpm</bitmap>
-            <help>A notebook displaying all the wxWindows controls</help>
+            <help>A notebook displaying all the wxWidgets controls</help>
         </object>        
         <object class="wxMenuItem" name="uncentered_tool_or_menuitem">
             <label>_Uncentered Example</label>

contrib/samples/xrc/rc/platform.xrc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxDialog" name="platform_property_dialog">
     <title>Platform Property Example</title>

contrib/samples/xrc/rc/resource.xrc

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
   <object class="wxMenuBar" name="mainmenu">
     <style>wxMB_DOCKABLE</style>
     <object class="wxMenu" name="menu_file">

contrib/samples/xrc/rc/toolbar.xrc

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxToolBar" name="main_toolbar">
     <style>wxTB_FLAT|wxTB_DOCKABLE</style>
@@ -18,7 +18,7 @@
     <object class="tool" name="controls_tool_or_menuitem">
         <tooltip>Controls Example</tooltip>
         <bitmap>controls.xpm</bitmap>
-        <longhelp>A notebook displaying all the wxWindows controls</longhelp>
+        <longhelp>A notebook displaying all the wxWidgets controls</longhelp>
     </object>        
     <object class="tool" name="uncentered_tool_or_menuitem">
         <tooltip>Uncentered Example</tooltip>

contrib/samples/xrc/rc/uncenter.xrc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxDialog" name="uncentered_dialog">
     <title>Uncentered Example</title>

contrib/samples/xrc/rc/variable.xrc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxDialog" name="variable_expansion_dialog">
     <title>Variable Expansion Example</title>

contrib/samples/xrc/xrcdemo.cpp

@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -53,10 +53,10 @@
 #include "myframe.h"
 
 //-----------------------------------------------------------------------------
-// wxWindows macro: Declare the application.
+// wxWidgets macro: Declare the application.
 //-----------------------------------------------------------------------------
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. the_app and

contrib/src/deprecated/resource.cpp

@@ -2373,7 +2373,7 @@ long wxParseWindowStyle(const wxString& bitListString)
 }
 
 /*
-* Load a bitmap from a wxWindows resource, choosing an optimum
+* Load a bitmap from a wxWidgets resource, choosing an optimum
 * depth and appropriate type.
 */
 
@@ -2527,7 +2527,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
 }
 
 /*
-* Load an icon from a wxWindows resource, choosing an optimum
+* Load an icon from a wxWidgets resource, choosing an optimum
 * depth and appropriate type.
 */
 
@@ -2652,7 +2652,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
             }
         case wxBITMAP_TYPE_XPM_DATA:
             {
-                // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
+                // *** XPM ICON NOT YET IMPLEMENTED IN wxWidgets ***
                 /*
                 wxItemResource *item = table->FindResource(name);
                 if (!item)

contrib/src/gizmos/dynamicsash.cpp

@@ -22,7 +22,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif

contrib/src/gizmos/editlbox.cpp

@@ -19,7 +19,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif

contrib/src/gizmos/splittree.cpp

@@ -30,7 +30,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif

contrib/src/mmedia/sndesd.cpp

@@ -44,7 +44,7 @@
 
 // --------------------------------------------------------------------------
 
-#define MY_ESD_NAME "wxWindows/wxSoundStreamESD"
+#define MY_ESD_NAME "wxWidgets/wxSoundStreamESD"
 
 // --------------------------------------------------------------------------
 // wxSoundStreamESD: ESD sound driver

contrib/src/mmedia/sndoss.cpp

@@ -24,7 +24,7 @@
 #endif
 
 // --------------------------------------------------------------------------
-// wxWindows headers
+// wxWidgets headers
 // --------------------------------------------------------------------------
 #include "wx/defs.h"
 #include "wx/string.h"

contrib/src/net/email.cpp

@@ -40,7 +40,7 @@
 #endif
 
 // Send a message.
-// Specify profile, or leave it to wxWindows to find the current user name
+// Specify profile, or leave it to wxWidgets to find the current user name
 
 #ifdef __WXMSW__
 bool wxEmail::Send(wxMailMessage& message, const wxString& profileName, const wxString& WXUNUSED(sendMail))

contrib/src/stc/PlatWX.cpp

@@ -1,5 +1,5 @@
 // Scintilla source code edit control
-// PlatWX.cxx - implementation of platform facilities on wxWindows
+// PlatWX.cxx - implementation of platform facilities on wxWidgets
 // Copyright 1998-1999 by Neil Hodgson <neilh@scintilla.org>
 //                        Robin Dunn <robin@aldunn.com>
 // The License.txt file describes the conditions under which this software may be distributed.

contrib/src/stc/ScintillaWX.cpp

@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        ScintillaWX.cxx
-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
+// Purpose:     A wxWidgets implementation of Scintilla.  A class derived
 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatformWX.cxx  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer

contrib/src/stc/ScintillaWX.h

@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        ScintillaWX.h
-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
+// Purpose:     A wxWidgets implementation of Scintilla.  A class derived
 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatWX.cpp.  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer

contrib/src/stc/scintilla/include/Platform.h

@@ -1,7 +1,7 @@
 // Scintilla source code edit control
 /** @file Platform.h
  ** Interface to platform facilities. Also includes some basic utilities.
- ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows.
+ ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWidgets.
  **/
 // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
@@ -12,7 +12,7 @@
 // PLAT_GTK = GTK+ on Linux or Win32
 // PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32
 // PLAT_WIN = Win32 API on Win32 OS
-// PLAT_WX is wxWindows on any supported platform
+// PLAT_WX is wxWidgets on any supported platform
 
 #define PLAT_GTK 0
 #define PLAT_GTK_WIN32 0

contrib/src/stc/stc.cpp

@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        stc.cpp
-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
+// Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, but instead
 //              delegates most things to the real Scintilla class.

contrib/src/stc/stc.cpp.in

@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        stc.cpp
-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
+// Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, but instead
 //              delegates most things to the real Scintilla class.

contrib/utils/convertrc/convert.cpp

@@ -18,7 +18,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
 #endif

contrib/utils/convertrc/rc2wxr.cpp

@@ -46,7 +46,7 @@ This code was used as a starting point for my rc2xml converter
 
 // for all others, include the necessary headers (this file is usually all you
 
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 
 #ifndef WX_PRECOMP
 

contrib/utils/convertrc/rc2xml.cpp

@@ -28,7 +28,7 @@ cross platform (wxGTK,etc)
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
 #endif
@@ -730,7 +730,7 @@ void rc2xml::WriteName(wxString name)
 
 //Try to convert any number ids into names
 name=LookUpId(name);
-//Replace common MS ids with wxWindows ids
+//Replace common MS ids with wxWidgets ids
 //I didn't do everyone of them
     if (name==_T("IDOK"))
         name=_T("wxID_OK");

contrib/utils/wxrcedit/edapp.cpp

@@ -20,7 +20,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -47,7 +47,7 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
-    SetVendorName(wxT("wxWindows"));
+    SetVendorName(wxT("wxWidgets"));
     SetAppName(wxT("wxrcedit"));
     wxString arg = (argc >= 1) ? argv[1] : _T("");
     wxInitAllImageHandlers();

contrib/utils/wxrcedit/editor.cpp

@@ -183,7 +183,7 @@ END_EVENT_TABLE()
 EditorFrame *EditorFrame::ms_Instance = NULL;
 
 EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename)
-    : wxFrame(parent, -1, filename + _("- wxWindows resources editor"))
+    : wxFrame(parent, -1, filename + _("- wxWidgets resources editor"))
 {
     ms_Instance = this;
 

contrib/utils/wxrcedit/splittree.cpp

@@ -30,7 +30,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif

demos/dbbrowse/dummy.cpp

@@ -11,7 +11,7 @@
  * always start by compiling this and producing the PCH file.
  * Then subsequent source files use the PCH file.
  *
- * If precompiling wx.h for wxWindows and derived apps,
+ * If precompiling wx.h for wxWidgets and derived apps,
  * link dummy.obj with your program (the MSC 7 linker complains otherwise).
  *
  * This is the only convenient way I found to use precompiled headers

demos/dbbrowse/std.h

@@ -3,7 +3,7 @@
 //---------------------------------------------------------------------------
 //-- all #includes that the whole Project needs. ----------------------------
 //---------------------------------------------------------------------------
-#include <wx/config.h>      // to let wxWindows choose a wxConfig class for your platform
+#include <wx/config.h>      // to let wxWidgets choose a wxConfig class for your platform
 #include <wx/confbase.h>    // base config class
 #include <wx/dbtable.h>
 #include <wx/generic/grid.h>

demos/forty/canvas.cpp

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

demos/forty/canvas.h

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _CANVAS_H_
 #define _CANVAS_H_

demos/forty/card.cpp

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 //+-------------------------------------------------------------+
 //| Description

demos/forty/card.h

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 //+-------------------------------------------------------------+
 //| Description:												|

demos/forty/forty.cpp

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

demos/forty/forty.h

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _FORTY_H_
 #define _FORTY_H_

demos/forty/game.cpp

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

demos/forty/game.h

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _GAME_H_
 #define _GAME_H_

demos/forty/pile.cpp

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 //+-------------------------------------------------------------+
 //| Description:												|

demos/forty/pile.h

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 //+-------------------------------------------------------------+
 //| Description:												|

demos/forty/playerdg.cpp

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

demos/forty/playerdg.h

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _PLAYERDG_H_
 #define _PLAYERDG_H_

demos/forty/scoredg.cpp

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(__APPLE__)

demos/forty/scoredg.h

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _SCOREDG_H_
 #define _SCOREDG_H_

demos/forty/scorefil.cpp

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 14th May 1998 - ported to wxWindows 2.0
+// Last modified: 14th May 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -68,7 +68,7 @@ ScoreFile::ScoreFile(const wxString& appName)
 	}
 #endif
 
-	m_config = new wxConfig(appName, _T("wxWindows"), appName, _T(""),
+	m_config = new wxConfig(appName, _T("wxWidgets"), appName, _T(""),
                                 wxCONFIG_USE_LOCAL_FILE);  // only local
 }
 

demos/forty/scorefil.h

@@ -8,7 +8,7 @@
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:   	wxWindows licence
 //---------------------------------------------------------------------------
-// Last modified: 22nd July 1998 - ported to wxWindows 2.0
+// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _SCOREFILE_H_
 #define _SCOREFILE_H_

demos/fractal/fractal.cpp

@@ -23,7 +23,7 @@ done for MS-Windows. On a Sun the colours look a little washed
 out and there is not as much snow or high mountains (maybe the
 random number generators fault). The viewing plane is not
 quite right as the original code used SetViewportOrg() which there
-doesn't seem to be an equivalent of under wxWindows, and my quick
+doesn't seem to be an equivalent of under wxWidgets, and my quick
 hack doesn't fix. 
 */
 
@@ -94,7 +94,7 @@ DECLARE_EVENT_TABLE()
 bool MyApp::OnInit()
 {
   // Create the main frame window
-  MyFrame *frame = new MyFrame(NULL, _T("Fractal Mountains for wxWindows"), wxPoint(-1, -1), wxSize(640, 480));
+  MyFrame *frame = new MyFrame(NULL, _T("Fractal Mountains for wxWidgets"), wxPoint(-1, -1), wxSize(640, 480));
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;

demos/life/dialogs.cpp

@@ -60,7 +60,7 @@ enum
 };
 
 // --------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // --------------------------------------------------------------------------
 
 // Event tables
@@ -181,7 +181,7 @@ LifeAboutDialog::LifeAboutDialog(wxWindow *parent)
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
     sizer->Add( sbmp, 0, wxCENTRE | wxALL, 10 );
     sizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 5 );
-    sizer->Add( CreateTextSizer(_("Life! version 2.2 for wxWindows\n\n\
+    sizer->Add( CreateTextSizer(_("Life! version 2.2 for wxWidgets\n\n\
 (c) 2000 Guillermo Rodriguez Garcia\n\n\
 <guille@iies.es>\n\n\
 Portions of the code are based in XLife;\n\

demos/life/dialogs.h

@@ -50,7 +50,7 @@ public:
     void OnListBox(wxCommandEvent &event);
 
 private:
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 
     int         m_value;

demos/life/life.cpp

@@ -67,7 +67,7 @@
 // --------------------------------------------------------------------------
 
 // IDs for the controls and the menu commands. Exluding those already defined
-// by wxWindows, such as wxID_NEW.
+// by wxWidgets, such as wxID_NEW.
 enum
 {
     // timer
@@ -99,7 +99,7 @@ enum
 };
 
 // --------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // --------------------------------------------------------------------------
 
 // Event tables

demos/life/life.h

@@ -57,7 +57,7 @@ public:
     void DrawCell(wxInt32 i, wxInt32 j, bool alive);
 
 private:
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 
     // draw a cell (parametrized by DC)
@@ -109,7 +109,7 @@ public:
     LifeNavigator(wxWindow *parent);
 
 private:
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 
     // event handlers
@@ -133,7 +133,7 @@ public:
     void UpdateUI();
 
 private:
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 
     // event handlers

distrib/msw/makefile.rsp

@@ -38,6 +38,7 @@ samples/html/test/Makefile.in
 samples/html/virtual/Makefile.in
 samples/html/widget/Makefile.in
 samples/html/zip/Makefile.in
+samples/html/htmlctrl/Makefile.in
 samples/image/Makefile.in
 samples/joytest/Makefile.in
 samples/layout/Makefile.in

distrib/msw/vc.rsp

@@ -119,6 +119,8 @@ samples/html/widget/widget.dsp
 samples/html/widget/widget.dsw
 samples/html/zip/zip.dsp
 samples/html/zip/zip.dsw
+samples/html/htmlctrl/htmlctrl.dsw
+samples/html/htmlctrl/htmlctrl.dsp
 
 samples/image/image.dsp
 samples/image/image.dsw

include/wx/stc/stc.h

@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        stc.h
-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
+// Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, and in fact there
 //              is no mention of Scintilla classes at all in this header.

include/wx/xrc/xmlres.h

@@ -59,7 +59,7 @@ class wxXmlResourceModule;
 //     older versions of the library may ignore it.
 //   - if you change version number, follow these steps:
 //       - set major, minor and release numbers to respective version numbers of
-//         the wxWindows library (see wx/version.h)
+//         the wxWidgets library (see wx/version.h)
 //       - reset revision to 0 unless the first three are same as before,
 //         in which case you should increase revision by one
 #define WX_XMLRES_CURRENT_VERSION_MAJOR            2
@@ -127,7 +127,7 @@ public:
 
     // Initialize handlers for all supported controls/windows. This will
     // make the executable quite big because it forces linking against
-    // most of the wxWindows library.
+    // most of the wxWidgets library.
     void InitAllHandlers();
 
     // Initialize only a specific handler (or custom handler). Convention says
@@ -274,7 +274,7 @@ private:
 
 // This macro translates string identifier (as used in XML resource,
 // e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
-// wxWindows event tables.
+// wxWidgets event tables.
 // Example:
 //    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 //       EVT_MENU(XRCID("quit"), MyFrame::OnQuit)
@@ -463,9 +463,9 @@ WXDLLIMPEXP_XRC void wxXmlInitResourceModule();
 
 // This class is used to create instances of XRC "object" nodes with "subclass"
 // property. It is _not_ supposed to be used by XRC users, you should instead
-// register your subclasses via wxWindows' RTTI mechanism. This class is useful
+// register your subclasses via wxWidgets' RTTI mechanism. This class is useful
 // only for language bindings developer who need a way to implement subclassing
-// in wxWindows ports that don't support wxRTTI (e.g. wxPython).
+// in wxWidgets ports that don't support wxRTTI (e.g. wxPython).
 class WXDLLIMPEXP_XRC wxXmlSubclassFactory
 {
 public:

samples/access/accesstest.cpp

@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        accesstest.cpp
-// Purpose:     wxWindows accessibility sample
+// Purpose:     wxWidgets accessibility sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     2002-02-12
@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -107,7 +107,7 @@ public:
 private:
     wxTextCtrl* m_textCtrl;
 
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 
@@ -131,10 +131,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -145,7 +145,7 @@ END_EVENT_TABLE()
 
 #endif // wxUSE_ACCESSIBILITY
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -172,7 +172,7 @@ bool MyApp::OnInit()
     wxHelpProvider::Set(new wxSimpleHelpProvider());
 
     // create the main application window
-    MyFrame *frame = new MyFrame(_T("AccessTest wxWindows App"),
+    MyFrame *frame = new MyFrame(_T("AccessTest wxWidgets App"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // and show it (the frames, unlike simple controls, are not shown when
@@ -352,7 +352,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 #if 0 // wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 
 
@@ -365,12 +365,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     listBox->Append(wxT("Sealing wax"));
     listBox->Append(wxT("Strings"));
     listBox->CreateAccessible();
-    listBox->SetHelpText(wxT("This is a sample wxWindows listbox, with a number of items in it."));
+    listBox->SetHelpText(wxT("This is a sample wxWidgets listbox, with a number of items in it."));
 
     m_textCtrl = new wxTextCtrl(splitter, -1, wxT(""), wxDefaultPosition,
         wxDefaultSize, wxTE_MULTILINE);
     m_textCtrl->CreateAccessible();
-    m_textCtrl->SetHelpText(wxT("This is a sample wxWindows multiline text control."));
+    m_textCtrl->SetHelpText(wxT("This is a sample wxWidgets multiline text control."));
 
     splitter->SplitHorizontally(listBox, m_textCtrl, 150);
 

samples/artprov/arttest.cpp

@@ -68,7 +68,7 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

samples/calendar/calendar.cpp

@@ -118,7 +118,7 @@ public:
 private:
     MyPanel *m_panel;
 
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 
@@ -145,10 +145,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -180,7 +180,7 @@ BEGIN_EVENT_TABLE(MyPanel, wxPanel)
     EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -199,7 +199,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main application window
-    MyFrame *frame = new MyFrame(_T("Calendar wxWindows sample"),
+    MyFrame *frame = new MyFrame(_T("Calendar wxWidgets sample"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     frame->Show(true);
@@ -273,7 +273,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 }