merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -58,6 +58,7 @@ private:
|
||||
void SetColumnImage(int col, int image);
|
||||
|
||||
void LogEvent(const wxListEvent& event, const wxChar *eventName);
|
||||
void LogColEvent(const wxListEvent& event, const wxChar *eventName);
|
||||
|
||||
virtual wxString OnGetItemText(long item, long column) const;
|
||||
virtual int OnGetItemImage(long item) const;
|
||||
@@ -72,13 +73,10 @@ private:
|
||||
class MyFrame: public wxFrame
|
||||
{
|
||||
public:
|
||||
MyListCtrl *m_listCtrl;
|
||||
wxTextCtrl *m_logWindow;
|
||||
|
||||
MyFrame(const wxChar *title, int x, int y, int w, int h);
|
||||
~MyFrame();
|
||||
|
||||
public:
|
||||
protected:
|
||||
void OnSize(wxSizeEvent& event);
|
||||
|
||||
void OnQuit(wxCommandEvent& event);
|
||||
@@ -113,6 +111,10 @@ public:
|
||||
wxImageList *m_imageListNormal;
|
||||
wxImageList *m_imageListSmall;
|
||||
|
||||
wxPanel *m_panel;
|
||||
MyListCtrl *m_listCtrl;
|
||||
wxTextCtrl *m_logWindow;
|
||||
|
||||
private:
|
||||
// recreate the list control with the new flags
|
||||
void RecreateList(long flags, bool withText = TRUE);
|
||||
|
Reference in New Issue
Block a user