1. changed spelling error in wxTR_HAS_VARIABLE_HEIGHT (missing 'E')
2. compile fix for dcscreen.cpp 3. editing labels in place works in the tree ctrl and shown in the sample 4. sped up items deletion in the listview git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -6,13 +6,13 @@
|
||||
// Created: 04/01/98
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Julian Smart and Markus Holzem
|
||||
// Licence: wxWindows license
|
||||
// Licence: wxWindows license
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// Define a new application type
|
||||
class MyApp: public wxApp
|
||||
{ public:
|
||||
bool OnInit(void);
|
||||
bool OnInit();
|
||||
|
||||
wxImageList *m_imageListNormal;
|
||||
wxImageList *m_imageListSmall;
|
||||
@@ -21,39 +21,40 @@ class MyApp: public wxApp
|
||||
class MyListCtrl: public wxListCtrl
|
||||
{
|
||||
public:
|
||||
MyListCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos,
|
||||
const wxSize& size, long style):
|
||||
MyListCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos,
|
||||
const wxSize& size, long style):
|
||||
wxListCtrl(parent, id, pos, size, style)
|
||||
{
|
||||
}
|
||||
|
||||
void OnBeginDrag(wxListEvent& event);
|
||||
void OnBeginRDrag(wxListEvent& event);
|
||||
void OnBeginLabelEdit(wxListEvent& event);
|
||||
void OnEndLabelEdit(wxListEvent& event);
|
||||
void OnDeleteItem(wxListEvent& event);
|
||||
void OnGetInfo(wxListEvent& event);
|
||||
void OnSetInfo(wxListEvent& event);
|
||||
void OnSelected(wxListEvent& event);
|
||||
void OnDeselected(wxListEvent& event);
|
||||
void OnListKeyDown(wxListEvent& event);
|
||||
void OnActivated(wxListEvent& event);
|
||||
{
|
||||
}
|
||||
|
||||
void OnBeginDrag(wxListEvent& event);
|
||||
void OnBeginRDrag(wxListEvent& event);
|
||||
void OnBeginLabelEdit(wxListEvent& event);
|
||||
void OnEndLabelEdit(wxListEvent& event);
|
||||
void OnDeleteItem(wxListEvent& event);
|
||||
void OnGetInfo(wxListEvent& event);
|
||||
void OnSetInfo(wxListEvent& event);
|
||||
void OnSelected(wxListEvent& event);
|
||||
void OnDeselected(wxListEvent& event);
|
||||
void OnListKeyDown(wxListEvent& event);
|
||||
void OnActivated(wxListEvent& event);
|
||||
|
||||
void OnChar(wxKeyEvent& event);
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
// Define a new frame type
|
||||
class MyFrame: public wxFrame
|
||||
{ public:
|
||||
{
|
||||
public:
|
||||
MyListCtrl *m_listCtrl;
|
||||
wxTextCtrl *m_logWindow;
|
||||
|
||||
MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
|
||||
~MyFrame(void);
|
||||
|
||||
public:
|
||||
~MyFrame();
|
||||
|
||||
public:
|
||||
void OnQuit(wxCommandEvent& event);
|
||||
void OnAbout(wxCommandEvent& event);
|
||||
void OnListView(wxCommandEvent& event);
|
||||
@@ -64,14 +65,17 @@ class MyFrame: public wxFrame
|
||||
void OnSmallIconTextView(wxCommandEvent& event);
|
||||
void OnDeselectAll(wxCommandEvent& event);
|
||||
void OnSelectAll(wxCommandEvent& event);
|
||||
void OnDeleteAll(wxCommandEvent& event);
|
||||
|
||||
void BusyOn(wxCommandEvent& event);
|
||||
void BusyOff(wxCommandEvent& event);
|
||||
DECLARE_EVENT_TABLE()
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
|
||||
// ID for the menu quit command
|
||||
#define LIST_QUIT 1
|
||||
#define LIST_QUIT 1
|
||||
#define LIST_LIST_VIEW 2
|
||||
#define LIST_ICON_VIEW 3
|
||||
#define LIST_ICON_TEXT_VIEW 4
|
||||
@@ -83,6 +87,7 @@ class MyFrame: public wxFrame
|
||||
#define LIST_ABOUT 102
|
||||
#define BUSY_ON 10
|
||||
#define BUSY_OFF 11
|
||||
#define LIST_DELETE_ALL 12
|
||||
|
||||
#define LIST_CTRL 1000
|
||||
|
||||
|
Reference in New Issue
Block a user