projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't set cell value in wxDataViewEvent in one place only.
[wxWidgets.git]
/
samples
/
listctrl
/
listtest.h
diff --git
a/samples/listctrl/listtest.h
b/samples/listctrl/listtest.h
index e203f8f5f887bfb8d056dc2e7d055f86e560a073..f99c135eb2b2cdd28b3a5690a965b683c8685827 100644
(file)
--- a/
samples/listctrl/listtest.h
+++ b/
samples/listctrl/listtest.h
@@
-6,12
+6,12
@@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
// not all ports have support for EVT_CONTEXT_MENU yet, don't define
// USE_CONTEXT_MENU for those which don't
/////////////////////////////////////////////////////////////////////////////
// not all ports have support for EVT_CONTEXT_MENU yet, don't define
// USE_CONTEXT_MENU for those which don't
-#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__)
|| defined(__WXMGL__)
+#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__)
#define USE_CONTEXT_MENU 0
#else
#define USE_CONTEXT_MENU 1
#define USE_CONTEXT_MENU 0
#else
#define USE_CONTEXT_MENU 1
@@
-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
@@
-37,8
+37,7
@@
public:
const wxPoint& pos,
const wxSize& size,
long style)
const wxPoint& pos,
const wxSize& size,
long style)
- : wxListCtrl(parent, id, pos, size, style),
- m_attr(*wxBLUE, *wxLIGHT_GREY, wxNullFont)
+ : wxListCtrl(parent, id, pos, size, style)
{
m_updated = -1;
{
m_updated = -1;
@@
-88,12
+87,10
@@
private:
virtual int OnGetItemColumnImage(long item, long column) const;
virtual wxListItemAttr *OnGetItemAttr(long item) const;
virtual int OnGetItemColumnImage(long item, long column) const;
virtual wxListItemAttr *OnGetItemAttr(long item) const;
- wxListItemAttr m_attr;
-
long m_updated;
long m_updated;
- DECLARE_NO_COPY_CLASS(MyListCtrl)
+ wxDECLARE_NO_COPY_CLASS(MyListCtrl);
DECLARE_EVENT_TABLE()
};
DECLARE_EVENT_TABLE()
};
@@
-120,6
+117,9
@@
protected:
void OnVirtualView(wxCommandEvent& event);
void OnSmallVirtualView(wxCommandEvent& event);
void OnVirtualView(wxCommandEvent& event);
void OnSmallVirtualView(wxCommandEvent& event);
+ void OnSetItemsCount(wxCommandEvent& event);
+
+
void OnGoTo(wxCommandEvent& event);
void OnFocusLast(wxCommandEvent& event);
void OnToggleFirstSel(wxCommandEvent& event);
void OnGoTo(wxCommandEvent& event);
void OnFocusLast(wxCommandEvent& event);
void OnToggleFirstSel(wxCommandEvent& event);
@@
-132,6
+132,7
@@
protected:
void OnSort(wxCommandEvent& event);
void OnSetFgColour(wxCommandEvent& event);
void OnSetBgColour(wxCommandEvent& event);
void OnSort(wxCommandEvent& event);
void OnSetFgColour(wxCommandEvent& event);
void OnSetBgColour(wxCommandEvent& event);
+ void OnSetRowLines(wxCommandEvent& event);
void OnToggleMultiSel(wxCommandEvent& event);
void OnShowColInfo(wxCommandEvent& event);
void OnShowSelInfo(wxCommandEvent& event);
void OnToggleMultiSel(wxCommandEvent& event);
void OnShowColInfo(wxCommandEvent& event);
void OnShowSelInfo(wxCommandEvent& event);
@@
-143,10
+144,17
@@
protected:
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 OnToggleHeader(wxCommandEvent& event);
+ void OnToggleBell(wxCommandEvent& event);
+#ifdef __WXOSX__
void OnToggleMacUseGeneric(wxCommandEvent& event);
void OnToggleMacUseGeneric(wxCommandEvent& event);
+#endif // __WXOSX__
+ void OnFind(wxCommandEvent& event);
- void OnUpdate
ShowColInfo
(wxUpdateUIEvent& event);
+ void OnUpdate
UIEnableInReport
(wxUpdateUIEvent& event);
void OnUpdateToggleMultiSel(wxUpdateUIEvent& event);
void OnUpdateToggleMultiSel(wxUpdateUIEvent& event);
+ void OnUpdateToggleHeader(wxUpdateUIEvent& event);
+ void OnUpdateRowLines(wxUpdateUIEvent& event);
wxImageList *m_imageListNormal;
wxImageList *m_imageListSmall;
wxImageList *m_imageListNormal;
wxImageList *m_imageListSmall;
@@
-174,7
+182,11
@@
private:
bool m_smallVirtual;
bool m_smallVirtual;
- DECLARE_NO_COPY_CLASS(MyFrame)
+ // number of items to initialize list/report view with
+ int m_numListItems;
+
+
+ wxDECLARE_NO_COPY_CLASS(MyFrame);
DECLARE_EVENT_TABLE()
};
DECLARE_EVENT_TABLE()
};
@@
-193,6
+205,7
@@
enum
LIST_REPORT_VIEW,
LIST_VIRTUAL_VIEW,
LIST_SMALL_VIRTUAL_VIEW,
LIST_REPORT_VIEW,
LIST_VIRTUAL_VIEW,
LIST_SMALL_VIRTUAL_VIEW,
+ LIST_SET_ITEMS_COUNT,
LIST_DESELECT_ALL,
LIST_SELECT_ALL,
LIST_DESELECT_ALL,
LIST_SELECT_ALL,
@@
-201,9
+214,13
@@
enum
LIST_ADD,
LIST_EDIT,
LIST_SORT,
LIST_ADD,
LIST_EDIT,
LIST_SORT,
+ LIST_FIND,
LIST_SET_FG_COL,
LIST_SET_BG_COL,
LIST_SET_FG_COL,
LIST_SET_BG_COL,
+ LIST_ROW_LINES,
LIST_TOGGLE_MULTI_SEL,
LIST_TOGGLE_MULTI_SEL,
+ LIST_TOGGLE_HEADER,
+ LIST_TOGGLE_BELL,
LIST_TOGGLE_FIRST,
LIST_SHOW_COL_INFO,
LIST_SHOW_SEL_INFO,
LIST_TOGGLE_FIRST,
LIST_SHOW_COL_INFO,
LIST_SHOW_SEL_INFO,
@@
-217,7
+234,9
@@
enum
LIST_FREEZE,
LIST_THAW,
LIST_TOGGLE_LINES,
LIST_FREEZE,
LIST_THAW,
LIST_TOGGLE_LINES,
+#ifdef __WXOSX__
LIST_MAC_USE_GENERIC,
LIST_MAC_USE_GENERIC,
+#endif
LIST_CTRL = 1000
};
LIST_CTRL = 1000
};