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 8814cd59b6f18a4eed84adf8fd91c9b6eb2ce181..a79ca7c580ad9196937a38126ef7c95d24b4b525 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -19,13 +19,24 @@ 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)

         {
         }
 
         {
         }
 

+    // add one item to the listctrl in report mode
+    void InsertItemInReportView(int i);
+

     void OnColClick(wxListEvent& event);
     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);


@@ -38,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()
 };


@@ -73,9 +91,11 @@ 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);

+    void OnAdd(wxCommandEvent& event);

     void OnDelete(wxCommandEvent& event);
     void OnDeleteAll(wxCommandEvent& event);
     void OnSort(wxCommandEvent& event);
     void OnDelete(wxCommandEvent& event);
     void OnDeleteAll(wxCommandEvent& event);
     void OnSort(wxCommandEvent& event);


@@ -83,6 +103,9 @@ public:
     void OnSetBgColour(wxCommandEvent& event);
     void OnToggleMultiSel(wxCommandEvent& event);
     void OnShowColInfo(wxCommandEvent& event);
     void OnSetBgColour(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);
 


@@ -90,6 +113,15 @@ public:
     wxImageList *m_imageListSmall;
 
 private:
     wxImageList *m_imageListSmall;
 
 private:

+    // recreate the list control with the new flags
+    void RecreateList(long flags, bool withText = TRUE);
+
+    // fill the control with items depending on the view
+    void InitWithListItems();
+    void InitWithReportItems();
+    void InitWithIconItems(bool withText, bool sameIcon = FALSE);
+    void InitWithVirtualItems();
+

     wxLog *m_logOld;
 
     DECLARE_EVENT_TABLE()
     wxLog *m_logOld;
 
     DECLARE_EVENT_TABLE()


@@ -99,26 +131,32 @@ private:
 // IDs for the menu commands
 enum
 {
 // IDs for the menu commands
 enum
 {

+    LIST_ABOUT,

     LIST_QUIT,
     LIST_QUIT,

+

     LIST_LIST_VIEW,
     LIST_ICON_VIEW,
     LIST_ICON_TEXT_VIEW,
     LIST_SMALL_ICON_VIEW,
     LIST_SMALL_ICON_TEXT_VIEW,
     LIST_LIST_VIEW,
     LIST_ICON_VIEW,
     LIST_ICON_TEXT_VIEW,
     LIST_SMALL_ICON_VIEW,
     LIST_SMALL_ICON_TEXT_VIEW,

+    LIST_REPORT_VIEW,

     LIST_VIRTUAL_VIEW,
 
     LIST_VIRTUAL_VIEW,
 

-    LIST_REPORT_VIEW,

     LIST_DESELECT_ALL,
     LIST_SELECT_ALL,
     LIST_DESELECT_ALL,
     LIST_SELECT_ALL,

-    LIST_ABOUT,

     LIST_DELETE_ALL,
     LIST_DELETE,
     LIST_DELETE_ALL,
     LIST_DELETE,

+    LIST_ADD,

     LIST_SORT,
     LIST_SET_FG_COL,
     LIST_SET_BG_COL,
     LIST_TOGGLE_MULTI_SEL,
     LIST_TOGGLE_FIRST,
     LIST_SHOW_COL_INFO,
     LIST_SORT,
     LIST_SET_FG_COL,
     LIST_SET_BG_COL,
     LIST_TOGGLE_MULTI_SEL,
     LIST_TOGGLE_FIRST,
     LIST_SHOW_COL_INFO,

+    LIST_SHOW_SEL_INFO,
+    LIST_FOCUS_LAST,
+    LIST_FREEZE,
+    LIST_THAW,

 
     LIST_CTRL                   = 1000
 };
 
     LIST_CTRL                   = 1000
 };