semaphore with count of 1 is not exactly the same as mutex

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

diff --git a/docs/latex/wx/txrc.tex b/docs/latex/wx/txrc.tex
index bc3408e2575f196ebb525c7b9b549b8dfd548ddc..3a11b955d7721d176f0c0eed54f3c4e5f759e616 100644 (file)
--- a/docs/latex/wx/txrc.tex
+++ b/docs/latex/wx/txrc.tex
@@ -55,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{wxGlade}{http://wxglade.sf.net}, a GUI designer written in wxPython. At the moment it can generate Python, C++ and XRC;
 dialog editor that you can find in the {\tt wxPython/tools} subdirectory of the wxWidgets
 CVS archive;
 \item use \urlref{wxGlade}{http://wxglade.sf.net}, a GUI designer written in wxPython. At the moment it can generate Python, C++ and XRC;

-\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.wxwidgets.org/lnk\_tool.htm}{http://www.wxwidgets.org/lnk\_tool.htm}.
 \end{itemize}
 
 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.htm}.


@@ -321,7 +320,7 @@ This is the XML file (resource.xrc) for the XRC sample.
           <object class="wxStaticText">
             <label>fdgdfgdfgdfg</label>
           </object>
           <object class="wxStaticText">
             <label>fdgdfgdfgdfg</label>
           </object>

-          <style>wxSUNKEN_BORDER</style>
+          <style>wxBORDER\_SUNKEN</style>

         </object>
         <flag>wxALIGN_CENTER</flag>
       </object>
         </object>
         <flag>wxALIGN_CENTER</flag>
       </object>


@@ -380,7 +379,7 @@ This is the XML file (resource.xrc) for the XRC sample.
       <object class="sizeritem" name="dfgdfg">
         <object class="wxTextCtrl">
           <size>200,200d</size>
       <object class="sizeritem" name="dfgdfg">
         <object class="wxTextCtrl">
           <size>200,200d</size>

-          <style>wxTE_MULTILINE|wxSUNKEN_BORDER</style>
+          <style>wxTE_MULTILINE|wxBORDER_SUNKEN</style>

           <value>Hello, this is an ordinary multiline\n         textctrl....</value>
         </object>
         <option>1</option>
           <value>Hello, this is an ordinary multiline\n         textctrl....</value>
         </object>
         <option>1</option>


@@ -507,13 +506,28 @@ END_EVENT_TABLE()
 
 \end{verbatim}
 
 
 \end{verbatim}
 

+It is also possible to access the wxSizerItem of a sizer that is part of
+a resource.  This can be done using {\tt XRCSIZERITEM} as shown.  The
+resource file can have something like this for a sizer item.

 
 

+\begin{verbatim}
+<object class="spacer" name="area">
+  <size>400, 300</size>
+</object>
+\end{verbatim}
+
+The code can then access the sizer item by using {\tt XRCSIZERITEM} and
+{\tt XRCID} together.
+
+\begin{verbatim}
+wxSizerItem* item = XRCSIZERITEM(*this, "area");
+\end{verbatim}

 
 \subsection{Adding new resource handlers}\label{newresourcehandlers}
 
 Adding a new resource handler is pretty easy.
 Typically, to add an handler for the {\tt MyControl} class, you'll want to create
 
 \subsection{Adding new resource handlers}\label{newresourcehandlers}
 
 Adding a new resource handler is pretty easy.
 Typically, to add an handler for the {\tt MyControl} class, you'll want to create

-the {\tt xh_mycontrol.h} {\tt xh_mycontrol.cpp} files.
+the {\tt xh\_mycontrol.h} {\tt xh\_mycontrol.cpp} files.

 
 The header needs to contains the {\tt MyControlXmlHandler} class definition:
 
 
 The header needs to contains the {\tt MyControlXmlHandler} class definition:
 


@@ -545,7 +559,7 @@ IMPLEMENT_DYNAMIC_CLASS(MyControlXmlHandler, wxXmlResourceHandler)
 MyControlXmlHandler::MyControlXmlHandler()
 {
     // this call adds support for all wxWindows class styles
 MyControlXmlHandler::MyControlXmlHandler()
 {
     // this call adds support for all wxWindows class styles

-    // (e.g. wxSIMPLE_BORDER, wxSUNKEN_BORDER, wxWS_EX_* etc etc)
+    // (e.g. wxBORDER_SIMPLE, wxBORDER_SUNKEN, wxWS_EX_* etc etc)

     AddWindowStyles();
 
     // if MyControl class supports e.g. MYCONTROL_DEFAULT_STYLE
     AddWindowStyles();
 
     // if MyControl class supports e.g. MYCONTROL_DEFAULT_STYLE