Corrected wrong use of delete in region code.

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

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index 446585a4a42e2df3c72ec558e590816ef08180b0..a79ca7c580ad9196937a38126ef7c95d24b4b525 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -19,9 +19,13 @@ public:
 class MyListCtrl: public wxListCtrl
 {
 public:
 class MyListCtrl: public wxListCtrl
 {
 public:

-    MyListCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos,
-            const wxSize& size, long style):
-        wxListCtrl(parent, id, pos, size, style)
+    MyListCtrl(wxWindow *parent,
+               const wxWindowID id,
+               const wxPoint& pos,
+               const wxSize& size,
+               long style)
+        : wxListCtrl(parent, id, pos, size, style),
+          m_attr(*wxBLUE, *wxLIGHT_GREY, wxNullFont)

         {
         }
 
         {
         }
 


@@ -29,6 +33,10 @@ public:
     void InsertItemInReportView(int i);
 
     void OnColClick(wxListEvent& event);
     void InsertItemInReportView(int i);
 
     void OnColClick(wxListEvent& event);

+    void OnColRightClick(wxListEvent& event);
+    void OnColBeginDrag(wxListEvent& event);
+    void OnColDragging(wxListEvent& event);
+    void OnColEndDrag(wxListEvent& event);

     void OnBeginDrag(wxListEvent& event);
     void OnBeginRDrag(wxListEvent& event);
     void OnBeginLabelEdit(wxListEvent& event);
     void OnBeginDrag(wxListEvent& event);
     void OnBeginRDrag(wxListEvent& event);
     void OnBeginLabelEdit(wxListEvent& event);


@@ -41,14 +49,21 @@ public:
     void OnDeselected(wxListEvent& event);
     void OnListKeyDown(wxListEvent& event);
     void OnActivated(wxListEvent& event);
     void OnDeselected(wxListEvent& event);
     void OnListKeyDown(wxListEvent& event);
     void OnActivated(wxListEvent& event);

+    void OnFocused(wxListEvent& event);
+    void OnCacheHint(wxListEvent& event);

 
     void OnChar(wxKeyEvent& event);
 
 private:
 
     void OnChar(wxKeyEvent& event);
 
 private:

+    void SetColumnImage(int col, int image);
+

     void LogEvent(const wxListEvent& event, const wxChar *eventName);
 
     virtual wxString OnGetItemText(long item, long column) const;
     virtual int OnGetItemImage(long item) const;
     void LogEvent(const wxListEvent& event, const wxChar *eventName);
 
     virtual wxString OnGetItemText(long item, long column) const;
     virtual int OnGetItemImage(long item) const;

+    virtual wxListItemAttr *OnGetItemAttr(long item) const;
+
+    wxListItemAttr m_attr;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -76,6 +91,7 @@ public:
     void OnSmallIconTextView(wxCommandEvent& event);
     void OnVirtualView(wxCommandEvent& event);
 
     void OnSmallIconTextView(wxCommandEvent& event);
     void OnVirtualView(wxCommandEvent& event);
 

+    void OnFocusLast(wxCommandEvent& event);

     void OnToggleFirstSel(wxCommandEvent& event);
     void OnDeselectAll(wxCommandEvent& event);
     void OnSelectAll(wxCommandEvent& event);
     void OnToggleFirstSel(wxCommandEvent& event);
     void OnDeselectAll(wxCommandEvent& event);
     void OnSelectAll(wxCommandEvent& event);


@@ -88,6 +104,8 @@ public:
     void OnToggleMultiSel(wxCommandEvent& event);
     void OnShowColInfo(wxCommandEvent& event);
     void OnShowSelInfo(wxCommandEvent& event);
     void OnToggleMultiSel(wxCommandEvent& event);
     void OnShowColInfo(wxCommandEvent& event);
     void OnShowSelInfo(wxCommandEvent& event);

+    void OnFreeze(wxCommandEvent& event);
+    void OnThaw(wxCommandEvent& event);

 
     void OnUpdateShowColInfo(wxUpdateUIEvent& event);
 
 
     void OnUpdateShowColInfo(wxUpdateUIEvent& event);
 


@@ -136,6 +154,9 @@ enum
     LIST_TOGGLE_FIRST,
     LIST_SHOW_COL_INFO,
     LIST_SHOW_SEL_INFO,
     LIST_TOGGLE_FIRST,
     LIST_SHOW_COL_INFO,
     LIST_SHOW_SEL_INFO,

+    LIST_FOCUS_LAST,
+    LIST_FREEZE,
+    LIST_THAW,

 
     LIST_CTRL                   = 1000
 };
 
     LIST_CTRL                   = 1000
 };