Merged the wxPy_newswig branch into the HEAD branch (main trunk)

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

wxPython/wxPython/lib/mixins/imagelist.py

@@ -1,73 +1,9 @@
-#----------------------------------------------------------------------------
-# Name:        wxPython.lib.mixins.listctrl
-# Purpose:     Helpful mix-in classes for using a wxImageList
-#
-# Author:      Robin Dunn
-#
-# Created:     15-May-2001
-# RCS-ID:      $Id$
-# Copyright:   (c) 2001 by Total Control Software
-# Licence:     wxWindows license
-#----------------------------------------------------------------------------
-
-from wxPython.wx import *
-
-#----------------------------------------------------------------------------
-
-class MagicImageList:
-    '''
-    Mix-in to provide "magic" growing image lists
-    By Mike Fletcher
-    '''
-
-    ### LAZYTREE and LISTCONTROL Methods
-    DEFAULTICONSIZE = 16
-
-    def SetupIcons(self, images=(), size=None):
-        self.__size = size or self.DEFAULTICONSIZE
-        self.__magicImageList = wxImageList (self.__size,self.__size)
-        self.__magicImageListMapping = {}
-        self.SetImageList (
-            self.__magicImageList, {
-                16:wxIMAGE_LIST_SMALL,
-                32:wxIMAGE_LIST_NORMAL,
-            }[self.__size]
-        )
-        for image in images:
-            self.AddIcon (image)
-
-    def GetIcons (self, node):
-        '''Get icon indexes for a given node, or None if no associated icon'''
-        icon = self.GetIcon( node )
-        if icon:
-            index = self.AddIcon (icon)
-            return index, index
-        return None
-
-
-    ### Local methods...
-    def AddIcon(self, icon, mask = wxNullBitmap):
-        '''Add an icon to the image list, or get the index if already there'''
-        index = self.__magicImageListMapping.get (id (icon))
-        if index is None:
-            if isinstance( icon, wxIconPtr ):
-                index = self.__magicImageList.AddIcon( icon )
-            elif isinstance( icon, wxBitmapPtr ):
-                if isinstance( mask, wxColour ):
-                    index = self.__magicImageList.AddWithColourMask( icon, mask )
-                else:
-                    index = self.__magicImageList.Add( icon, mask )
-            else:
-                raise ValueError("Unexpected icon object %s, "
-                                 "expected wxIcon or wxBitmap" % (icon))
-            self.__magicImageListMapping [id (icon)] = index
-        return index
-
-    ### Customisation point...
-    def GetIcon( self, node ):
-        '''Get the actual icon object for a node'''
-        if hasattr (node,"DIAGRAMICON"):
-            return node.DIAGRAMICON
+## This file imports items from the wx package into the wxPython package for
+## backwards compatibility.  Some names will also have a 'wx' added on if
+## that is how they used to be named in the old wxPython package.
 
+import wx.lib.mixins.imagelist
 
+__doc__ =  wx.lib.mixins.imagelist.__doc__
 
+MagicImageList = wx.lib.mixins.imagelist.MagicImageList