Fix return value of wxGenericTreeCtrl::FindItem().

[wxWidgets.git] / samples / listctrl / listtest.cpp

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 8fd9573f5c9b3e95a19e0937a8e0c14d3f3c8954..c7fbde5c45bb6c414cd3e173518b562dfc9dc1d3 100644 (file)
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -20,11 +20,11 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
-    #include "mondrian.xpm"
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"

 #endif
 
 #endif
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "bitmaps/toolbrai.xpm"
     #include "bitmaps/toolchar.xpm"
     #include "bitmaps/tooldata.xpm"
     #include "bitmaps/toolbrai.xpm"
     #include "bitmaps/toolchar.xpm"
     #include "bitmaps/tooldata.xpm"


@@ -43,6 +43,7 @@
 #include "wx/colordlg.h"        // for wxGetColourFromUser
 #include "wx/settings.h"
 #include "wx/sysopt.h"
 #include "wx/colordlg.h"        // for wxGetColourFromUser
 #include "wx/settings.h"
 #include "wx/sysopt.h"

+#include "wx/numdlg.h"

 
 #include "listtest.h"
 
 
 #include "listtest.h"
 


@@ -53,32 +54,29 @@
 
 const wxChar *SMALL_VIRTUAL_VIEW_ITEMS[][2] =
 {
 
 const wxChar *SMALL_VIRTUAL_VIEW_ITEMS[][2] =
 {

-    { _T("Cat"), _T("meow") },
-    { _T("Cow"), _T("moo") },
-    { _T("Crow"), _T("caw") },
-    { _T("Dog"), _T("woof") },
-    { _T("Duck"), _T("quack") },
-    { _T("Mouse"), _T("squeak") },
-    { _T("Owl"), _T("hoo") },
-    { _T("Pig"), _T("oink") },
-    { _T("Pigeon"), _T("coo") },
-    { _T("Sheep"), _T("baaah") },
+    { wxT("Cat"), wxT("meow") },
+    { wxT("Cow"), wxT("moo") },
+    { wxT("Crow"), wxT("caw") },
+    { wxT("Dog"), wxT("woof") },
+    { wxT("Duck"), wxT("quack") },
+    { wxT("Mouse"), wxT("squeak") },
+    { wxT("Owl"), wxT("hoo") },
+    { wxT("Pig"), wxT("oink") },
+    { wxT("Pigeon"), wxT("coo") },
+    { wxT("Sheep"), wxT("baaah") },

 };
 
 };
 

-// number of items in list/report view
-static const int NUM_ITEMS = 10;
-

 // number of items in icon/small icon view
 static const int NUM_ICONS = 9;
 
 int wxCALLBACK
 // number of items in icon/small icon view
 static const int NUM_ICONS = 9;
 
 int wxCALLBACK

-MyCompareFunction(long item1, long item2, wxIntPtr WXUNUSED(sortData))
+MyCompareFunction(wxIntPtr item1, wxIntPtr item2, wxIntPtr WXUNUSED(sortData))

 {
     // inverse the order
     if (item1 < item2)
 {
     // inverse the order
     if (item1 < item2)

-        return -1;
-    if (item1 > item2)

         return 1;
         return 1;

+    if (item1 > item2)
+        return -1;

 
     return 0;
 }
 
     return 0;
 }


@@ -102,8 +100,6 @@ bool MyApp::OnInit()
     // Show the frame
     frame->Show(true);
 
     // Show the frame
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 


@@ -127,6 +123,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(LIST_VIRTUAL_VIEW, MyFrame::OnVirtualView)
     EVT_MENU(LIST_SMALL_VIRTUAL_VIEW, MyFrame::OnSmallVirtualView)
 
     EVT_MENU(LIST_VIRTUAL_VIEW, MyFrame::OnVirtualView)
     EVT_MENU(LIST_SMALL_VIRTUAL_VIEW, MyFrame::OnSmallVirtualView)
 

+    EVT_MENU(LIST_SET_ITEMS_COUNT, MyFrame::OnSetItemsCount)
+

     EVT_MENU(LIST_GOTO, MyFrame::OnGoTo)
     EVT_MENU(LIST_FOCUS_LAST, MyFrame::OnFocusLast)
     EVT_MENU(LIST_TOGGLE_FIRST, MyFrame::OnToggleFirstSel)
     EVT_MENU(LIST_GOTO, MyFrame::OnGoTo)
     EVT_MENU(LIST_FOCUS_LAST, MyFrame::OnFocusLast)
     EVT_MENU(LIST_TOGGLE_FIRST, MyFrame::OnToggleFirstSel)


@@ -150,12 +148,17 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(LIST_FREEZE, MyFrame::OnFreeze)
     EVT_MENU(LIST_THAW, MyFrame::OnThaw)
     EVT_MENU(LIST_TOGGLE_LINES, MyFrame::OnToggleLines)
     EVT_MENU(LIST_FREEZE, MyFrame::OnFreeze)
     EVT_MENU(LIST_THAW, MyFrame::OnThaw)
     EVT_MENU(LIST_TOGGLE_LINES, MyFrame::OnToggleLines)

+    EVT_MENU(LIST_TOGGLE_HEADER, MyFrame::OnToggleHeader)

 #ifdef __WXOSX__
     EVT_MENU(LIST_MAC_USE_GENERIC, MyFrame::OnToggleMacUseGeneric)
 #endif // __WXOSX__
 #ifdef __WXOSX__
     EVT_MENU(LIST_MAC_USE_GENERIC, MyFrame::OnToggleMacUseGeneric)
 #endif // __WXOSX__

+    EVT_MENU(LIST_FIND, MyFrame::OnFind)
+
+    EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateUIEnableInReport)
+    EVT_UPDATE_UI(LIST_TOGGLE_HEADER, MyFrame::OnUpdateUIEnableInReport)

 
 

-    EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo)

     EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel)
     EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel)

+    EVT_UPDATE_UI(LIST_TOGGLE_HEADER, MyFrame::OnUpdateToggleHeader)

 END_EVENT_TABLE()
 
 // My frame constructor
 END_EVENT_TABLE()
 
 // My frame constructor


@@ -165,26 +168,27 @@ MyFrame::MyFrame(const wxChar *title)
     m_listCtrl = NULL;
     m_logWindow = NULL;
     m_smallVirtual = false;
     m_listCtrl = NULL;
     m_logWindow = NULL;
     m_smallVirtual = false;

+    m_numListItems = 10;

 
     // Give it an icon
 
     // Give it an icon

-    SetIcon( wxICON(mondrian) );
+    SetIcon(wxICON(sample));

 
     // Make an image list containing large icons
     m_imageListNormal = new wxImageList(32, 32, true);
     m_imageListSmall = new wxImageList(16, 16, true);
 
 
     // Make an image list containing large icons
     m_imageListNormal = new wxImageList(32, 32, true);
     m_imageListSmall = new wxImageList(16, 16, true);
 

-#ifdef __WXMSW__
-    m_imageListNormal->Add( wxIcon(_T("icon1"), wxBITMAP_TYPE_ICO_RESOURCE) );
-    m_imageListNormal->Add( wxIcon(_T("icon2"), wxBITMAP_TYPE_ICO_RESOURCE) );
-    m_imageListNormal->Add( wxIcon(_T("icon3"), wxBITMAP_TYPE_ICO_RESOURCE) );
-    m_imageListNormal->Add( wxIcon(_T("icon4"), wxBITMAP_TYPE_ICO_RESOURCE) );
-    m_imageListNormal->Add( wxIcon(_T("icon5"), wxBITMAP_TYPE_ICO_RESOURCE) );
-    m_imageListNormal->Add( wxIcon(_T("icon6"), wxBITMAP_TYPE_ICO_RESOURCE) );
-    m_imageListNormal->Add( wxIcon(_T("icon7"), wxBITMAP_TYPE_ICO_RESOURCE) );
-    m_imageListNormal->Add( wxIcon(_T("icon8"), wxBITMAP_TYPE_ICO_RESOURCE) );
-    m_imageListNormal->Add( wxIcon(_T("icon9"), wxBITMAP_TYPE_ICO_RESOURCE) );
-
-    m_imageListSmall->Add( wxIcon(_T("iconsmall"), wxBITMAP_TYPE_ICO_RESOURCE) );
+#ifdef wxHAS_IMAGES_IN_RESOURCES
+    m_imageListNormal->Add( wxIcon(wxT("icon1"), wxBITMAP_TYPE_ICO_RESOURCE) );
+    m_imageListNormal->Add( wxIcon(wxT("icon2"), wxBITMAP_TYPE_ICO_RESOURCE) );
+    m_imageListNormal->Add( wxIcon(wxT("icon3"), wxBITMAP_TYPE_ICO_RESOURCE) );
+    m_imageListNormal->Add( wxIcon(wxT("icon4"), wxBITMAP_TYPE_ICO_RESOURCE) );
+    m_imageListNormal->Add( wxIcon(wxT("icon5"), wxBITMAP_TYPE_ICO_RESOURCE) );
+    m_imageListNormal->Add( wxIcon(wxT("icon6"), wxBITMAP_TYPE_ICO_RESOURCE) );
+    m_imageListNormal->Add( wxIcon(wxT("icon7"), wxBITMAP_TYPE_ICO_RESOURCE) );
+    m_imageListNormal->Add( wxIcon(wxT("icon8"), wxBITMAP_TYPE_ICO_RESOURCE) );
+    m_imageListNormal->Add( wxIcon(wxT("icon9"), wxBITMAP_TYPE_ICO_RESOURCE) );
+
+    m_imageListSmall->Add( wxIcon(wxT("iconsmall"), wxBITMAP_TYPE_ICO_RESOURCE) );

 
 #else
     m_imageListNormal->Add( wxIcon( toolbrai_xpm ) );
 
 #else
     m_imageListNormal->Add( wxIcon( toolbrai_xpm ) );


@@ -202,61 +206,68 @@ MyFrame::MyFrame(const wxChar *title)
 
     // Make a menubar
     wxMenu *menuFile = new wxMenu;
 
     // Make a menubar
     wxMenu *menuFile = new wxMenu;

-    menuFile->Append(LIST_ABOUT, _T("&About"));
+    menuFile->Append(LIST_ABOUT, wxT("&About"));

     menuFile->AppendSeparator();
     menuFile->AppendSeparator();

-    menuFile->Append(LIST_QUIT, _T("E&xit\tAlt-X"));
+    menuFile->Append(LIST_QUIT, wxT("E&xit\tAlt-X"));

 
     wxMenu *menuView = new wxMenu;
 
     wxMenu *menuView = new wxMenu;

-    menuView->Append(LIST_LIST_VIEW, _T("&List view\tF1"));
-    menuView->Append(LIST_REPORT_VIEW, _T("&Report view\tF2"));
-    menuView->Append(LIST_ICON_VIEW, _T("&Icon view\tF3"));
-    menuView->Append(LIST_ICON_TEXT_VIEW, _T("Icon view with &text\tF4"));
-    menuView->Append(LIST_SMALL_ICON_VIEW, _T("&Small icon view\tF5"));
-    menuView->Append(LIST_SMALL_ICON_TEXT_VIEW, _T("Small icon &view with text\tF6"));
-    menuView->Append(LIST_VIRTUAL_VIEW, _T("&Virtual view\tF7"));
-    menuView->Append(LIST_SMALL_VIRTUAL_VIEW, _T("Small virtual vie&w\tF8"));
-#ifdef __WXMAC__
-    menuView->AppendCheckItem(LIST_MAC_USE_GENERIC, _T("Mac: Use Generic Control"));
+    menuView->Append(LIST_LIST_VIEW, wxT("&List view\tF1"));
+    menuView->Append(LIST_REPORT_VIEW, wxT("&Report view\tF2"));
+    menuView->Append(LIST_ICON_VIEW, wxT("&Icon view\tF3"));
+    menuView->Append(LIST_ICON_TEXT_VIEW, wxT("Icon view with &text\tF4"));
+    menuView->Append(LIST_SMALL_ICON_VIEW, wxT("&Small icon view\tF5"));
+    menuView->Append(LIST_SMALL_ICON_TEXT_VIEW, wxT("Small icon &view with text\tF6"));
+    menuView->Append(LIST_VIRTUAL_VIEW, wxT("&Virtual view\tF7"));
+    menuView->Append(LIST_SMALL_VIRTUAL_VIEW, wxT("Small virtual vie&w\tF8"));
+    menuView->AppendSeparator();
+    menuView->Append(LIST_SET_ITEMS_COUNT, "Set &number of items");
+#ifdef __WXOSX__
+    menuView->AppendSeparator();
+    menuView->AppendCheckItem(LIST_MAC_USE_GENERIC, wxT("Mac: Use Generic Control"));

 #endif
 
     wxMenu *menuList = new wxMenu;
 #endif
 
     wxMenu *menuList = new wxMenu;

-    menuList->Append(LIST_GOTO, _T("&Go to item #3\tCtrl-3"));
-    menuList->Append(LIST_FOCUS_LAST, _T("&Make last item current\tCtrl-L"));
-    menuList->Append(LIST_TOGGLE_FIRST, _T("To&ggle first item\tCtrl-G"));
-    menuList->Append(LIST_DESELECT_ALL, _T("&Deselect All\tCtrl-D"));
-    menuList->Append(LIST_SELECT_ALL, _T("S&elect All\tCtrl-A"));
+    menuList->Append(LIST_GOTO, wxT("&Go to item #3\tCtrl-3"));
+    menuList->Append(LIST_FOCUS_LAST, wxT("&Make last item current\tCtrl-L"));
+    menuList->Append(LIST_TOGGLE_FIRST, wxT("To&ggle first item\tCtrl-G"));
+    menuList->Append(LIST_DESELECT_ALL, wxT("&Deselect All\tCtrl-D"));
+    menuList->Append(LIST_SELECT_ALL, wxT("S&elect All\tCtrl-A"));

     menuList->AppendSeparator();
     menuList->AppendSeparator();

-    menuList->Append(LIST_SHOW_COL_INFO, _T("Show &column info\tCtrl-C"));
-    menuList->Append(LIST_SHOW_SEL_INFO, _T("Show &selected items\tCtrl-S"));
-    menuList->Append(LIST_SHOW_VIEW_RECT, _T("Show &view rect"));
+    menuList->Append(LIST_SHOW_COL_INFO, wxT("Show &column info\tCtrl-C"));
+    menuList->Append(LIST_SHOW_SEL_INFO, wxT("Show &selected items\tCtrl-S"));
+    menuList->Append(LIST_SHOW_VIEW_RECT, wxT("Show &view rect"));

 #ifdef wxHAS_LISTCTRL_COLUMN_ORDER
 #ifdef wxHAS_LISTCTRL_COLUMN_ORDER

-    menuList->Append(LIST_SET_COL_ORDER, _T("Se&t columns order\tShift-Ctrl-O"));
-    menuList->Append(LIST_GET_COL_ORDER, _T("Show&w columns order\tCtrl-O"));
+    menuList->Append(LIST_SET_COL_ORDER, wxT("Se&t columns order\tShift-Ctrl-O"));
+    menuList->Append(LIST_GET_COL_ORDER, wxT("Sho&w columns order\tCtrl-O"));

 #endif // wxHAS_LISTCTRL_COLUMN_ORDER
     menuList->AppendSeparator();
 #endif // wxHAS_LISTCTRL_COLUMN_ORDER
     menuList->AppendSeparator();

-    menuList->Append(LIST_SORT, _T("Sor&t\tCtrl-T"));
+    menuList->Append(LIST_SORT, wxT("Sor&t\tCtrl-T"));
+    menuList->Append(LIST_FIND, "Test Find() performance");

     menuList->AppendSeparator();
     menuList->AppendSeparator();

-    menuList->Append(LIST_ADD, _T("&Append an item\tCtrl-P"));
-    menuList->Append(LIST_EDIT, _T("&Edit the item\tCtrl-E"));
-    menuList->Append(LIST_DELETE, _T("&Delete first item\tCtrl-X"));
-    menuList->Append(LIST_DELETE_ALL, _T("Delete &all items"));
+    menuList->Append(LIST_ADD, wxT("&Append an item\tCtrl-P"));
+    menuList->Append(LIST_EDIT, wxT("&Edit the item\tCtrl-E"));
+    menuList->Append(LIST_DELETE, wxT("&Delete first item\tCtrl-X"));
+    menuList->Append(LIST_DELETE_ALL, wxT("Delete &all items"));

     menuList->AppendSeparator();
     menuList->AppendSeparator();

-    menuList->Append(LIST_FREEZE, _T("Free&ze\tCtrl-Z"));
-    menuList->Append(LIST_THAW, _T("Tha&w\tCtrl-W"));
+    menuList->Append(LIST_FREEZE, wxT("Free&ze\tCtrl-Z"));
+    menuList->Append(LIST_THAW, wxT("Tha&w\tCtrl-W"));

     menuList->AppendSeparator();
     menuList->AppendSeparator();

-    menuList->AppendCheckItem(LIST_TOGGLE_LINES, _T("Toggle &lines\tCtrl-I"));
-    menuList->Append(LIST_TOGGLE_MULTI_SEL, _T("&Multiple selection\tCtrl-M"),
-            _T("Toggle multiple selection"), true);
+    menuList->AppendCheckItem(LIST_TOGGLE_LINES, wxT("Toggle &lines\tCtrl-I"));
+    menuList->AppendCheckItem(LIST_TOGGLE_MULTI_SEL,
+                              wxT("&Multiple selection\tCtrl-M"));
+    menuList->Check(LIST_TOGGLE_MULTI_SEL, true);
+    menuList->AppendCheckItem(LIST_TOGGLE_HEADER, "Toggle &header\tCtrl-H");
+    menuList->Check(LIST_TOGGLE_HEADER, true);

 
     wxMenu *menuCol = new wxMenu;
 
     wxMenu *menuCol = new wxMenu;

-    menuCol->Append(LIST_SET_FG_COL, _T("&Foreground colour..."));
-    menuCol->Append(LIST_SET_BG_COL, _T("&Background colour..."));
+    menuCol->Append(LIST_SET_FG_COL, wxT("&Foreground colour..."));
+    menuCol->Append(LIST_SET_BG_COL, wxT("&Background colour..."));

 
     wxMenuBar *menubar = new wxMenuBar;
 
     wxMenuBar *menubar = new wxMenuBar;

-    menubar->Append(menuFile, _T("&File"));
-    menubar->Append(menuView, _T("&View"));
-    menubar->Append(menuList, _T("&List"));
-    menubar->Append(menuCol, _T("&Colour"));
+    menubar->Append(menuFile, wxT("&File"));
+    menubar->Append(menuView, wxT("&View"));
+    menubar->Append(menuList, wxT("&List"));
+    menubar->Append(menuCol, wxT("&Colour"));

     SetMenuBar(menubar);
 
     m_panel = new wxPanel(this, wxID_ANY);
     SetMenuBar(menubar);
 
     m_panel = new wxPanel(this, wxID_ANY);


@@ -270,7 +281,7 @@ MyFrame::MyFrame(const wxChar *title)
 
 #ifdef __WXMSW__
     // this is useful to know specially when debugging :)
 
 #ifdef __WXMSW__
     // this is useful to know specially when debugging :)

-    wxLogMessage("Your version of comctl32.dll is: %d", 
+    wxLogMessage("Your version of comctl32.dll is: %d",

                  wxApp::GetComCtl32Version());
 #endif
 
                  wxApp::GetComCtl32Version());
 #endif
 


@@ -311,7 +322,7 @@ bool MyFrame::CheckNonVirtual() const
         return true;
 
     // "this" == whatever
         return true;
 
     // "this" == whatever

-    wxLogWarning(_T("Can't do this in virtual view, sorry."));
+    wxLogWarning(wxT("Can't do this in virtual view, sorry."));

 
     return false;
 }
 
     return false;
 }


@@ -323,22 +334,22 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageDialog dialog(this, _T("List test sample\nJulian Smart (c) 1997"),
-            _T("About list test"), wxOK|wxCANCEL);
+    wxMessageDialog dialog(this, wxT("List test sample\nJulian Smart (c) 1997"),
+            wxT("About list test"), wxOK|wxCANCEL);

 
     dialog.ShowModal();
 }
 
 void MyFrame::OnFreeze(wxCommandEvent& WXUNUSED(event))
 {
 
     dialog.ShowModal();
 }
 
 void MyFrame::OnFreeze(wxCommandEvent& WXUNUSED(event))
 {

-    wxLogMessage(_T("Freezing the control"));
+    wxLogMessage(wxT("Freezing the control"));

 
     m_listCtrl->Freeze();
 }
 
 void MyFrame::OnThaw(wxCommandEvent& WXUNUSED(event))
 {
 
     m_listCtrl->Freeze();
 }
 
 void MyFrame::OnThaw(wxCommandEvent& WXUNUSED(event))
 {

-    wxLogMessage(_T("Thawing the control"));
+    wxLogMessage(wxT("Thawing the control"));

 
     m_listCtrl->Thaw();
 }
 
     m_listCtrl->Thaw();
 }


@@ -348,6 +359,13 @@ void MyFrame::OnToggleLines(wxCommandEvent& event)
     m_listCtrl->SetSingleStyle(wxLC_HRULES | wxLC_VRULES, event.IsChecked());
 }
 
     m_listCtrl->SetSingleStyle(wxLC_HRULES | wxLC_VRULES, event.IsChecked());
 }
 

+void MyFrame::OnToggleHeader(wxCommandEvent& event)
+{
+    wxLogMessage("%s the header", event.IsChecked() ? "Showing" : "Hiding");
+
+    m_listCtrl->ToggleWindowStyle(wxLC_NO_HEADER);
+}
+

 #ifdef __WXOSX__
 
 void MyFrame::OnToggleMacUseGeneric(wxCommandEvent& event)
 #ifdef __WXOSX__
 
 void MyFrame::OnToggleMacUseGeneric(wxCommandEvent& event)


@@ -448,7 +466,7 @@ void MyFrame::RecreateList(long flags, bool withText)
                 break;
 
             default:
                 break;
 
             default:

-                wxFAIL_MSG( _T("unknown listctrl mode") );
+                wxFAIL_MSG( wxT("unknown listctrl mode") );

         }
     }
 
         }
     }
 


@@ -464,9 +482,9 @@ void MyFrame::OnListView(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::InitWithListItems()
 {
 
 void MyFrame::InitWithListItems()
 {

-    for ( int i = 0; i < NUM_ITEMS; i++ )
+    for ( int i = 0; i < m_numListItems; i++ )

     {
     {

-        m_listCtrl->InsertItem(i, wxString::Format(_T("Item %d"), i));
+        m_listCtrl->InsertItem(i, wxString::Format(wxT("Item %d"), i));

     }
 }
 
     }
 }
 


@@ -482,15 +500,15 @@ void MyFrame::InitWithReportItems()
     // note that under MSW for SetColumnWidth() to work we need to create the
     // items with images initially even if we specify dummy image id
     wxListItem itemCol;
     // note that under MSW for SetColumnWidth() to work we need to create the
     // items with images initially even if we specify dummy image id
     wxListItem itemCol;

-    itemCol.SetText(_T("Column 1"));
+    itemCol.SetText(wxT("Column 1"));

     itemCol.SetImage(-1);
     m_listCtrl->InsertColumn(0, itemCol);
 
     itemCol.SetImage(-1);
     m_listCtrl->InsertColumn(0, itemCol);
 

-    itemCol.SetText(_T("Column 2"));
+    itemCol.SetText(wxT("Column 2"));

     itemCol.SetAlign(wxLIST_FORMAT_CENTRE);
     m_listCtrl->InsertColumn(1, itemCol);
 
     itemCol.SetAlign(wxLIST_FORMAT_CENTRE);
     m_listCtrl->InsertColumn(1, itemCol);
 

-    itemCol.SetText(_T("Column 3"));
+    itemCol.SetText(wxT("Column 3"));

     itemCol.SetAlign(wxLIST_FORMAT_RIGHT);
     m_listCtrl->InsertColumn(2, itemCol);
 
     itemCol.SetAlign(wxLIST_FORMAT_RIGHT);
     m_listCtrl->InsertColumn(2, itemCol);
 


@@ -499,13 +517,13 @@ void MyFrame::InitWithReportItems()
 
     wxStopWatch sw;
 
 
     wxStopWatch sw;
 

-    for ( int i = 0; i < NUM_ITEMS; i++ )
+    for ( int i = 0; i < m_numListItems; i++ )

     {
         m_listCtrl->InsertItemInReportView(i);
     }
 
     {
         m_listCtrl->InsertItemInReportView(i);
     }
 

-    m_logWindow->WriteText(wxString::Format(_T("%d items inserted in %ldms\n"),
-                                            NUM_ITEMS, sw.Time()));
+    m_logWindow->WriteText(wxString::Format(wxT("%d items inserted in %ldms\n"),
+                                            m_numListItems, sw.Time()));

     m_listCtrl->Show();
 
     // we leave all mask fields to 0 and only change the colour
     m_listCtrl->Show();
 
     // we leave all mask fields to 0 and only change the colour


@@ -553,8 +571,14 @@ void MyFrame::InitWithIconItems(bool withText, bool sameIcon)
 
         if ( withText )
         {
 
         if ( withText )
         {

-            m_listCtrl->InsertItem(i, wxString::Format(_T("Label %d"), i),
-                                   image);
+            // Make labels of different widths to test the layout.
+            wxString label;
+            if ( !(i % 5) )
+                label.Printf("Longer label %d", i);
+            else
+                label.Printf("Label %d", i);
+
+            m_listCtrl->InsertItem(i, label, image);

         }
         else
         {
         }
         else
         {


@@ -595,20 +619,45 @@ void MyFrame::OnSmallVirtualView(wxCommandEvent& WXUNUSED(event))
     RecreateList(wxLC_REPORT | wxLC_VIRTUAL);
 }
 
     RecreateList(wxLC_REPORT | wxLC_VIRTUAL);
 }
 

+void MyFrame::OnSetItemsCount(wxCommandEvent& WXUNUSED(event))
+{
+    int numItems = wxGetNumberFromUser
+                   (
+                        "Enter the initial number of items for "
+                        "the list and report views",
+                        "Number of items:",
+                        "wxWidgets wxListCtrl sample",
+                        m_numListItems,
+                        0,
+                        10000,
+                        this
+                   );
+    if ( numItems == -1 || numItems == m_numListItems )
+        return;
+
+    m_numListItems = numItems;
+
+    if ( m_listCtrl->HasFlag(wxLC_REPORT) &&
+            !m_listCtrl->HasFlag(wxLC_VIRTUAL) )
+        RecreateList(wxLC_REPORT);
+    else if ( m_listCtrl->HasFlag(wxLC_LIST) )
+        RecreateList(wxLC_LIST);
+}
+

 void MyFrame::InitWithVirtualItems()
 {
     m_listCtrl->SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);
 
     if ( m_smallVirtual )
     {
 void MyFrame::InitWithVirtualItems()
 {
     m_listCtrl->SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);
 
     if ( m_smallVirtual )
     {

-        m_listCtrl->InsertColumn(0, _T("Animal"));
-        m_listCtrl->InsertColumn(1, _T("Sound"));
+        m_listCtrl->InsertColumn(0, wxT("Animal"));
+        m_listCtrl->InsertColumn(1, wxT("Sound"));

         m_listCtrl->SetItemCount(WXSIZEOF(SMALL_VIRTUAL_VIEW_ITEMS));
     }
     else
     {
         m_listCtrl->SetItemCount(WXSIZEOF(SMALL_VIRTUAL_VIEW_ITEMS));
     }
     else
     {

-        m_listCtrl->InsertColumn(0, _T("First Column"));
-        m_listCtrl->InsertColumn(1, _T("Second Column"));
+        m_listCtrl->InsertColumn(0, wxT("First Column"));
+        m_listCtrl->InsertColumn(1, wxT("Second Column"));

         m_listCtrl->SetColumnWidth(0, 150);
         m_listCtrl->SetColumnWidth(1, 150);
         m_listCtrl->SetItemCount(1000000);
         m_listCtrl->SetColumnWidth(0, 150);
         m_listCtrl->SetColumnWidth(1, 150);
         m_listCtrl->SetItemCount(1000000);


@@ -621,15 +670,27 @@ void MyFrame::OnSort(wxCommandEvent& WXUNUSED(event))
 
     m_listCtrl->SortItems(MyCompareFunction, 0);
 
 
     m_listCtrl->SortItems(MyCompareFunction, 0);
 

-    m_logWindow->WriteText(wxString::Format(_T("Sorting %d items took %ld ms\n"),
+    m_logWindow->WriteText(wxString::Format(wxT("Sorting %d items took %ld ms\n"),

                                             m_listCtrl->GetItemCount(),
                                             sw.Time()));
 }
 
                                             m_listCtrl->GetItemCount(),
                                             sw.Time()));
 }
 

+void MyFrame::OnFind(wxCommandEvent& WXUNUSED(event))
+{
+    wxStopWatch sw;
+
+    const int itemCount = m_listCtrl->GetItemCount();
+    for ( int i = 0; i < itemCount; i++ )
+        m_listCtrl->FindItem(-1, i);
+
+    wxLogMessage("Calling Find() for all %d items took %ld ms",
+                 itemCount, sw.Time());
+}
+

 void MyFrame::OnShowSelInfo(wxCommandEvent& WXUNUSED(event))
 {
     int selCount = m_listCtrl->GetSelectedItemCount();
 void MyFrame::OnShowSelInfo(wxCommandEvent& WXUNUSED(event))
 {
     int selCount = m_listCtrl->GetSelectedItemCount();

-    wxLogMessage(_T("%d items selected:"), selCount);
+    wxLogMessage(wxT("%d items selected:"), selCount);

 
     // don't show too many items
     size_t shownCount = 0;
 
     // don't show too many items
     size_t shownCount = 0;


@@ -638,12 +699,12 @@ void MyFrame::OnShowSelInfo(wxCommandEvent& WXUNUSED(event))
                                         wxLIST_STATE_SELECTED);
     while ( item != -1 )
     {
                                         wxLIST_STATE_SELECTED);
     while ( item != -1 )
     {

-        wxLogMessage(_T("\t%ld (%s)"),
+        wxLogMessage(wxT("\t%ld (%s)"),

                      item, m_listCtrl->GetItemText(item).c_str());
 
         if ( ++shownCount > 10 )
         {
                      item, m_listCtrl->GetItemText(item).c_str());
 
         if ( ++shownCount > 10 )
         {

-            wxLogMessage(_T("\t... more selected items snipped..."));
+            wxLogMessage(wxT("\t... more selected items snipped..."));

             break;
         }
 
             break;
         }
 


@@ -688,7 +749,9 @@ void MyFrame::OnSetColOrder(wxCommandEvent& WXUNUSED(event))
     order[1] = 0;
     order[2] = 1;
     if ( m_listCtrl->SetColumnsOrder(order) )
     order[1] = 0;
     order[2] = 1;
     if ( m_listCtrl->SetColumnsOrder(order) )

+    {

         wxLogMessage("Column order set to %s", DumpIntArray(order));
         wxLogMessage("Column order set to %s", DumpIntArray(order));

+    }

 }
 
 void MyFrame::OnGetColOrder(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnGetColOrder(wxCommandEvent& WXUNUSED(event))


@@ -733,7 +796,7 @@ void MyFrame::OnShowColInfo(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

-void MyFrame::OnUpdateShowColInfo(wxUpdateUIEvent& event)
+void MyFrame::OnUpdateUIEnableInReport(wxUpdateUIEvent& event)

 {
     event.Enable( (m_listCtrl->GetWindowStyleFlag() & wxLC_REPORT) != 0 );
 }
 {
     event.Enable( (m_listCtrl->GetWindowStyleFlag() & wxLC_REPORT) != 0 );
 }


@@ -747,14 +810,19 @@ void MyFrame::OnToggleMultiSel(wxCommandEvent& WXUNUSED(event))
         flags |= wxLC_SINGLE_SEL;
 
     m_logWindow->WriteText(wxString::Format(wxT("Current selection mode: %sle\n"),
         flags |= wxLC_SINGLE_SEL;
 
     m_logWindow->WriteText(wxString::Format(wxT("Current selection mode: %sle\n"),

-                           (flags & wxLC_SINGLE_SEL) ? _T("sing") : _T("multip")));
+                           (flags & wxLC_SINGLE_SEL) ? wxT("sing") : wxT("multip")));

 
     RecreateList(flags);
 }
 
 void MyFrame::OnUpdateToggleMultiSel(wxUpdateUIEvent& event)
 {
 
     RecreateList(flags);
 }
 
 void MyFrame::OnUpdateToggleMultiSel(wxUpdateUIEvent& event)
 {

-     event.Check((m_listCtrl->GetWindowStyleFlag() & wxLC_SINGLE_SEL) == 0);
+     event.Check(!m_listCtrl->HasFlag(wxLC_SINGLE_SEL));
+}
+
+void MyFrame::OnUpdateToggleHeader(wxUpdateUIEvent& event)
+{
+    event.Check(!m_listCtrl->HasFlag(wxLC_NO_HEADER));

 }
 
 void MyFrame::OnSetFgColour(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnSetFgColour(wxCommandEvent& WXUNUSED(event))


@@ -771,21 +839,31 @@ void MyFrame::OnSetBgColour(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAdd(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAdd(wxCommandEvent& WXUNUSED(event))
 {

-    m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), _T("Appended item"));
+    m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), wxT("Appended item"));

 }
 
 void MyFrame::OnEdit(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnEdit(wxCommandEvent& WXUNUSED(event))
 {

-    long itemCur = m_listCtrl->GetNextItem(-1, wxLIST_NEXT_ALL,
-                                           wxLIST_STATE_FOCUSED);
-
-    if ( itemCur != -1 )
+    // demonstrate cancelling editing: this currently is wxMSW-only
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    if ( m_listCtrl->GetEditControl() )

     {
     {

-        m_listCtrl->EditLabel(itemCur);
+        m_listCtrl->EndEditLabel(true);

     }
     }

-    else
+    else // start editing
+#endif // __WXMSW__

     {
     {

-        m_logWindow->WriteText(_T("No item to edit"));
+        long itemCur = m_listCtrl->GetNextItem(-1, wxLIST_NEXT_ALL,
+                                               wxLIST_STATE_FOCUSED);
+
+        if ( itemCur != -1 )
+        {
+            m_listCtrl->EditLabel(itemCur);
+        }
+        else
+        {
+            m_logWindow->WriteText(wxT("No item to edit"));
+        }

     }
 }
 
     }
 }
 


@@ -797,7 +875,7 @@ void MyFrame::OnDelete(wxCommandEvent& WXUNUSED(event))
     }
     else
     {
     }
     else
     {

-        m_logWindow->WriteText(_T("Nothing to delete"));
+        m_logWindow->WriteText(wxT("Nothing to delete"));

     }
 }
 
     }
 }
 


@@ -809,7 +887,7 @@ void MyFrame::OnDeleteAll(wxCommandEvent& WXUNUSED(event))
 
     m_listCtrl->DeleteAllItems();
 
 
     m_listCtrl->DeleteAllItems();
 

-    m_logWindow->WriteText(wxString::Format(_T("Deleting %d items took %ld ms\n"),
+    m_logWindow->WriteText(wxString::Format(wxT("Deleting %d items took %ld ms\n"),

                                             itemCount,
                                             sw.Time()));
 }
                                             itemCount,
                                             sw.Time()));
 }


@@ -884,7 +962,7 @@ void MyListCtrl::OnColRightClick(wxListEvent& event)
 
     // Show popupmenu at position
     wxMenu menu(wxT("Test"));
 
     // Show popupmenu at position
     wxMenu menu(wxT("Test"));

-    menu.Append(LIST_ABOUT, _T("&About"));
+    menu.Append(LIST_ABOUT, wxT("&About"));

     PopupMenu(&menu, event.GetPoint());
 
     wxLogMessage( wxT("OnColumnRightClick at %d."), event.GetColumn() );
     PopupMenu(&menu, event.GetPoint());
 
     wxLogMessage( wxT("OnColumnRightClick at %d."), event.GetColumn() );


@@ -907,7 +985,7 @@ void MyListCtrl::OnColBeginDrag(wxListEvent& event)
 
     if ( event.GetColumn() == 0 )
     {
 
     if ( event.GetColumn() == 0 )
     {

-        wxLogMessage(_T("Resizing this column shouldn't work."));
+        wxLogMessage(wxT("Resizing this column shouldn't work."));

 
         event.Veto();
     }
 
         event.Veto();
     }


@@ -966,18 +1044,18 @@ void MyListCtrl::OnEndLabelEdit(wxListEvent& event)
 
 void MyListCtrl::OnDeleteItem(wxListEvent& event)
 {
 
 void MyListCtrl::OnDeleteItem(wxListEvent& event)
 {

-    LogEvent(event, _T("OnDeleteItem"));
+    LogEvent(event, wxT("OnDeleteItem"));

     wxLogMessage( wxT("Number of items when delete event is sent: %d"), GetItemCount() );
 }
 
 void MyListCtrl::OnDeleteAllItems(wxListEvent& event)
 {
     wxLogMessage( wxT("Number of items when delete event is sent: %d"), GetItemCount() );
 }
 
 void MyListCtrl::OnDeleteAllItems(wxListEvent& event)
 {

-    LogEvent(event, _T("OnDeleteAllItems"));
+    LogEvent(event, wxT("OnDeleteAllItems"));

 }
 
 void MyListCtrl::OnSelected(wxListEvent& event)
 {
 }
 
 void MyListCtrl::OnSelected(wxListEvent& event)
 {

-    LogEvent(event, _T("OnSelected"));
+    LogEvent(event, wxT("OnSelected"));

 
     if ( GetWindowStyle() & wxLC_REPORT )
     {
 
     if ( GetWindowStyle() & wxLC_REPORT )
     {


@@ -999,17 +1077,17 @@ void MyListCtrl::OnSelected(wxListEvent& event)
 
 void MyListCtrl::OnDeselected(wxListEvent& event)
 {
 
 void MyListCtrl::OnDeselected(wxListEvent& event)
 {

-    LogEvent(event, _T("OnDeselected"));
+    LogEvent(event, wxT("OnDeselected"));

 }
 
 void MyListCtrl::OnActivated(wxListEvent& event)
 {
 }
 
 void MyListCtrl::OnActivated(wxListEvent& event)
 {

-    LogEvent(event, _T("OnActivated"));
+    LogEvent(event, wxT("OnActivated"));

 }
 
 void MyListCtrl::OnFocused(wxListEvent& event)
 {
 }
 
 void MyListCtrl::OnFocused(wxListEvent& event)
 {

-    LogEvent(event, _T("OnFocused"));
+    LogEvent(event, wxT("OnFocused"));

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -1051,7 +1129,7 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event)
                 item = 0;
             }
 
                 item = 0;
             }
 

-            wxLogMessage(_T("Focusing item %ld"), item);
+            wxLogMessage(wxT("Focusing item %ld"), item);

 
             SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
             EnsureVisible(item);
 
             SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
             EnsureVisible(item);


@@ -1063,17 +1141,17 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event)
                 wxRect r;
                 if ( !GetItemRect(item, r) )
                 {
                 wxRect r;
                 if ( !GetItemRect(item, r) )
                 {

-                    wxLogError(_T("Failed to retrieve rect of item %ld"), item);
+                    wxLogError(wxT("Failed to retrieve rect of item %ld"), item);

                     break;
                 }
 
                     break;
                 }
 

-                wxLogMessage(_T("Bounding rect of item %ld is (%d, %d)-(%d, %d)"),
+                wxLogMessage(wxT("Bounding rect of item %ld is (%d, %d)-(%d, %d)"),

                              item, r.x, r.y, r.x + r.width, r.y + r.height);
             }
             break;
 
                              item, r.x, r.y, r.x + r.width, r.y + r.height);
             }
             break;
 

-        case '1': // show sub item bounding rectangle
-        case '2':
+        case '1': // show sub item bounding rectangle for the given column
+        case '2': // (and icon/label rectangle if Shift/Ctrl is pressed)

         case '3':
         case '4': // this column is invalid but we want to test it too
             if ( InReportView() )
         case '3':
         case '4': // this column is invalid but we want to test it too
             if ( InReportView() )


@@ -1081,13 +1159,20 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event)
                 int subItem = event.GetKeyCode() - '1';
                 item = event.GetIndex();
                 wxRect r;
                 int subItem = event.GetKeyCode() - '1';
                 item = event.GetIndex();
                 wxRect r;

-                if ( !GetSubItemRect(item, subItem, r) )
+
+                int code = wxLIST_RECT_BOUNDS;
+                if ( wxGetKeyState(WXK_SHIFT) )
+                    code = wxLIST_RECT_ICON;
+                else if ( wxGetKeyState(WXK_CONTROL) )
+                    code = wxLIST_RECT_LABEL;
+
+                if ( !GetSubItemRect(item, subItem, r, code) )

                 {
                 {

-                    wxLogError(_T("Failed to retrieve rect of item %ld column %d"), item, subItem + 1);
+                    wxLogError(wxT("Failed to retrieve rect of item %ld column %d"), item, subItem + 1);

                     break;
                 }
 
                     break;
                 }
 

-                wxLogMessage(_T("Bounding rect of item %ld column %d is (%d, %d)-(%d, %d)"),
+                wxLogMessage(wxT("Bounding rect of item %ld column %d is (%d, %d)-(%d, %d)"),

                              item, subItem + 1,
                              r.x, r.y, r.x + r.width, r.y + r.height);
             }
                              item, subItem + 1,
                              r.x, r.y, r.x + r.width, r.y + r.height);
             }


@@ -1119,7 +1204,7 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event)
             {
                 DeleteItem(item);
 
             {
                 DeleteItem(item);
 

-                wxLogMessage(_T("Item %ld deleted"), item);
+                wxLogMessage(wxT("Item %ld deleted"), item);

 
                 // -1 because the indices were shifted by DeleteItem()
                 item = GetNextItem(item - 1,
 
                 // -1 because the indices were shifted by DeleteItem()
                 item = GetNextItem(item - 1,


@@ -1142,7 +1227,7 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event)
             //else: fall through
 
         default:
             //else: fall through
 
         default:

-            LogEvent(event, _T("OnListKeyDown"));
+            LogEvent(event, wxT("OnListKeyDown"));

 
             event.Skip();
     }
 
             event.Skip();
     }


@@ -1150,7 +1235,7 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event)
 
 void MyListCtrl::OnChar(wxKeyEvent& event)
 {
 
 void MyListCtrl::OnChar(wxKeyEvent& event)
 {

-    wxLogMessage(_T("Got char event."));
+    wxLogMessage(wxT("Got char event."));

 
     switch ( event.GetKeyCode() )
     {
 
     switch ( event.GetKeyCode() )
     {


@@ -1189,24 +1274,24 @@ void MyListCtrl::OnRightClick(wxMouseEvent& event)
     wxString where;
     switch ( flags )
     {
     wxString where;
     switch ( flags )
     {

-        case wxLIST_HITTEST_ABOVE: where = _T("above"); break;
-        case wxLIST_HITTEST_BELOW: where = _T("below"); break;
-        case wxLIST_HITTEST_NOWHERE: where = _T("nowhere near"); break;
-        case wxLIST_HITTEST_ONITEMICON: where = _T("on icon of"); break;
-        case wxLIST_HITTEST_ONITEMLABEL: where = _T("on label of"); break;
-        case wxLIST_HITTEST_ONITEMRIGHT: where = _T("right on"); break;
-        case wxLIST_HITTEST_TOLEFT: where = _T("to the left of"); break;
-        case wxLIST_HITTEST_TORIGHT: where = _T("to the right of"); break;
-        default: where = _T("not clear exactly where on"); break;
+        case wxLIST_HITTEST_ABOVE: where = wxT("above"); break;
+        case wxLIST_HITTEST_BELOW: where = wxT("below"); break;
+        case wxLIST_HITTEST_NOWHERE: where = wxT("nowhere near"); break;
+        case wxLIST_HITTEST_ONITEMICON: where = wxT("on icon of"); break;
+        case wxLIST_HITTEST_ONITEMLABEL: where = wxT("on label of"); break;
+        case wxLIST_HITTEST_ONITEMRIGHT: where = wxT("right on"); break;
+        case wxLIST_HITTEST_TOLEFT: where = wxT("to the left of"); break;
+        case wxLIST_HITTEST_TORIGHT: where = wxT("to the right of"); break;
+        default: where = wxT("not clear exactly where on"); break;

     }
 
     }
 

-    wxLogMessage(_T("Right double click %s item %ld, subitem %ld"),
+    wxLogMessage(wxT("Right double click %s item %ld, subitem %ld"),

                  where.c_str(), item, subitem);
 }
 
 void MyListCtrl::LogEvent(const wxListEvent& event, const wxChar *eventName)
 {
                  where.c_str(), item, subitem);
 }
 
 void MyListCtrl::LogEvent(const wxListEvent& event, const wxChar *eventName)
 {

-    wxLogMessage(_T("Item %ld: %s (item text = %s, data = %ld)"),
+    wxLogMessage(wxT("Item %ld: %s (item text = %s, data = %ld)"),

                  event.GetIndex(), eventName,
                  event.GetText().c_str(), event.GetData());
 }
                  event.GetIndex(), eventName,
                  event.GetText().c_str(), event.GetData());
 }


@@ -1219,7 +1304,7 @@ wxString MyListCtrl::OnGetItemText(long item, long column) const
     }
     else // "big" virtual control
     {
     }
     else // "big" virtual control
     {

-        return wxString::Format(_T("Column %ld of item %ld"), column, item);
+        return wxString::Format(wxT("Column %ld of item %ld"), column, item);

     }
 }
 
     }
 }
 


@@ -1250,14 +1335,14 @@ wxListItemAttr *MyListCtrl::OnGetItemAttr(long item) const
 void MyListCtrl::InsertItemInReportView(int i)
 {
     wxString buf;
 void MyListCtrl::InsertItemInReportView(int i)
 {
     wxString buf;

-    buf.Printf(_T("This is item %d"), i);
+    buf.Printf(wxT("This is item %d"), i);

     long tmp = InsertItem(i, buf, 0);
     SetItemData(tmp, i);
 
     long tmp = InsertItem(i, buf, 0);
     SetItemData(tmp, i);
 

-    buf.Printf(_T("Col 1, item %d"), i);
+    buf.Printf(wxT("Col 1, item %d"), i);

     SetItem(tmp, 1, buf);
 
     SetItem(tmp, 1, buf);
 

-    buf.Printf(_T("Item %d in column 2"), i);
+    buf.Printf(wxT("Item %d in column 2"), i);

     SetItem(tmp, 2, buf);
 }
 
     SetItem(tmp, 2, buf);
 }
 


@@ -1294,9 +1379,9 @@ void MyListCtrl::ShowContextMenu(const wxPoint& pos)
 {
     wxMenu menu;
 
 {
     wxMenu menu;
 

-    menu.Append(wxID_ABOUT, _T("&About"));
+    menu.Append(wxID_ABOUT, wxT("&About"));

     menu.AppendSeparator();
     menu.AppendSeparator();

-    menu.Append(wxID_EXIT, _T("E&xit"));
+    menu.Append(wxID_EXIT, wxT("E&xit"));

 
     PopupMenu(&menu, pos.x, pos.y);
 }
 
     PopupMenu(&menu, pos.x, pos.y);
 }