X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2edb0bdef6238c8c246b6978bc14828b7033d931..8b2858410444b111cb192d1539ef6c76209091fd:/docs/latex/wx/wxPython.tex

diff --git a/docs/latex/wx/wxPython.tex b/docs/latex/wx/wxPython.tex
index 7b0fd6b027..686f6505be 100644
--- a/docs/latex/wx/wxPython.tex
+++ b/docs/latex/wx/wxPython.tex
@@ -7,7 +7,7 @@ This topic was written by Robin Dunn, author of the wxPython wrapper.
 %----------------------------------------------------------------------
 \subsection{What is wxPython?}\label{wxpwhat}
 
-wxPython is a blending of the wxWindows GUI classes and the
+wxPython is a blending of the wxWidgets GUI classes and the
 \urlref{Python}{http://www.python.org/} programming language.
 
 \wxheading{Python}
@@ -33,8 +33,8 @@ commercial use.
 wxPython is a Python package that can be imported at runtime that
 includes a collection of Python modules and an extension module
 (native code). It provides a series of Python classes that mirror (or
-shadow) many of the wxWindows GUI classes. This extension module
-attempts to mirror the class hierarchy of wxWindows as closely as
+shadow) many of the wxWidgets GUI classes. This extension module
+attempts to mirror the class hierarchy of wxWidgets as closely as
 possible. This means that there is a wxFrame class in wxPython that
 looks, smells, tastes and acts almost the same as the wxFrame class in
 the C++ version.
@@ -51,18 +51,18 @@ details about getting wxPython working for you.
 %----------------------------------------------------------------------
 \subsection{Why use wxPython?}\label{wxpwhy}
 
-So why would you want to use wxPython over just C++ and wxWindows?
+So why would you want to use wxPython over just C++ and wxWidgets?
 Personally I prefer using Python for everything. I only use C++ when I
 absolutely have to eke more performance out of an algorithm, and even
 then I usually code it as an extension module and leave the majority
 of the program in Python.
 
 Another good thing to use wxPython for is quick prototyping of your
-wxWindows apps. With C++ you have to continuously go though the
+wxWidgets apps. With C++ you have to continuously go though the
 edit-compile-link-run cycle, which can be quite time consuming. With
 Python it is only an edit-run cycle. You can easily build an
 application in a few hours with Python that would normally take a few
-days or longer with C++. Converting a wxPython app to a C++/wxWindows app
+days or longer with C++. Converting a wxPython app to a C++/wxWidgets app
 should be a straight forward task.
 
 %----------------------------------------------------------------------
@@ -122,7 +122,7 @@ for a listing of a few of them.
 
 I'm not going to try and teach the Python language here. You can do
 that at the \urlref{Python Tutorial}{http://www.python.org/doc/tut/tut.html}.
-I'm also going to assume that you know a bit about wxWindows already,
+I'm also going to assume that you know a bit about wxWidgets already,
 enough to notice the similarities in the classes used.
 
 Take a look at the following wxPython program. You can find a similar
@@ -191,17 +191,17 @@ it by issuing this command:
 052:         self.posCtrl.SetValue("%s, %s" % (pos.x, pos.y))
 053:
 054:
-055: # Every wxWindows application must have a class derived from wxApp
+055: # Every wxWidgets application must have a class derived from wxApp
 056: class MyApp(wxApp):
 057:
-058:     # wxWindows calls this method to initialize the application
+058:     # wxWidgets calls this method to initialize the application
 059:     def OnInit(self):
 060:
 061:         # Create an instance of our customized Frame class
 062:         frame = MyFrame(NULL, -1, "This is a test")
 063:         frame.Show(true)
 064:
-065:         # Tell wxWindows that this is our main window
+065:         # Tell wxWidgets that this is our main window
 066:         self.SetTopWindow(frame)
 067:
 068:         # Return a success flag
@@ -224,7 +224,7 @@ then access all the wxPython identifiers through the wx module, for
 example, "{\tt wx.wxFrame}".
 \item At line 13 the frame's sizing and moving events are connected to
 methods of the class. These helper functions are intended to be like
-the event table macros that wxWindows employs. But since static event
+the event table macros that wxWidgets employs. But since static event
 tables are impossible with wxPython, we use helpers that are named the
 same to dynamically build the table. The only real difference is
 that the first argument to the event helpers is always the window that
@@ -251,11 +251,11 @@ when necessary. For this reason, most wxPython objects do not need to
 have a \_\_del\_\_ method that explicitly causes the C++ object to be
 deleted. If you ever have the need to forcibly delete a window, use
 the Destroy() method as shown on line 36.
-\item Just like wxWindows in C++, wxPython apps need to create a class
+\item Just like wxWidgets in C++, wxPython apps need to create a class
 derived from {\tt wxApp} (line 56) that implements a method named
 {\tt OnInit}, (line 59.) This method should create the application's
 main window (line 62) and use {\tt wxApp.SetTopWindow()} (line 66) to
-inform wxWindows about it.
+inform wxWidgets about it.
 \item And finally, at line 72 an instance of the application class is
 created. At this point wxPython finishes initializing itself, and calls
 the {\tt OnInit} method to get things started. (The zero parameter here is
@@ -266,7 +266,7 @@ level windows are closed.
 \end{enumerate}
 
 %----------------------------------------------------------------------
-\subsection{wxWindows classes implemented in wxPython}\label{wxpclasses}
+\subsection{wxWidgets classes implemented in wxPython}\label{wxpclasses}
 
 The following classes are supported in wxPython. Most provide nearly
 full implementations of the public interfaces specified in the C++