stop usign a deprecated method, and ensure that the imagelist

ownership is trnasfered when using AssignImageList.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/contrib/gizmos/gizmos.i b/wxPython/contrib/gizmos/gizmos.i
index e677f65e8c6f2946c8ee54fca6f9acf655ebe230..ba673eba1defa162c83accc69fa91ecbaf1066d5 100644 (file)
--- a/wxPython/contrib/gizmos/gizmos.i
+++ b/wxPython/contrib/gizmos/gizmos.i
@@ -553,9 +553,15 @@ public:
     void SetImageList(wxImageList *imageList);
     void SetStateImageList(wxImageList *imageList);
     void SetButtonsImageList(wxImageList *imageList);
     void SetImageList(wxImageList *imageList);
     void SetStateImageList(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"

 
 
 
 
 
 

diff --git a/wxPython/contrib/gizmos/gizmos.py b/wxPython/contrib/gizmos/gizmos.py
index 9ad14b482791584385a53e71b6c7cf6ce225ecf8..bbd10067db7a39a963ddf7ed954b2c39d766c3bb 100644 (file)
--- a/wxPython/contrib/gizmos/gizmos.py
+++ b/wxPython/contrib/gizmos/gizmos.py
@@ -375,12 +375,15 @@ class wxTreeListCtrlPtr(wxControlPtr):
         return val
     def AssignImageList(self, *_args, **_kwargs):
         val = gizmosc.wxTreeListCtrl_AssignImageList(self, *_args, **_kwargs)
         return val
     def AssignImageList(self, *_args, **_kwargs):
         val = gizmosc.wxTreeListCtrl_AssignImageList(self, *_args, **_kwargs)

+        _args[0].thisown = 0

         return val
     def AssignStateImageList(self, *_args, **_kwargs):
         val = gizmosc.wxTreeListCtrl_AssignStateImageList(self, *_args, **_kwargs)
         return val
     def AssignStateImageList(self, *_args, **_kwargs):
         val = gizmosc.wxTreeListCtrl_AssignStateImageList(self, *_args, **_kwargs)

+        _args[0].thisown = 0

         return val
     def AssignButtonsImageList(self, *_args, **_kwargs):
         val = gizmosc.wxTreeListCtrl_AssignButtonsImageList(self, *_args, **_kwargs)
         return val
     def AssignButtonsImageList(self, *_args, **_kwargs):
         val = gizmosc.wxTreeListCtrl_AssignButtonsImageList(self, *_args, **_kwargs)

+        _args[0].thisown = 0

         return val
     def AddColumn(self, *_args, **_kwargs):
         val = gizmosc.wxTreeListCtrl_AddColumn(self, *_args, **_kwargs)
         return val
     def AddColumn(self, *_args, **_kwargs):
         val = gizmosc.wxTreeListCtrl_AddColumn(self, *_args, **_kwargs)

diff --git a/wxPython/contrib/gizmos/treelistctrl.cpp b/wxPython/contrib/gizmos/treelistctrl.cpp
index a559d95415657e2d70460a08f6d4f2fd629a0981..b14bb3b96194867c08ce4816a6b3f125d6aff880 100644 (file)
--- a/wxPython/contrib/gizmos/treelistctrl.cpp
+++ b/wxPython/contrib/gizmos/treelistctrl.cpp
@@ -3540,7 +3540,7 @@ void wxTreeListMainWindow::OnChar( wxKeyEvent &event )
     // right : open if parent and go next (or expand on Win32)
     // home  : go to root
     // end   : go to last item without opening parents
     // right : open if parent and go next (or expand on Win32)
     // home  : go to root
     // end   : go to last item without opening parents

-    switch (event.KeyCode())
+    switch (event.GetKeyCode())

     {
 #ifndef __WXMSW__ // mimic the standard win32 tree ctrl
         case '+':
     {
 #ifndef __WXMSW__ // mimic the standard win32 tree ctrl
         case '+':