Moved property unattachment code from wxPropertyGridInterface::RemoveProperty() to...

[wxWidgets.git] / docs / doxygen / overviews / xrc.h

diff --git a/docs/doxygen/overviews/xrc.h b/docs/doxygen/overviews/xrc.h
index 31bae6c52a22568680e71f3df9ac09ae17718b69..f37df486a00c9b2e1f165d5e8df6b854040c6b94 100644 (file)
--- a/docs/doxygen/overviews/xrc.h
+++ b/docs/doxygen/overviews/xrc.h
@@ -6,7 +6,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-/*!
+/**
 
 @page overview_xrc XML Based Resource System (XRC)
 
@@ -41,10 +41,10 @@ XRC was written by Vaclav Slavik.
 @li @ref overview_xrc_embeddedresource
 @li @ref overview_xrc_cppsample
 @li @ref overview_xrc_sample
-@li @ref overview_xrc_fileformat
 @li @ref overview_xrc_cppheader
 @li @ref overview_xrc_newresourcehandlers
 
+See also the separate @ref overview_xrcformat page for details about the XRC file format.
 
 <hr>
 
@@ -259,8 +259,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
-    msg.Printf( _T("This is the about dialog of XML resources demo.\n")
-                _T("Welcome to %s"), wxVERSION_STRING);
+    msg.Printf( wxT("This is the about dialog of XML resources demo.\n")
+                wxT("Welcome to %s"), wxVERSION_STRING);
 
     wxMessageBox(msg, "About XML resources demo",
                  wxOK | wxICON_INFORMATION, this);
@@ -384,6 +384,7 @@ This is the XML file (resource.xrc) for the XRC sample.
               </object>
             </object>
             <label>Page</label>
+            <image>0</image>
           </object>
           <object class="notebookpage">
             <object class="wxPanel">
@@ -397,8 +398,14 @@ This is the XML file (resource.xrc) for the XRC sample.
               </object>
             </object>
             <label>Page 2</label>
+            <image>1</image>
           </object>
           <usenotebooksizer>1</usenotebooksizer>
+        <imagelist>
+            <size>16,16</size>
+            <bitmap stock_id="wxART_QUESTION"/>
+            <bitmap stock_id="wxART_WARNING"/>
+        </imagelist>
         </object>
         <flag>wxEXPAND</flag>
       </object>
@@ -444,12 +451,6 @@ This is the XML file (resource.xrc) for the XRC sample.
 @endcode
 
 
-@section overview_xrc_fileformat XRC File Format
-
-Please see Technical Note 14 (docs/tech/tn0014.txt) in your wxWidgets
-distribution.
-
-
 @section overview_xrc_cppheader C++ header file generation
 
 Using the @c -e switch together with @c -c, a C++ header file is written
@@ -466,7 +467,7 @@ initialized.
 
 A simple example will help understand how the scheme works. Suppose you have a
 XRC file defining a top level window @c TestWnd_Base, which subclasses wxFrame
-(any other class like @c wxDialog will do also), and has subwidgets wxTextCtrl A 
+(any other class like @c wxDialog will do also), and has subwidgets wxTextCtrl A
 and wxButton B.
 
 The XRC file and corresponding class definition in the header file will be
@@ -624,7 +625,7 @@ wxObject *MyControlXmlHandler::DoCreateResource()
     // do most of your work.
     // If e.g. the MyControl::Create function looks like:
     //
-    // bool MyControl::Create(wxWindow *parent, int id, 
+    // bool MyControl::Create(wxWindow *parent, int id,
     //                        const wxBitmap &first, const wxPoint &posFirst,
     //                        const wxBitmap &second, const wxPoint &posSecond,
     //                        const wxString &theTitle, const wxFont &titleFont,