added GetCurrentPage()

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

diff --git a/docs/latex/wx/txrc.tex b/docs/latex/wx/txrc.tex
index f5f0fcb8d4ab298ae157abfeee55ab43781d60d3..f412029aaddbf93afc005c4db3055680e4fc53c9 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 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.
-
 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++
@@ -33,39 +29,6 @@ on the XML standard, existing XML editors can be used for simple editing purpose
 
 XRC was written by Vaclav Slavik.
 
-\subsection{Compiling and using XRC}\label{compilingxrc}
-
-XRC can be found under the 'contrib' hierarchy, in the following directories:
-
-\begin{verbatim}
-  contrib/src/xrc           ; XRC source
-  contrib/include/wx/xrc    ; XRC headers
-  contrib/samples/xrc       ; XRC sample
-  contrib/utils/wxrc        ; XRC resource compiler
-  contrib/utils/wxrcedit    ; XRC editor (in progress)
-\end{verbatim}
-
-To compile XRC:
-
-\begin{itemize}\itemsep=0pt
-\item Under Windows using VC++, open the contrib/src/xrc/XrcVC.dsw project
-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
-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 wxWidgets build system that means that
-only the static version of library can be built at present.
-\end{itemize}
-
-To use XRC:
-
-\begin{itemize}\itemsep=0pt
-\item Under Windows using VC++, link with wxxrc[d].lib.
-\item Under Unix, link with libwxxrc[d].a.
-\end{itemize}
-
 \subsection{XRC concepts}\label{xrcconcepts}
 
 These are the typical steps for using XRC files in your application.
@@ -92,7 +55,6 @@ To create an XRC file, you can use one of the following methods.
 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}
 
@@ -126,14 +88,14 @@ containing class definitions for the windows defined by the XRC file (see specia
 
 For example:
 \begin{verbatim}
-  % wxrc resource.wrc
-  % wxrc resource.wrc -o resource.wrs
-  % wxrc resource.wrc -v -c -o resource.cpp
+  % wxrc resource.xrc
+  % wxrc resource.xrc -o resource.xrs
+  % wxrc resource.xrc -v -c -o resource.cpp
 \end{verbatim}
 
 \wxheading{Note}
 
-XRS file is esentially a renamed ZIP archive which means that you can manipulate
+XRS file is essentially 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:
@@ -158,7 +120,7 @@ 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
+  extern void InitXmlResource(); // defined in generated file
   ...
   wxXmlResource::Get()->InitAllHandlers();
   InitXmlResource();
@@ -462,7 +424,7 @@ containing class definitions for the GUI windows defined in the XRC file.
 This code generation can make it easier to use XRC and automate program
 development.
 The classes can be used as basis for development, freeing the
-programmer from dealing with most of the XRC specifities (e.g. {\tt XRCCTRL}).
+programmer from dealing with most of the XRC specifics (e.g. {\tt XRCCTRL}).
 
 For each top level window defined in the XRC file a C++ class definition is
 generated, containing as class members the named widgets of the window.