Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug that prevented wxTreeCtrl.OnCompareItems from being called.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-05-09 22:15:05 +00:00
parent 5fb9d2be3f
commit 3b36695de4
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/CHANGES.txt
View File

@@ -55,7 +55,9 @@ Added a ton of missing methods for wxPrintData.
Switched to InnoSetup for MSW distributions. Switched to InnoSetup for MSW distributions.
Added wxToggleButton Added wxToggleButton.
Fixed bug that prevented wxTreeCtrl.OnCompareItems from being called.

8
wxPython/demo/wxTreeCtrl.py
View File

@@ -6,13 +6,14 @@ import string
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
class MyTreeCtrl(wxTreeCtrl): class MyTreeCtrl(wxTreeCtrl):
def __init__(self, parent, id, pos, size, style): def __init__(self, parent, id, pos, size, style, log):
wxTreeCtrl.__init__(self, parent, id, pos, size, style) wxTreeCtrl.__init__(self, parent, id, pos, size, style)
self.log = log
def OnCompareItems(self, item1, item2): def OnCompareItems(self, item1, item2):
t1 = self.GetItemText(item1) t1 = self.GetItemText(item1)
t2 = self.GetItemText(item2) t2 = self.GetItemText(item2)
self.log.WriteText('compare: ' + t1 + '<>' + t2 + '\n')
if t1 < t2: return -1 if t1 < t2: return -1
if t1 == t2: return 0 if t1 == t2: return 0
return 1 return 1
@@ -29,7 +30,8 @@ class TestTreeCtrlPanel(wxPanel):
tID = NewId() tID = NewId()
self.tree = MyTreeCtrl(self, tID, wxDefaultPosition, wxDefaultSize, self.tree = MyTreeCtrl(self, tID, wxDefaultPosition, wxDefaultSize,
wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS)# | wxTR_MULTIPLE) wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS# | wxTR_MULTIPLE
, self.log)
#import images #import images
#il = wxImageList(16, 16) #il = wxImageList(16, 16)

4
wxPython/src/controls2.i
View File

@@ -490,6 +490,7 @@ public:
%{ %{
class wxPyTreeCtrl : public wxTreeCtrl { class wxPyTreeCtrl : public wxTreeCtrl {
DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl);
public: public:
wxPyTreeCtrl(wxWindow *parent, wxWindowID id, wxPyTreeCtrl(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
@@ -499,7 +500,6 @@ public:
char* name) : char* name) :
wxTreeCtrl(parent, id, pos, size, style, validator, name) {} wxTreeCtrl(parent, id, pos, size, style, validator, name) {}
int OnCompareItems(const wxTreeItemId& item1, int OnCompareItems(const wxTreeItemId& item1,
const wxTreeItemId& item2) { const wxTreeItemId& item2) {
int rval = 0; int rval = 0;
@@ -517,6 +517,8 @@ public:
PYPRIVATE; PYPRIVATE;
}; };
IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl);
%} %}
// These are for the GetFirstChild/GetNextChild methods below // These are for the GetFirstChild/GetNextChild methods below

4
wxPython/src/msw/controls2.cpp
View File

@@ -164,6 +164,7 @@ public:
}; };
class wxPyTreeCtrl : public wxTreeCtrl { class wxPyTreeCtrl : public wxTreeCtrl {
DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl);
public: public:
wxPyTreeCtrl(wxWindow *parent, wxWindowID id, wxPyTreeCtrl(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
@@ -173,7 +174,6 @@ public:
char* name) : char* name) :
wxTreeCtrl(parent, id, pos, size, style, validator, name) {} wxTreeCtrl(parent, id, pos, size, style, validator, name) {}
int OnCompareItems(const wxTreeItemId& item1, int OnCompareItems(const wxTreeItemId& item1,
const wxTreeItemId& item2) { const wxTreeItemId& item2) {
int rval = 0; int rval = 0;
@@ -191,6 +191,8 @@ public:
PYPRIVATE; PYPRIVATE;
}; };
IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl);
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif