X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04bf08b7e26f35a177b46948789505c316b2df28..32d49041eb56f67c825a36fdf7388a0845913cb6:/docs/latex/wx/category.tex

diff --git a/docs/latex/wx/category.tex b/docs/latex/wx/category.tex
index 98e4f323fd..f32ccb78da 100644
--- a/docs/latex/wx/category.tex
+++ b/docs/latex/wx/category.tex
@@ -2,16 +2,17 @@
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
-A classification of wxWindows classes by category.
+A classification of wxWidgets classes by category.
 
 {\large {\bf Managed windows}}
 
 There are several types of window that are directly controlled by the
 window manager (such as MS Windows, or the Motif Window Manager).
-Frames may contain windows, and dialog boxes may directly contain controls.
+Frames and dialogs are similar in wxWidgets, but only dialogs may be modal.
 
 \twocolwidtha{6cm}
 \begin{twocollist}\itemsep=0pt
+\twocolitem{\helpref{wxTopLevelWindow}{wxtoplevelwindow}}{Any top level window, dialog or frame}
 \twocolitem{\helpref{wxDialog}{wxdialog}}{Dialog box}
 \twocolitem{\helpref{wxFrame}{wxframe}}{Normal frame}
 \twocolitem{\helpref{wxMDIChildFrame}{wxmdichildframe}}{MDI child frame}
@@ -41,6 +42,7 @@ The following are a variety of classes that are derived from wxWindow.
 %\twocolitem{\helpref{wxTabbedPanel}{wxtabbedpanel}}{Tabbed panel (to be replaced with wxNotebook)}
 \twocolitem{\helpref{wxNotebook}{wxnotebook}}{Notebook class}
 \twocolitem{\helpref{wxListbook}{wxlistbook}}{Similar to notebook but using list control}
+\twocolitem{\helpref{wxChoicebook}{wxchoicebook}}{Similar to notebook but using choice control}
 \twocolitem{\helpref{wxPlotWindow}{wxplotwindow}}{A class to display data.}
 \twocolitem{\helpref{wxSashWindow}{wxsashwindow}}{Window with four optional sashes that can be dragged}
 \twocolitem{\helpref{wxSashLayoutWindow}{wxsashlayoutwindow}}{Window that can be involved in an IDE-like layout arrangement}
@@ -138,7 +140,6 @@ These are the classes relevant to sizer-based layout.
 \twocolitem{\helpref{wxGridBagSizer}{wxgridbagsizer}}{Another grid sizer that lets you specify the cell an item is in, and items can span rows and/or columns.}
 \twocolitem{\helpref{wxBoxSizer}{wxboxsizer}}{A sizer for laying out windows in a row or column}
 \twocolitem{\helpref{wxStaticBoxSizer}{wxstaticboxsizer}}{Same as wxBoxSizer, but with a surrounding static box}
-\twocolitem{\helpref{wxNotebookSizer}{wxnotebooksizer}}{Sizer to use with the wxNotebook control}
 \end{twocollist}
 
 \overview{Constraints overview}{constraintsoverview} describes constraints-based layout.
@@ -246,6 +247,7 @@ An event object contains information about a specific event. Event handlers
 \twocolitem{\helpref{wxSpinEvent}{wxspinevent}}{An event from \helpref{wxSpinButton}{wxspinbutton}}
 \twocolitem{\helpref{wxSysColourChangedEvent}{wxsyscolourchangedevent}}{A system colour change event}
 \twocolitem{\helpref{wxTabEvent}{wxtabevent}}{A tab control event}
+\twocolitem{\helpref{wxTimerEvent}{wxtimerevent}}{A timer expiration event}
 \twocolitem{\helpref{wxTreeEvent}{wxtreeevent}}{A tree control event}
 \twocolitem{\helpref{wxUpdateUIEvent}{wxupdateuievent}}{A user interface update event}
 \twocolitem{\helpref{wxWizardEvent}{wxwizardevent}}{A wizard event}
@@ -267,7 +269,7 @@ user input.
 
 {\large {\bf Data structures}}
 
-These are the data structure classes supported by wxWindows.
+These are the data structure classes supported by wxWidgets.
 
 \twocolwidtha{6cm}
 \begin{twocollist}\itemsep=0pt
@@ -282,7 +284,7 @@ These are the data structure classes supported by wxWindows.
 \twocolitem{\helpref{wxList}{wxlist}}{A simple linked list implementation}
 \twocolitem{\helpref{wxLongLong}{wxlonglong}}{A portable 64 bit integer type}
 \twocolitem{\helpref{wxNode}{wxnode}}{Represents a node in the wxList implementation}
-\twocolitem{\helpref{wxObject}{wxobject}}{The root class for most wxWindows classes}
+\twocolitem{\helpref{wxObject}{wxobject}}{The root class for most wxWidgets classes}
 \twocolitem{\helpref{wxPathList}{wxpathlist}}{A class to help search multiple paths}
 \twocolitem{\helpref{wxPoint}{wxpoint}}{Representation of a point}
 \twocolitem{\helpref{wxRect}{wxrect}}{A class representing a rectangle}
@@ -301,7 +303,7 @@ These are the data structure classes supported by wxWindows.
 
 \overview{Overview}{runtimeclassoverview}
 
-wxWindows supports run-time manipulation of class information, and dynamic
+wxWidgets supports run-time manipulation of class information, and dynamic
 creation of objects given class names.
 
 \twocolwidtha{6cm}
@@ -315,7 +317,7 @@ creation of objects given class names.
 
 \overview{Overview}{wxlogoverview}
 
-wxWindows provides several classes and functions for message logging.
+wxWidgets provides several classes and functions for message logging.
 Please see the \helpref{wxLog overview}{wxlogoverview} for more details.
 
 \twocolwidtha{6cm}
@@ -338,7 +340,7 @@ to redirect output sent to {\tt cout} to a \helpref{wxTextCtrl}{wxtextctrl}}
 
 \overview{Overview}{debuggingoverview}
 
-wxWindows supports some aspects of debugging an application through
+wxWidgets supports some aspects of debugging an application through
 classes, functions and macros.
 
 \twocolwidtha{6cm}
@@ -353,7 +355,7 @@ classes, functions and macros.
 
 {\large {\bf Networking classes}}
 
-wxWindows provides its own classes for socket based networking.
+wxWidgets provides its own classes for socket based networking.
 
 \twocolwidtha{6cm}
 \begin{twocollist}\itemsep=0pt
@@ -374,7 +376,7 @@ wxWindows provides its own classes for socket based networking.
 
 \overview{Overview}{ipcoverview}
 
-wxWindows provides simple interprocess communications facilities
+wxWidgets provides simple interprocess communications facilities
 based on Windows DDE, but available on most platforms using TCP.
 
 \twocolwidtha{6cm}
@@ -389,7 +391,7 @@ based on Windows DDE, but available on most platforms using TCP.
 
 \overview{Overview}{docviewoverview}
 
-wxWindows supports a document/view framework which provides
+wxWidgets supports a document/view framework which provides
 housekeeping for a document-centric application.
 
 \twocolwidtha{6cm}
@@ -449,7 +451,7 @@ facilities.
 
 {\large {\bf File related classes}}
 
-wxWindows has several small classes to work with disk files, see \helpref{file classes
+wxWidgets has several small classes to work with disk files, see \helpref{file classes
 overview}{wxfileoverview} for more details.
 
 \twocolwidtha{6cm}
@@ -465,7 +467,7 @@ overview}{wxfileoverview} for more details.
 
 {\large {\bf Stream classes}}
 
-wxWindows has its own set of stream classes, as an alternative to often buggy standard stream
+wxWidgets has its own set of stream classes, as an alternative to often buggy standard stream
 libraries, and to provide enhanced functionality.
 
 \twocolwidtha{6cm}
@@ -489,6 +491,8 @@ libraries, and to provide enhanced functionality.
 \twocolitem{\helpref{wxFileOutputStream}{wxfileoutputstream}}{File output stream class}
 \twocolitem{\helpref{wxFFileInputStream}{wxffileinputstream}}{Another file input stream class}
 \twocolitem{\helpref{wxFFileOutputStream}{wxffileoutputstream}}{Another file output stream class}
+\twocolitem{\helpref{wxStringInputStream}{wxstringinputstream}}{String input stream class}
+\twocolitem{\helpref{wxStringOutputStream}{wxstringoutputstream}}{String output stream class}
 \twocolitem{\helpref{wxZlibInputStream}{wxzlibinputstream}}{Zlib (compression) input stream class}
 \twocolitem{\helpref{wxZlibOutputStream}{wxzliboutputstream}}{Zlib (compression) output stream class}
 \twocolitem{\helpref{wxZipInputStream}{wxzipinputstream}}{Input stream for reading from ZIP archives}
@@ -500,7 +504,7 @@ libraries, and to provide enhanced functionality.
 
 \overview{Multithreading overview}{wxthreadoverview}
 
-wxWindows provides a set of classes to make use of the native thread
+wxWidgets provides a set of classes to make use of the native thread
 capabilities of the various platforms.
 
 \twocolwidtha{6cm}
@@ -517,7 +521,7 @@ capabilities of the various platforms.
 
 {\large {\bf HTML classes}}
 
-wxWindows provides a set of classes to display text in HTML format. These
+wxWidgets provides a set of classes to display text in HTML format. These
 class include a help system based on the HTML widget.
 
 \twocolwidtha{6cm}
@@ -534,7 +538,7 @@ class include a help system based on the HTML widget.
 
 {\large {\bf Virtual file system classes}}
 
-wxWindows provides a set of classes that implement an extensible virtual file system,
+wxWidgets provides a set of classes that implement an extensible virtual file system,
 used internally by the HTML classes.
 
 \twocolwidtha{6cm}
@@ -575,7 +579,7 @@ from specifications stored in an XML format.
 
 \overview{Database classes overview}{odbcoverview}
 
-wxWindows provides a set of classes for accessing Microsoft's ODBC (Open Database Connectivity)
+wxWidgets provides a set of classes for accessing Microsoft's ODBC (Open Database Connectivity)
 product, donated by Remstar. This is known as wxODBC.
 
 \twocolwidtha{6cm}