Bakefile 0.2.8 rebake.

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

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 23ee183e1e8689863f34e753341254f2c677ba5a..96afe78e75c7ff0fb9133ff743c820badfd94bed 100644 (file)
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -43,23 +43,73 @@
 #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"
 

+
+// ----------------------------------------------------------------------------
+// Constants and globals
+// ----------------------------------------------------------------------------
+

 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 icon/small icon view
+static const int NUM_ICONS = 9;
+
+int wxCALLBACK
+MyCompareFunction(long item1, long item2, wxIntPtr WXUNUSED(sortData))
+{
+    // inverse the order
+    if (item1 < item2)
+        return -1;
+    if (item1 > item2)
+        return 1;
+
+    return 0;
+}
+
+
+// ----------------------------------------------------------------------------
+// MyApp
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_APP(MyApp)
+
+// `Main program' equivalent, creating windows and returning main app frame
+bool MyApp::OnInit()
+{
+    if ( !wxApp::OnInit() )
+        return false;
+
+    // Create the main frame window
+    MyFrame *frame = new MyFrame(wxT("wxListCtrl Test"));
+
+    // Show the frame
+    frame->Show(true);
+
+    SetTopWindow(frame);
+
+    return true;
+}
+
+
+
+// ----------------------------------------------------------------------------
+// MyFrame
+// ----------------------------------------------------------------------------

 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_SIZE(MyFrame::OnSize)
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_SIZE(MyFrame::OnSize)


@@ -75,6 +125,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)


@@ -90,80 +142,23 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(LIST_TOGGLE_MULTI_SEL, MyFrame::OnToggleMultiSel)
     EVT_MENU(LIST_SHOW_COL_INFO, MyFrame::OnShowColInfo)
     EVT_MENU(LIST_SHOW_SEL_INFO, MyFrame::OnShowSelInfo)
     EVT_MENU(LIST_TOGGLE_MULTI_SEL, MyFrame::OnToggleMultiSel)
     EVT_MENU(LIST_SHOW_COL_INFO, MyFrame::OnShowColInfo)
     EVT_MENU(LIST_SHOW_SEL_INFO, MyFrame::OnShowSelInfo)

+    EVT_MENU(LIST_SHOW_VIEW_RECT, MyFrame::OnShowViewRect)
+#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
+    EVT_MENU(LIST_SET_COL_ORDER, MyFrame::OnSetColOrder)
+    EVT_MENU(LIST_GET_COL_ORDER, MyFrame::OnGetColOrder)
+#endif // wxHAS_LISTCTRL_COLUMN_ORDER

     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)

+#ifdef __WXOSX__

     EVT_MENU(LIST_MAC_USE_GENERIC, MyFrame::OnToggleMacUseGeneric)
     EVT_MENU(LIST_MAC_USE_GENERIC, MyFrame::OnToggleMacUseGeneric)

+#endif // __WXOSX__
+    EVT_MENU(LIST_FIND, MyFrame::OnFind)

 
     EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo)
     EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel)
 END_EVENT_TABLE()
 
 
     EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo)
     EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel)
 END_EVENT_TABLE()
 

-BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
-    EVT_LIST_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnBeginDrag)
-    EVT_LIST_BEGIN_RDRAG(LIST_CTRL, MyListCtrl::OnBeginRDrag)
-    EVT_LIST_BEGIN_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnBeginLabelEdit)
-    EVT_LIST_END_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnEndLabelEdit)
-    EVT_LIST_DELETE_ITEM(LIST_CTRL, MyListCtrl::OnDeleteItem)
-    EVT_LIST_DELETE_ALL_ITEMS(LIST_CTRL, MyListCtrl::OnDeleteAllItems)
-    EVT_LIST_ITEM_SELECTED(LIST_CTRL, MyListCtrl::OnSelected)
-    EVT_LIST_ITEM_DESELECTED(LIST_CTRL, MyListCtrl::OnDeselected)
-    EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown)
-    EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, MyListCtrl::OnActivated)
-    EVT_LIST_ITEM_FOCUSED(LIST_CTRL, MyListCtrl::OnFocused)
-
-    EVT_LIST_COL_CLICK(LIST_CTRL, MyListCtrl::OnColClick)
-    EVT_LIST_COL_RIGHT_CLICK(LIST_CTRL, MyListCtrl::OnColRightClick)
-    EVT_LIST_COL_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnColBeginDrag)
-    EVT_LIST_COL_DRAGGING(LIST_CTRL, MyListCtrl::OnColDragging)
-    EVT_LIST_COL_END_DRAG(LIST_CTRL, MyListCtrl::OnColEndDrag)
-
-    EVT_LIST_CACHE_HINT(LIST_CTRL, MyListCtrl::OnCacheHint)
-
-#if USE_CONTEXT_MENU
-    EVT_CONTEXT_MENU(MyListCtrl::OnContextMenu)
-#endif
-    EVT_CHAR(MyListCtrl::OnChar)
-
-    EVT_RIGHT_DOWN(MyListCtrl::OnRightClick)
-END_EVENT_TABLE()
-
-IMPLEMENT_APP(MyApp)
-
-// 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 MyCompareFunction(long item1, long item2, long WXUNUSED(sortData))
-{
-    // inverse the order
-    if (item1 < item2)
-        return -1;
-    if (item1 > item2)
-        return 1;
-
-    return 0;
-}
-
-// `Main program' equivalent, creating windows and returning main app frame
-bool MyApp::OnInit()
-{
-  if ( !wxApp::OnInit() )
-      return false;
-
-  // Create the main frame window
-  MyFrame *frame = new MyFrame(wxT("wxListCtrl Test"));
-
-  // Show the frame
-  frame->Show(true);
-
-  SetTopWindow(frame);
-
-  return true;
-}
-

 // My frame constructor
 MyFrame::MyFrame(const wxChar *title)
        : wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(600, 500))
 // My frame constructor
 MyFrame::MyFrame(const wxChar *title)
        : wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(600, 500))


@@ -171,6 +166,7 @@ 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
     SetIcon( wxICON(mondrian) );
 
     // Give it an icon
     SetIcon( wxICON(mondrian) );


@@ -180,17 +176,17 @@ MyFrame::MyFrame(const wxChar *title)
     m_imageListSmall = new wxImageList(16, 16, true);
 
 #ifdef __WXMSW__
     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) );
+    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 ) );


@@ -208,56 +204,65 @@ 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_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
+    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();
     menuList->AppendSeparator();

-    menuList->Append(LIST_SORT, _T("&Sort\tCtrl-S"));
+    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->Append(LIST_TOGGLE_MULTI_SEL, wxT("&Multiple selection\tCtrl-M"),
+            wxT("Toggle multiple selection"), 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);


@@ -269,6 +274,12 @@ MyFrame::MyFrame(const wxChar *title)
 
     RecreateList(wxLC_REPORT | wxLC_SINGLE_SEL);
 
 
     RecreateList(wxLC_REPORT | wxLC_SINGLE_SEL);
 

+#ifdef __WXMSW__
+    // this is useful to know specially when debugging :)
+    wxLogMessage("Your version of comctl32.dll is: %d", 
+                 wxApp::GetComCtl32Version());
+#endif
+

 #if wxUSE_STATUSBAR
     CreateStatusBar();
 #endif // wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR
     CreateStatusBar();
 #endif // wxUSE_STATUSBAR


@@ -297,7 +308,7 @@ void MyFrame::DoSize()
     wxSize size = GetClientSize();
     wxCoord y = (2*size.y)/3;
     m_listCtrl->SetSize(0, 0, size.x, y);
     wxSize size = GetClientSize();
     wxCoord y = (2*size.y)/3;
     m_listCtrl->SetSize(0, 0, size.x, y);

-    m_logWindow->SetSize(0, y + 1, size.x, size.y - y);
+    m_logWindow->SetSize(0, y + 1, size.x, size.y - y -1);

 }
 
 bool MyFrame::CheckNonVirtual() const
 }
 
 bool MyFrame::CheckNonVirtual() const


@@ -306,7 +317,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;
 }


@@ -318,22 +329,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();
 }


@@ -343,11 +354,15 @@ void MyFrame::OnToggleLines(wxCommandEvent& event)
     m_listCtrl->SetSingleStyle(wxLC_HRULES | wxLC_VRULES, event.IsChecked());
 }
 
     m_listCtrl->SetSingleStyle(wxLC_HRULES | wxLC_VRULES, event.IsChecked());
 }
 

+#ifdef __WXOSX__
+

 void MyFrame::OnToggleMacUseGeneric(wxCommandEvent& event)
 {
     wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), event.IsChecked());
 }
 
 void MyFrame::OnToggleMacUseGeneric(wxCommandEvent& event)
 {
     wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), event.IsChecked());
 }
 

+#endif // __WXOSX__
+

 void MyFrame::OnGoTo(wxCommandEvent& WXUNUSED(event))
 {
     long index = 3;
 void MyFrame::OnGoTo(wxCommandEvent& WXUNUSED(event))
 {
     long index = 3;


@@ -415,7 +430,7 @@ void MyFrame::RecreateList(long flags, bool withText)
         m_listCtrl = new MyListCtrl(m_panel, LIST_CTRL,
                                     wxDefaultPosition, wxDefaultSize,
                                     flags |
         m_listCtrl = new MyListCtrl(m_panel, LIST_CTRL,
                                     wxDefaultPosition, wxDefaultSize,
                                     flags |

-                                    wxSUNKEN_BORDER | wxLC_EDIT_LABELS);
+                                    wxBORDER_THEME | wxLC_EDIT_LABELS);

 
         switch ( flags & wxLC_MASK_TYPE )
         {
 
         switch ( flags & wxLC_MASK_TYPE )
         {


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

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

         }
     }
 
         }
     }
 


@@ -455,9 +470,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));

     }
 }
 
     }
 }
 


@@ -473,15 +488,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);
 


@@ -490,13 +505,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


@@ -544,7 +559,7 @@ void MyFrame::InitWithIconItems(bool withText, bool sameIcon)
 
         if ( withText )
         {
 
         if ( withText )
         {

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

                                    image);
         }
         else
                                    image);
         }
         else


@@ -586,20 +601,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);


@@ -612,15 +652,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;


@@ -629,12 +681,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;
         }
 


@@ -643,6 +695,78 @@ void MyFrame::OnShowSelInfo(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void MyFrame::OnShowViewRect(wxCommandEvent& WXUNUSED(event))
+{
+    const wxRect r = m_listCtrl->GetViewRect();
+    wxLogMessage("View rect: (%d, %d)-(%d, %d)",
+                 r.GetLeft(), r.GetTop(), r.GetRight(), r.GetBottom());
+}
+
+// ----------------------------------------------------------------------------
+// column order tests
+// ----------------------------------------------------------------------------
+
+#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
+
+static wxString DumpIntArray(const wxArrayInt& a)
+{
+    wxString s("{ ");
+    const size_t count = a.size();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        if ( n )
+            s += ", ";
+        s += wxString::Format("%lu", (unsigned long)a[n]);
+    }
+
+    s += " }";
+
+    return s;
+}
+
+void MyFrame::OnSetColOrder(wxCommandEvent& WXUNUSED(event))
+{
+    wxArrayInt order(3);
+    order[0] = 2;
+    order[1] = 0;
+    order[2] = 1;
+    if ( m_listCtrl->SetColumnsOrder(order) )
+    {
+        wxLogMessage("Column order set to %s", DumpIntArray(order));
+    }
+}
+
+void MyFrame::OnGetColOrder(wxCommandEvent& WXUNUSED(event))
+{
+    // show what GetColumnsOrder() returns
+    const wxArrayInt order = m_listCtrl->GetColumnsOrder();
+    wxString msg = "Columns order: " +
+                        DumpIntArray(m_listCtrl->GetColumnsOrder()) + "\n";
+
+    int n;
+    const int count = m_listCtrl->GetColumnCount();
+
+    // show the results of GetColumnOrder() for each column
+    msg += "GetColumnOrder() results:\n";
+    for ( n = 0; n < count; n++ )
+    {
+        msg += wxString::Format("    %2d -> %2d\n",
+                                n, m_listCtrl->GetColumnOrder(n));
+    }
+
+    // and the results of GetColumnIndexFromOrder() too
+    msg += "GetColumnIndexFromOrder() results:\n";
+    for ( n = 0; n < count; n++ )
+    {
+        msg += wxString::Format("    %2d -> %2d\n",
+                                n, m_listCtrl->GetColumnIndexFromOrder(n));
+    }
+
+    wxLogMessage("%s", msg);
+}
+
+#endif // wxHAS_LISTCTRL_COLUMN_ORDER
+

 void MyFrame::OnShowColInfo(wxCommandEvent& WXUNUSED(event))
 {
     int count = m_listCtrl->GetColumnCount();
 void MyFrame::OnShowColInfo(wxCommandEvent& WXUNUSED(event))
 {
     int count = m_listCtrl->GetColumnCount();


@@ -668,7 +792,7 @@ 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);
 }
 
     RecreateList(flags);
 }


@@ -692,7 +816,7 @@ 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))


@@ -706,7 +830,7 @@ void MyFrame::OnEdit(wxCommandEvent& WXUNUSED(event))
     }
     else
     {
     }
     else
     {

-        m_logWindow->WriteText(_T("No item to edit"));
+        m_logWindow->WriteText(wxT("No item to edit"));

     }
 }
 
     }
 }
 


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

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

     }
 }
 
     }
 }
 


@@ -730,12 +854,44 @@ 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()));
 }
 

+
+// ----------------------------------------------------------------------------

 // MyListCtrl
 // MyListCtrl

+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
+    EVT_LIST_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnBeginDrag)
+    EVT_LIST_BEGIN_RDRAG(LIST_CTRL, MyListCtrl::OnBeginRDrag)
+    EVT_LIST_BEGIN_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnBeginLabelEdit)
+    EVT_LIST_END_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnEndLabelEdit)
+    EVT_LIST_DELETE_ITEM(LIST_CTRL, MyListCtrl::OnDeleteItem)
+    EVT_LIST_DELETE_ALL_ITEMS(LIST_CTRL, MyListCtrl::OnDeleteAllItems)
+    EVT_LIST_ITEM_SELECTED(LIST_CTRL, MyListCtrl::OnSelected)
+    EVT_LIST_ITEM_DESELECTED(LIST_CTRL, MyListCtrl::OnDeselected)
+    EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown)
+    EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, MyListCtrl::OnActivated)
+    EVT_LIST_ITEM_FOCUSED(LIST_CTRL, MyListCtrl::OnFocused)
+
+    EVT_LIST_COL_CLICK(LIST_CTRL, MyListCtrl::OnColClick)
+    EVT_LIST_COL_RIGHT_CLICK(LIST_CTRL, MyListCtrl::OnColRightClick)
+    EVT_LIST_COL_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnColBeginDrag)
+    EVT_LIST_COL_DRAGGING(LIST_CTRL, MyListCtrl::OnColDragging)
+    EVT_LIST_COL_END_DRAG(LIST_CTRL, MyListCtrl::OnColEndDrag)
+
+    EVT_LIST_CACHE_HINT(LIST_CTRL, MyListCtrl::OnCacheHint)
+
+#if USE_CONTEXT_MENU
+    EVT_CONTEXT_MENU(MyListCtrl::OnContextMenu)
+#endif
+    EVT_CHAR(MyListCtrl::OnChar)
+
+    EVT_RIGHT_DOWN(MyListCtrl::OnRightClick)
+END_EVENT_TABLE()

 
 void MyListCtrl::OnCacheHint(wxListEvent& event)
 {
 
 void MyListCtrl::OnCacheHint(wxListEvent& event)
 {


@@ -773,7 +929,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() );


@@ -796,7 +952,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();
     }


@@ -830,14 +986,24 @@ void MyListCtrl::OnBeginRDrag(wxListEvent& event)
 void MyListCtrl::OnBeginLabelEdit(wxListEvent& event)
 {
     wxLogMessage( wxT("OnBeginLabelEdit: %s"), event.m_item.m_text.c_str());
 void MyListCtrl::OnBeginLabelEdit(wxListEvent& event)
 {
     wxLogMessage( wxT("OnBeginLabelEdit: %s"), event.m_item.m_text.c_str());

+
+    wxTextCtrl * const text = GetEditControl();
+    if ( !text )
+    {
+        wxLogMessage("BUG: started to edit but no edit control");
+    }
+    else
+    {
+        wxLogMessage("Edit control value: \"%s\"", text->GetValue());
+    }

 }
 
 void MyListCtrl::OnEndLabelEdit(wxListEvent& event)
 {
     wxLogMessage( wxT("OnEndLabelEdit: %s"),
         (
 }
 
 void MyListCtrl::OnEndLabelEdit(wxListEvent& event)
 {
     wxLogMessage( wxT("OnEndLabelEdit: %s"),
         (

-            event.IsEditCancelled() ? 
-            wxString("[cancelled]") : 
+            event.IsEditCancelled() ?
+            wxString("[cancelled]") :

             event.m_item.m_text
         ).c_str()
     );
             event.m_item.m_text
         ).c_str()
     );


@@ -845,18 +1011,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 )
     {


@@ -878,17 +1044,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();
 }


@@ -930,7 +1096,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);


@@ -942,15 +1108,36 @@ 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 '3':
+        case '4': // this column is invalid but we want to test it too
+            if ( InReportView() )
+            {
+                int subItem = event.GetKeyCode() - '1';
+                item = event.GetIndex();
+                wxRect r;
+                if ( !GetSubItemRect(item, subItem, r) )
+                {
+                    wxLogError(wxT("Failed to retrieve rect of item %ld column %d"), item, subItem + 1);
+                    break;
+                }
+
+                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);
+            }
+            break;
+

         case 'U': // update
             if ( !IsVirtual() )
                 break;
         case 'U': // update
             if ( !IsVirtual() )
                 break;


@@ -971,13 +1158,13 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event)
             }
             break;
 
             }
             break;
 

-        case WXK_DELETE:
+        case 'D': // delete

             item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
             while ( item != -1 )
             {
                 DeleteItem(item);
 
             item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
             while ( item != -1 )
             {
                 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,


@@ -985,7 +1172,7 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event)
             }
             break;
 
             }
             break;
 

-        case WXK_INSERT:
+        case 'I': // insert

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


@@ -1000,7 +1187,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();
     }


@@ -1008,7 +1195,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() )
     {


@@ -1020,8 +1207,10 @@ void MyListCtrl::OnChar(wxKeyEvent& event)
         case 'R':
         case 'u':
         case 'U':
         case 'R':
         case 'u':
         case 'U':

-        case WXK_DELETE:
-        case WXK_INSERT:
+        case 'd':
+        case 'D':
+        case 'i':
+        case 'I':

             // these are the keys we process ourselves
             break;
 
             // these are the keys we process ourselves
             break;
 


@@ -1045,24 +1234,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());
 }


@@ -1075,7 +1264,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);

     }
 }
 
     }
 }
 


@@ -1106,30 +1295,43 @@ 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);
 }
 
 #if USE_CONTEXT_MENU
 void MyListCtrl::OnContextMenu(wxContextMenuEvent& event)
 {
     SetItem(tmp, 2, buf);
 }
 
 #if USE_CONTEXT_MENU
 void MyListCtrl::OnContextMenu(wxContextMenuEvent& event)
 {

-    wxPoint point = event.GetPosition();
-    // If from keyboard
-    if (point.x == -1 && point.y == -1) {
-        wxSize size = GetSize();
-        point.x = size.x / 2;
-        point.y = size.y / 2;
-    } else {
-        point = ScreenToClient(point);
+    if (GetEditControl() == NULL)
+    {
+        wxPoint point = event.GetPosition();
+        // If from keyboard
+        if ( (point.x == -1) && (point.y == -1) )
+        {
+            wxSize size = GetSize();
+            point.x = size.x / 2;
+            point.y = size.y / 2;
+        }
+        else
+        {
+            point = ScreenToClient(point);
+        }
+        ShowContextMenu(point);
+    }
+    else
+    {
+        // the user is editing:
+        // allow the text control to display its context menu
+        // if it has one (it has on Windows) rather than display our one
+        event.Skip();

     }
     }

-    ShowContextMenu(point);

 }
 #endif
 
 }
 #endif
 


@@ -1137,9 +1339,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);
 }