Make dir names unique.

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

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index 2673ce0e988cd27139256cc630777dde44136e49..529e1a6140eaaaa89948731f78762a0221224705 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -26,7 +26,7 @@ public:
     virtual bool OnInit();
 
 private:
     virtual bool OnInit();
 
 private:

-    DECLARE_NO_COPY_CLASS(MyApp)
+    wxDECLARE_NO_COPY_CLASS(MyApp);

 };
 
 class MyListCtrl: public wxListCtrl
 };
 
 class MyListCtrl: public wxListCtrl


@@ -40,6 +40,8 @@ public:
         : wxListCtrl(parent, id, pos, size, style),
           m_attr(*wxBLUE, *wxLIGHT_GREY, wxNullFont)
         {
         : wxListCtrl(parent, id, pos, size, style),
           m_attr(*wxBLUE, *wxLIGHT_GREY, wxNullFont)
         {

+            m_updated = -1;
+

 #ifdef __POCKETPC__
             EnableContextMenu();
 #endif
 #ifdef __POCKETPC__
             EnableContextMenu();
 #endif


@@ -59,10 +61,6 @@ public:
     void OnEndLabelEdit(wxListEvent& event);
     void OnDeleteItem(wxListEvent& event);
     void OnDeleteAllItems(wxListEvent& event);
     void OnEndLabelEdit(wxListEvent& event);
     void OnDeleteItem(wxListEvent& event);
     void OnDeleteAllItems(wxListEvent& event);

-#if WXWIN_COMPATIBILITY_2_4
-    void OnGetInfo(wxListEvent& event);
-    void OnSetInfo(wxListEvent& event);
-#endif

     void OnSelected(wxListEvent& event);
     void OnDeselected(wxListEvent& event);
     void OnListKeyDown(wxListEvent& event);
     void OnSelected(wxListEvent& event);
     void OnDeselected(wxListEvent& event);
     void OnListKeyDown(wxListEvent& event);


@@ -76,6 +74,8 @@ public:
     void OnContextMenu(wxContextMenuEvent& event);
 #endif
 
     void OnContextMenu(wxContextMenuEvent& event);
 #endif
 

+    void OnRightClick(wxMouseEvent& event);
+

 private:
     void ShowContextMenu(const wxPoint& pos);
     wxLog *m_logOld;
 private:
     void ShowContextMenu(const wxPoint& pos);
     wxLog *m_logOld;


@@ -90,7 +90,10 @@ private:
 
     wxListItemAttr m_attr;
 
 
     wxListItemAttr m_attr;
 

-    DECLARE_NO_COPY_CLASS(MyListCtrl)
+    long m_updated;
+
+
+    wxDECLARE_NO_COPY_CLASS(MyListCtrl);

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -117,6 +120,7 @@ protected:
     void OnVirtualView(wxCommandEvent& event);
     void OnSmallVirtualView(wxCommandEvent& event);
 
     void OnVirtualView(wxCommandEvent& event);
     void OnSmallVirtualView(wxCommandEvent& event);
 

+    void OnGoTo(wxCommandEvent& event);

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


@@ -131,9 +135,15 @@ protected:
     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 OnShowViewRect(wxCommandEvent& event);
+#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
+    void OnSetColOrder(wxCommandEvent& event);
+    void OnGetColOrder(wxCommandEvent& event);
+#endif // wxHAS_LISTCTRL_COLUMN_ORDER

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

+    void OnToggleMacUseGeneric(wxCommandEvent& event);

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


@@ -164,7 +174,7 @@ private:
 
     bool m_smallVirtual;
 
 
     bool m_smallVirtual;
 

-    DECLARE_NO_COPY_CLASS(MyFrame)
+    wxDECLARE_NO_COPY_CLASS(MyFrame);

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -197,10 +207,17 @@ enum
     LIST_TOGGLE_FIRST,
     LIST_SHOW_COL_INFO,
     LIST_SHOW_SEL_INFO,
     LIST_TOGGLE_FIRST,
     LIST_SHOW_COL_INFO,
     LIST_SHOW_SEL_INFO,

+    LIST_SHOW_VIEW_RECT,
+#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
+    LIST_SET_COL_ORDER,
+    LIST_GET_COL_ORDER,
+#endif // wxHAS_LISTCTRL_COLUMN_ORDER
+    LIST_GOTO,

     LIST_FOCUS_LAST,
     LIST_FREEZE,
     LIST_THAW,
     LIST_TOGGLE_LINES,
     LIST_FOCUS_LAST,
     LIST_FREEZE,
     LIST_THAW,
     LIST_TOGGLE_LINES,

+    LIST_MAC_USE_GENERIC,

 
     LIST_CTRL                   = 1000
 };
 
     LIST_CTRL                   = 1000
 };