X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80a06ad284ec581cf5d823b2e843fe24d3077459..fbae649d1b7023b83dd731712d9dd76b18c8f252:/samples/xrc/myframe.cpp

diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp
index 3a6453d3e8..50797d3a91 100644
--- a/samples/xrc/myframe.cpp
+++ b/samples/xrc/myframe.cpp
@@ -136,18 +136,26 @@ MyFrame::MyFrame(wxWindow* parent)
 void MyFrame::OnUnloadResourceMenuCommand(wxCommandEvent& WXUNUSED(event))
 {
     if ( wxXmlResource::Get()->Unload(wxT("rc/basicdlg.xrc")) )
-        wxLogMessage(_T("Basic dialog resource has now been unloaded, you ")
-                     _T("won't be able to use it before loading it again"));
+    {
+        wxLogMessage(wxT("Basic dialog resource has now been unloaded, you ")
+                     wxT("won't be able to use it before loading it again"));
+    }
     else
-        wxLogWarning(_T("Failed to unload basic dialog resource"));
+    {
+        wxLogWarning(wxT("Failed to unload basic dialog resource"));
+    }
 }
 
 void MyFrame::OnReloadResourceMenuCommand(wxCommandEvent& WXUNUSED(event))
 {
     if ( wxXmlResource::Get()->Load(wxT("rc/basicdlg.xrc")) )
-        wxLogStatus(_T("Basic dialog resource has been loaded."));
+    {
+        wxLogStatus(wxT("Basic dialog resource has been loaded."));
+    }
     else
-        wxLogError(_T("Failed to load basic dialog resource"));
+    {
+        wxLogError(wxT("Failed to load basic dialog resource"));
+    }
 }
 
 void MyFrame::OnExitToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
@@ -207,22 +215,20 @@ void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
     wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("controls_dialog"));
 
 #if wxUSE_LISTCTRL
-    // There is no data in the listctrl. This will add some columns
-    // and some data. You don't need to use any pointers
-    // at all to manipulate the controls, just simply use the XRCCTL(...) macros.
-    // "controls_treectrl" is the name of this control in the XRC.
-    // (1) Insert a column, with the column header of "Name"
-    // (The '_' function around "Name" marks this string as one to translate).
-    XRCCTRL(dlg, "controls_listctrl", wxListCtrl)->InsertColumn( 0,
-                                                                 _("Name"),
-                                                                 wxLIST_FORMAT_LEFT,
-                                                                 ( 200 )
-                                                                );
-    // (2) Insert some items into the listctrl
-    XRCCTRL(dlg, "controls_listctrl", wxListCtrl)->InsertItem(0,wxT("Todd Hope"));
-    XRCCTRL(dlg, "controls_listctrl", wxListCtrl)->InsertItem(1,wxT("Kim Wynd"));
-    XRCCTRL(dlg, "controls_listctrl", wxListCtrl)->InsertItem(2,wxT("Leon Li"));
-#endif
+    // The resource file specifies the columns of the control as they are
+    // typically static while the items themselves are added from here as
+    // usually they are not static (but if they are, they can be defined in the
+    // resources too, see the two other list controls definitions in
+    // controls.xrc)
+
+    // Insert some items into the listctrl: notice that we can access it using
+    // XRCCTRL
+    wxListCtrl * const list = XRCCTRL(dlg, "controls_listctrl", wxListCtrl);
+
+    list->InsertItem(0, "Athos");   list->SetItem(0, 1, "90");
+    list->InsertItem(1, "Porthos"); list->SetItem(1, 1, "120");
+    list->InsertItem(2, "Aramis");  list->SetItem(2, 1, "80");
+#endif // wxUSE_LISTCTRL
 
 #if wxUSE_TREECTRL
     // There is no data in the tree ctrl. These lines will add some.
@@ -309,8 +315,8 @@ void MyFrame::OnVariableExpansionToolOrMenuCommand(wxCommandEvent& WXUNUSED(even
 void MyFrame::OnAboutToolOrMenuCommand(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);
 }