Patch #953131

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

diff --git a/docs/latex/wx/txrc.tex b/docs/latex/wx/txrc.tex
index 6cabc92248c41a005f4967a826b1c4df74ba2d5a..f5f0fcb8d4ab298ae157abfeee55ab43781d60d3 100644 (file)
--- a/docs/latex/wx/txrc.tex
+++ b/docs/latex/wx/txrc.tex
@@ -5,7 +5,7 @@
 
 Classes: \helpref{wxXmlResource}{wxxmlresource}, \helpref{wxXmlResourceHandler}{wxxmlresourcehandler}
 
 
 Classes: \helpref{wxXmlResource}{wxxmlresource}, \helpref{wxXmlResourceHandler}{wxxmlresourcehandler}
 

-{\bf IMPORTANT NOTE:} XRC is not yet a part of the core wxWindows library, so
+{\bf IMPORTANT NOTE:} XRC is not yet a part of the core wxWidgets 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.
 
 please see the next section for how to compile and link it. Otherwise if you
 try to use it, you will get link errors.
 


@@ -26,7 +26,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 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}
 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 +52,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
 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
 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}
 
 only the static version of library can be built at present.
 \end{itemize}
 


@@ -89,14 +89,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
 \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}
 
 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.
 
 It is highly recommended that you use a resource editing tool, since it's fiddly writing
 XRC files by hand.


@@ -137,6 +137,7 @@ XRS file is esentially a renamed ZIP archive which means that you can manipulate
 it with standard ZIP tools. Note that if you are using XRS files, you have
 to initialize \helpref{wxFileSystem}{wxfilesystem} ZIP handler first! It is a simple
 thing to do:
 it with standard ZIP tools. Note that if you are using XRS files, you have
 to initialize \helpref{wxFileSystem}{wxfilesystem} ZIP handler first! It is a simple
 thing to do:

+

 \begin{verbatim}
   #include <wx/filesys.h>
   #include <wx/fs_zip.h>
 \begin{verbatim}
   #include <wx/filesys.h>
   #include <wx/fs_zip.h>


@@ -155,6 +156,7 @@ Use the {\tt -c} switch to
 {\tt wxrc} utility to produce C++ file with embedded resources. This file will
 contain a function called {\it InitXmlResource} (unless you override this with
 a command line switch). Use it to load the resource:
 {\tt wxrc} utility to produce C++ file with embedded resources. This file will
 contain a function called {\it InitXmlResource} (unless you override this with
 a command line switch). Use it to load the resource:

+

 \begin{verbatim}
   extern void InitXMLResource(); // defined in generated file
   ...
 \begin{verbatim}
   extern void InitXMLResource(); // defined in generated file
   ...


@@ -208,12 +210,12 @@ public:
     void OnDlg2(wxCommandEvent& event);
 
 private:
     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()
 };
 
 // ----------------------------------------------------------------------------
     DECLARE_EVENT_TABLE()
 };
 
 // ----------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)


@@ -450,7 +452,7 @@ This is the XML file (resource.xrc) for the XRC sample.
 
 \subsection{XRC file format}\label{xrcfileformat}
 
 
 \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}
 distribution.
 
 \subsection{C++ header file generation}\label{xrccppheader}


@@ -520,6 +522,7 @@ though you must still use {\tt XRCID} to refer to widget ids in the event
 table. 
 
 Example:
 table. 
 
 Example:

+

 \begin{verbatim}
 #include "resource.h"
 
 \begin{verbatim}
 #include "resource.h"