Applied patch [ 1042241 ] Fixes print setup problem (MSW UNICODE build)

[wxWidgets.git] / docs / latex / wx / txrc.tex

diff --git a/docs/latex/wx/txrc.tex b/docs/latex/wx/txrc.tex
index 1a2cd4d0f90d001324ba2bbcf71aa7ef6995a464..1f447762868ca45668bd896a155d100cc9752050 100644 (file)
--- a/docs/latex/wx/txrc.tex
+++ b/docs/latex/wx/txrc.tex
@@ -5,10 +5,6 @@
 
 Classes: \helpref{wxXmlResource}{wxxmlresource}, \helpref{wxXmlResourceHandler}{wxxmlresourcehandler}
 
-{\bf IMPORTANT NOTE:} XRC is not yet a part of the core wxWindows library, so
-please see the next section for how to compile and link it. Otherwise if you
-try to use it, you will get link errors.
-
 The XML-based resource system, known as XRC, allows user interface elements such as
 dialogs, menu bars and toolbars, to be stored in text files and loaded into
 the application at run-time. XRC files can also be compiled into binary XRS files or C++
@@ -26,7 +22,7 @@ is a more elegant solution.
 \item You can choose between different alternative resource files at run time, if necessary.
 \item The XRC format uses sizers for flexibility, allowing dialogs to be resizable
 and highly portable.
-\item The XRC format is a wxWindows standard,
+\item The XRC format is a wxWidgets standard,
 and can be generated or postprocessed by any program that understands it. As it is based
 on the XML standard, existing XML editors can be used for simple editing purposes.
 \end{itemize}
@@ -52,10 +48,10 @@ To compile XRC:
 and compile. Also compile contrib/utils/wxrc using wxBase if you wish to compile
 resource files.
 \item Under Unix, XRC should be configured when you configured
-wxWindows. Make XRC by changing directory to contrib/src/xrc and
+wxWidgets. Make XRC by changing directory to contrib/src/xrc and
 type 'make'.  Similarly compile contrib/utils/wxrc using wxBase if you wish to compile
 resource files. {\bf Note:} there is currently a
-problem with the wxWindows build system that means that
+problem with the wxWidgets build system that means that
 only the static version of library can be built at present.
 \end{itemize}
 
@@ -89,14 +85,14 @@ To create an XRC file, you can use one of the following methods.
 \item use \urlref{wxDesigner}{http://www.roebling.de}, a commercial dialog designer/RAD tool;
 \item use \urlref{DialogBlocks}{http://www.anthemion.co.uk/dialogblocks}, a commercial dialog editor;
 \item use \urlref{XRCed}{http://xrced.sf.net}, a wxPython-based
-dialog editor that you can find in the {\tt wxPython/tools} subdirectory of the wxWindows
+dialog editor that you can find in the {\tt wxPython/tools} subdirectory of the wxWidgets
 CVS archive;
 \item use \urlref{Glade}{http://wxglade.sf.net}, a GUI designer written in wxPython. At the moment it can generate Python, C++ and XRC;
 \item use wxrcedit ({\tt utils/contrib/wxrcedit}) (under development);
 \item convert WIN32 RC files to XRC with the tool in {\tt contrib/utils/convertrc}.
 \end{itemize}
 
-A complete list of third-party tools that write to XRC can be found at \urlref{www.wxwindows.org/lnk\_tool.htm}{http://www.wxwindows.org/lnk\_tool.in}.
+A complete list of third-party tools that write to XRC can be found at \urlref{www.wxwidgets.org/lnk\_tool.htm}{http://www.wxwidgets.org/lnk\_tool.in}.
 
 It is highly recommended that you use a resource editing tool, since it's fiddly writing
 XRC files by hand.
@@ -210,12 +206,12 @@ public:
     void OnDlg2(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()
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -452,7 +448,7 @@ This is the XML file (resource.xrc) for the XRC sample.
 
 \subsection{XRC file format}\label{xrcfileformat}
 
-Please see Technical Note 14 (docs/tech/tn0014.txt) in your wxWindows
+Please see Technical Note 14 (docs/tech/tn0014.txt) in your wxWidgets
 distribution.
 
 \subsection{C++ header file generation}\label{xrccppheader}