Applied patch [ 1204244 ] [wxMSW] Use Win2K look (MS Shell Dlg 2) if possible

[wxWidgets.git] / wxPython / src / gtk / _misc.py

diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py
index c99efbcb5369c1a3f9cbfa67126321543596f1de..06eb5a5d7c37f6ac5f6076cf30964b0d3bc4286a 100644 (file)
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -1114,7 +1114,7 @@ class Timer(_core.EvtHandler):
         """GetId(self) -> int"""
         return _misc_.Timer_GetId(*args, **kwargs)
 
         """GetId(self) -> int"""
         return _misc_.Timer_GetId(*args, **kwargs)
 

-    def Destroy():
+    def Destroy(self):

         """NO-OP: Timers must be destroyed by normal refrence counting"""
         pass
 
         """NO-OP: Timers must be destroyed by normal refrence counting"""
         pass
 


@@ -5262,6 +5262,18 @@ class DropSourcePtr(DropSource):
         self.__class__ = DropSource
 _misc_.DropSource_swigregister(DropSourcePtr)
 
         self.__class__ = DropSource
 _misc_.DropSource_swigregister(DropSourcePtr)
 

+def DROP_ICON(filename):
+    """
+    Returns either a `wx.Cursor` or `wx.Icon` created from the image file
+    ``filename``.  This function is useful with the `wx.DropSource` class
+    which, depending on platform accepts either a icon or a cursor.
+    """
+    img = wx.Image(filename)
+    if wx.Platform == '__WXGTK__':
+        return wx.IconFromBitmap(wx.BitmapFromImage(img))
+    else:
+        return wx.CursorFromImage(img)
+

 class DropTarget(object):
     """Proxy of C++ DropTarget class"""
     def __repr__(self):
 class DropTarget(object):
     """Proxy of C++ DropTarget class"""
     def __repr__(self):