Applied patch [ 1407318 ] bitmap clipping / transparency mask (X11 port)

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

diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py
index 7a13e1e3785ae38d7250a9393c8fd7cb21c23596..ebb670e4075104e406b1e0414e0403c3278e06f0 100644 (file)
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -348,7 +348,7 @@ def GetOsDescription(*args, **kwargs):
     return _misc_.GetOsDescription(*args, **kwargs)
 
 def GetFreeMemory(*args, **kwargs):
-    """GetFreeMemory() -> long"""
+    """GetFreeMemory() -> wxMemorySize"""
     return _misc_.GetFreeMemory(*args, **kwargs)
 SHUTDOWN_POWEROFF = _misc_.SHUTDOWN_POWEROFF
 SHUTDOWN_REBOOT = _misc_.SHUTDOWN_REBOOT
@@ -486,14 +486,6 @@ def MessageBox(*args, **kwargs):
     """
     return _misc_.MessageBox(*args, **kwargs)
 
-def GetNumberFromUser(*args, **kwargs):
-    """
-    GetNumberFromUser(String message, String prompt, String caption, long value, 
-        long min=0, long max=100, Window parent=None, 
-        Point pos=DefaultPosition) -> long
-    """
-    return _misc_.GetNumberFromUser(*args, **kwargs)
-
 def ColourDisplay(*args, **kwargs):
     """ColourDisplay() -> bool"""
     return _misc_.ColourDisplay(*args, **kwargs)
@@ -1114,7 +1106,7 @@ class Timer(_core.EvtHandler):
         """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
 
@@ -1575,6 +1567,32 @@ class LogChainPtr(LogChain):
         self.__class__ = LogChain
 _misc_.LogChain_swigregister(LogChainPtr)
 
+class LogBuffer(Log):
+    """Proxy of C++ LogBuffer class"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxLogBuffer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(self) -> LogBuffer"""
+        newobj = _misc_.new_LogBuffer(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def GetBuffer(*args, **kwargs):
+        """GetBuffer(self) -> String"""
+        return _misc_.LogBuffer_GetBuffer(*args, **kwargs)
+
+    def Flush(*args, **kwargs):
+        """Flush(self)"""
+        return _misc_.LogBuffer_Flush(*args, **kwargs)
+
+
+class LogBufferPtr(LogBuffer):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = LogBuffer
+_misc_.LogBuffer_swigregister(LogBufferPtr)
+
 
 def SysErrorCode(*args, **kwargs):
     """SysErrorCode() -> unsigned long"""
@@ -2647,6 +2665,7 @@ ART_COPY = cvar.ART_COPY
 ART_CUT = cvar.ART_CUT
 ART_PASTE = cvar.ART_PASTE
 ART_DELETE = cvar.ART_DELETE
+ART_NEW = cvar.ART_NEW
 ART_UNDO = cvar.ART_UNDO
 ART_REDO = cvar.ART_REDO
 ART_QUIT = cvar.ART_QUIT
@@ -3654,6 +3673,22 @@ class DateTime(object):
         """MakeTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_MakeTimezone(*args, **kwargs)
 
+    def FromTimezone(*args, **kwargs):
+        """FromTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_FromTimezone(*args, **kwargs)
+
+    def MakeFromTimezone(*args, **kwargs):
+        """MakeFromTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_MakeFromTimezone(*args, **kwargs)
+
+    def ToUTC(*args, **kwargs):
+        """ToUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_ToUTC(*args, **kwargs)
+
+    def MakeUTC(*args, **kwargs):
+        """MakeUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_MakeUTC(*args, **kwargs)
+
     def ToGMT(*args, **kwargs):
         """ToGMT(self, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_ToGMT(*args, **kwargs)
@@ -3662,6 +3697,14 @@ class DateTime(object):
         """MakeGMT(self, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_MakeGMT(*args, **kwargs)
 
+    def FromUTC(*args, **kwargs):
+        """FromUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_FromUTC(*args, **kwargs)
+
+    def MakeFromUTC(*args, **kwargs):
+        """MakeFromUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_MakeFromUTC(*args, **kwargs)
+
     def IsDST(*args, **kwargs):
         """IsDST(self, int country=Country_Default) -> int"""
         return _misc_.DateTime_IsDST(*args, **kwargs)
@@ -5270,6 +5313,18 @@ class DropSourcePtr(DropSource):
         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):
@@ -5590,7 +5645,8 @@ class _wxPyDelayedInitWrapper(object):
         self._instance = None
     def _checkInstance(self):
         if self._instance is None:
-            self._instance = self._initfunc(*self._args, **self._kwargs)        
+            if wx.GetApp():
+                self._instance = self._initfunc(*self._args, **self._kwargs)        
     def __getattr__(self, name):
         self._checkInstance()
         return getattr(self._instance, name)