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

stop usign a deprecated method, and ensure that the imagelist

Browse Source 
ownership is trnasfered when using AssignImageList.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-18 02:29:57 +00:00
parent 63b1cb8227
commit 15d9a04c68
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wxPython/contrib/gizmos/gizmos.i
View File

@@ -553,9 +553,15 @@ public:
void SetImageList(wxImageList *imageList); void SetImageList(wxImageList *imageList);
void SetStateImageList(wxImageList *imageList); void SetStateImageList(wxImageList *imageList);
void SetButtonsImageList(wxImageList *imageList); void SetButtonsImageList(wxImageList *imageList);
void AssignImageList(wxImageList *imageList); void AssignImageList(wxImageList *imageList);
%pragma(python) addtomethod = "AssignImageList:_args[0].thisown = 0"
void AssignStateImageList(wxImageList *imageList); void AssignStateImageList(wxImageList *imageList);
%pragma(python) addtomethod = "AssignStateImageList:_args[0].thisown = 0"
void AssignButtonsImageList(wxImageList *imageList); void AssignButtonsImageList(wxImageList *imageList);
%pragma(python) addtomethod = "AssignButtonsImageList:_args[0].thisown = 0"

3
wxPython/contrib/gizmos/gizmos.py
View File

@@ -375,12 +375,15 @@ class wxTreeListCtrlPtr(wxControlPtr):
return val return val
def AssignImageList(self, *_args, **_kwargs): def AssignImageList(self, *_args, **_kwargs):
val = gizmosc.wxTreeListCtrl_AssignImageList(self, *_args, **_kwargs) val = gizmosc.wxTreeListCtrl_AssignImageList(self, *_args, **_kwargs)
_args[0].thisown = 0
return val return val
def AssignStateImageList(self, *_args, **_kwargs): def AssignStateImageList(self, *_args, **_kwargs):
val = gizmosc.wxTreeListCtrl_AssignStateImageList(self, *_args, **_kwargs) val = gizmosc.wxTreeListCtrl_AssignStateImageList(self, *_args, **_kwargs)
_args[0].thisown = 0
return val return val
def AssignButtonsImageList(self, *_args, **_kwargs): def AssignButtonsImageList(self, *_args, **_kwargs):
val = gizmosc.wxTreeListCtrl_AssignButtonsImageList(self, *_args, **_kwargs) val = gizmosc.wxTreeListCtrl_AssignButtonsImageList(self, *_args, **_kwargs)
_args[0].thisown = 0
return val return val
def AddColumn(self, *_args, **_kwargs): def AddColumn(self, *_args, **_kwargs):
val = gizmosc.wxTreeListCtrl_AddColumn(self, *_args, **_kwargs) val = gizmosc.wxTreeListCtrl_AddColumn(self, *_args, **_kwargs)

2
wxPython/contrib/gizmos/treelistctrl.cpp
View File

@@ -3540,7 +3540,7 @@ void wxTreeListMainWindow::OnChar( wxKeyEvent &event )
// right : open if parent and go next (or expand on Win32) // right : open if parent and go next (or expand on Win32)
// home : go to root // home : go to root
// end : go to last item without opening parents // end : go to last item without opening parents
switch (event.KeyCode()) switch (event.GetKeyCode())
{ {
#ifndef __WXMSW__ // mimic the standard win32 tree ctrl #ifndef __WXMSW__ // mimic the standard win32 tree ctrl
case '+': case '+':