reSWIGged with new SWIG runtime

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

wxPython/contrib/animate/gtk/animate.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -444,3 +444,4 @@ def PreGIFAnimationCtrl(*args, **kwargs):
     return val
 
 
+

wxPython/contrib/animate/mac/animate.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -444,3 +444,4 @@ def PreGIFAnimationCtrl(*args, **kwargs):
     return val
 
 
+

wxPython/contrib/gizmos/gtk/gizmos.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -1014,3 +1014,4 @@ def PreStaticPicture(*args, **kwargs):
     return val
 
 
+

wxPython/contrib/gizmos/mac/gizmos.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -1014,3 +1014,4 @@ def PreStaticPicture(*args, **kwargs):
     return val
 
 
+

wxPython/contrib/glcanvas/gtk/glcanvas.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -181,3 +181,4 @@ def GLCanvasWithContext(*args, **kwargs):
     return val
 
 
+

wxPython/contrib/glcanvas/mac/glcanvas.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -165,3 +165,4 @@ def GLCanvasWithContext(*args, **kwargs):
     return val
 
 
+

wxPython/contrib/stc/gtk/stc.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -5060,3 +5060,4 @@ EVT_STC_HOTSPOT_DCLICK = wx.PyEventBinder( wxEVT_STC_HOTSPOT_DCLICK, 1 )
 EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
 
 
+

wxPython/contrib/stc/mac/stc.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -5060,3 +5060,4 @@ EVT_STC_HOTSPOT_DCLICK = wx.PyEventBinder( wxEVT_STC_HOTSPOT_DCLICK, 1 )
 EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
 
 
+

wxPython/src/gtk/_controls.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 import _controls_
@@ -4708,7 +4708,7 @@ class ListCtrl(_core.Control):
         return _controls_.ListCtrl_InsertItem(*args, **kwargs)
 
     def InsertStringItem(*args, **kwargs):
-        """InsertStringItem(self, long index, String label) -> long"""
+        """InsertStringItem(self, long index, String label, int imageIndex=-1) -> long"""
         return _controls_.ListCtrl_InsertStringItem(*args, **kwargs)
 
     def InsertImageItem(*args, **kwargs):
@@ -6441,3 +6441,4 @@ def PreDatePickerCtrl(*args, **kwargs):
     return val
 
 
+

wxPython/src/gtk/_core.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 import _core_
@@ -2937,6 +2937,16 @@ class Image(Object):
         """
         return _core_.Image_Replace(*args, **kwargs)
 
+    def ConvertToGreyscale(*args, **kwargs):
+        """
+        ConvertToGreyscale(self, double lr=0.299, double lg=0.587, double lb=0.114) -> Image
+
+        Convert to greyscale image. Uses the luminance component (Y) of the
+        image.  The luma value (YUV) is calculated using (R * lr) + (G * lg) + (B * lb),
+        defaults to ITU-T BT.601
+        """
+        return _core_.Image_ConvertToGreyscale(*args, **kwargs)
+
     def ConvertToMono(*args, **kwargs):
         """
         ConvertToMono(self, byte r, byte g, byte b) -> Image
@@ -13626,3 +13636,4 @@ _core_._wxPyFixStockObjects()
 #----------------------------------------------------------------------------
 
 
+

wxPython/src/gtk/_gdi.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 import _gdi_
@@ -93,13 +93,15 @@ class Colour(_core.Object):
     window colours, etc.  Valid RGB values are in the range 0 to 255.
 
     In wxPython there are typemaps that will automatically convert from a
-    colour name, or from a '#RRGGBB' colour hex value string to a
-    wx.Colour object when calling C++ methods that expect a wxColour.
-    This means that the following are all equivallent::
+    colour name, from a '#RRGGBB' colour hex value string, or from a 3
+    integer tuple to a wx.Colour object when calling C++ methods that
+    expect a wxColour.  This means that the following are all
+    equivallent::
 
         win.SetBackgroundColour(wxColour(0,0,255))
         win.SetBackgroundColour('BLUE')
         win.SetBackgroundColour('#0000FF')
+        win.SetBackgroundColour((0,0,255))
 
     Additional colour names and their coresponding values can be added
     using `wx.ColourDatabase`.  Various system colours (as set in the
@@ -4205,7 +4207,10 @@ class BufferedDC(MemoryDC):
     def __init__(self, *args):
         """
         __init__(self, DC dc, Bitmap buffer=NullBitmap, int style=BUFFER_CLIENT_AREA) -> BufferedDC
+        __init__(self, DC dc, Bitmap buffer=NullBitmap) -> BufferedDC
+        __init__(self, DC dc) -> BufferedDC
         __init__(self, DC dc, Size area, int style=BUFFER_CLIENT_AREA) -> BufferedDC
+        __init__(self, DC dc, Size area) -> BufferedDC
 
         Constructs a buffered DC.
         """
@@ -5269,3 +5274,4 @@ def RendererNative_Set(*args, **kwargs):
     return _gdi_.RendererNative_Set(*args, **kwargs)
 
 
+

wxPython/src/gtk/_misc.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 import _misc_
@@ -319,10 +319,6 @@ def GetElapsedTime(*args, **kwargs):
     """GetElapsedTime(bool resetTimer=True) -> long"""
     return _misc_.GetElapsedTime(*args, **kwargs)
 
-def GetMousePosition(*args, **kwargs):
-    """GetMousePosition() -> (x,y)"""
-    return _misc_.GetMousePosition(*args, **kwargs)
-
 def IsBusy(*args, **kwargs):
     """IsBusy() -> bool"""
     return _misc_.IsBusy(*args, **kwargs)
@@ -539,8 +535,29 @@ def BeginBusyCursor(*args, **kwargs):
     """BeginBusyCursor(Cursor cursor=wxHOURGLASS_CURSOR)"""
     return _misc_.BeginBusyCursor(*args, **kwargs)
 
+def GetMousePosition(*args, **kwargs):
+    """
+    GetMousePosition() -> Point
+
+    Get the current mouse position on the screen.
+    """
+    return _misc_.GetMousePosition(*args, **kwargs)
+
+def FindWindowAtPointer(*args, **kwargs):
+    """
+    FindWindowAtPointer() -> Window
+
+    Returns the window currently under the mouse pointer, if it belongs to
+        this application.  Otherwise it returns None.
+    """
+    return _misc_.FindWindowAtPointer(*args, **kwargs)
+
 def GetActiveWindow(*args, **kwargs):
-    """GetActiveWindow() -> Window"""
+    """
+    GetActiveWindow() -> Window
+
+    Get the currently active window of this application, or None
+    """
     return _misc_.GetActiveWindow(*args, **kwargs)
 
 def GenericFindWindowAtPoint(*args, **kwargs):
@@ -571,10 +588,144 @@ def GetKeyState(*args, **kwargs):
 
     Get the state of a key (true if pressed or toggled on, false if not.)
     This is generally most useful getting the state of the modifier or
-    toggle keys.  On some platforms those may be the only keys that work.
+    toggle keys.  On some platforms those may be the only keys that this
+    function is able to detect.
 
     """
     return _misc_.GetKeyState(*args, **kwargs)
+class MouseState(object):
+    """
+    `wx.MouseState` is used to hold information about mouse button and
+    modifier key states and is what is returned from `wx.GetMouseState`.
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMouseState instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self) -> MouseState
+
+        `wx.MouseState` is used to hold information about mouse button and
+        modifier key states and is what is returned from `wx.GetMouseState`.
+        """
+        newobj = _misc_.new_MouseState(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def __del__(self, destroy=_misc_.delete_MouseState):
+        """__del__(self)"""
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+
+    def GetX(*args, **kwargs):
+        """GetX(self) -> int"""
+        return _misc_.MouseState_GetX(*args, **kwargs)
+
+    def GetY(*args, **kwargs):
+        """GetY(self) -> int"""
+        return _misc_.MouseState_GetY(*args, **kwargs)
+
+    def LeftDown(*args, **kwargs):
+        """LeftDown(self) -> bool"""
+        return _misc_.MouseState_LeftDown(*args, **kwargs)
+
+    def MiddleDown(*args, **kwargs):
+        """MiddleDown(self) -> bool"""
+        return _misc_.MouseState_MiddleDown(*args, **kwargs)
+
+    def RightDown(*args, **kwargs):
+        """RightDown(self) -> bool"""
+        return _misc_.MouseState_RightDown(*args, **kwargs)
+
+    def ControlDown(*args, **kwargs):
+        """ControlDown(self) -> bool"""
+        return _misc_.MouseState_ControlDown(*args, **kwargs)
+
+    def ShiftDown(*args, **kwargs):
+        """ShiftDown(self) -> bool"""
+        return _misc_.MouseState_ShiftDown(*args, **kwargs)
+
+    def AltDown(*args, **kwargs):
+        """AltDown(self) -> bool"""
+        return _misc_.MouseState_AltDown(*args, **kwargs)
+
+    def MetaDown(*args, **kwargs):
+        """MetaDown(self) -> bool"""
+        return _misc_.MouseState_MetaDown(*args, **kwargs)
+
+    def CmdDown(*args, **kwargs):
+        """CmdDown(self) -> bool"""
+        return _misc_.MouseState_CmdDown(*args, **kwargs)
+
+    def SetX(*args, **kwargs):
+        """SetX(self, int x)"""
+        return _misc_.MouseState_SetX(*args, **kwargs)
+
+    def SetY(*args, **kwargs):
+        """SetY(self, int y)"""
+        return _misc_.MouseState_SetY(*args, **kwargs)
+
+    def SetLeftDown(*args, **kwargs):
+        """SetLeftDown(self, bool down)"""
+        return _misc_.MouseState_SetLeftDown(*args, **kwargs)
+
+    def SetMiddleDown(*args, **kwargs):
+        """SetMiddleDown(self, bool down)"""
+        return _misc_.MouseState_SetMiddleDown(*args, **kwargs)
+
+    def SetRightDown(*args, **kwargs):
+        """SetRightDown(self, bool down)"""
+        return _misc_.MouseState_SetRightDown(*args, **kwargs)
+
+    def SetControlDown(*args, **kwargs):
+        """SetControlDown(self, bool down)"""
+        return _misc_.MouseState_SetControlDown(*args, **kwargs)
+
+    def SetShiftDown(*args, **kwargs):
+        """SetShiftDown(self, bool down)"""
+        return _misc_.MouseState_SetShiftDown(*args, **kwargs)
+
+    def SetAltDown(*args, **kwargs):
+        """SetAltDown(self, bool down)"""
+        return _misc_.MouseState_SetAltDown(*args, **kwargs)
+
+    def SetMetaDown(*args, **kwargs):
+        """SetMetaDown(self, bool down)"""
+        return _misc_.MouseState_SetMetaDown(*args, **kwargs)
+
+    x = property(GetX, SetX)
+    y = property(GetY, SetY)
+    leftDown = property(LeftDown, SetLeftDown)
+    middleDown = property(MiddleDown, SetMiddleDown)
+    rightDown = property(RightDown, SetRightDown)
+    controlDown = property(ControlDown, SetControlDown)
+    shiftDown = property(ShiftDown, SetShiftDown)
+    altDown = property(AltDown, SetAltDown)
+    metaDown = property(MetaDown, SetMetaDown)
+    cmdDown = property(CmdDown)
+
+
+class MouseStatePtr(MouseState):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = MouseState
+_misc_.MouseState_swigregister(MouseStatePtr)
+FileSelectorPromptStr = cvar.FileSelectorPromptStr
+FileSelectorDefaultWildcardStr = cvar.FileSelectorDefaultWildcardStr
+DirSelectorPromptStr = cvar.DirSelectorPromptStr
+
+
+def GetMouseState(*args, **kwargs):
+    """
+    GetMouseState() -> MouseState
+
+    Returns the current state of the mouse.  Returns an instance of a
+    `wx.MouseState` object that contains the current position of the mouse
+    pointer in screen coordinants, as well as boolean values indicating
+    the up/down status of the mouse buttons and the modifier keys.
+    """
+    return _misc_.GetMouseState(*args, **kwargs)
 
 def WakeUpMainThread(*args, **kwargs):
     """WakeUpMainThread()"""
@@ -610,9 +761,6 @@ class MutexGuiLockerPtr(MutexGuiLocker):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = MutexGuiLocker
 _misc_.MutexGuiLocker_swigregister(MutexGuiLockerPtr)
-FileSelectorPromptStr = cvar.FileSelectorPromptStr
-FileSelectorDefaultWildcardStr = cvar.FileSelectorDefaultWildcardStr
-DirSelectorPromptStr = cvar.DirSelectorPromptStr
 
 
 def Thread_IsMain(*args, **kwargs):
@@ -1162,6 +1310,7 @@ class TimerRunner(object):
         """
         __init__(self, wxTimer timer) -> TimerRunner
         __init__(self, wxTimer timer, int milli, bool oneShot=False) -> TimerRunner
+        __init__(self, wxTimer timer, int milli) -> TimerRunner
         """
         newobj = _misc_.new_TimerRunner(*args)
         self.this = newobj.this
@@ -5177,7 +5326,7 @@ class CustomDataObjectPtr(CustomDataObject):
         self.__class__ = CustomDataObject
 _misc_.CustomDataObject_swigregister(CustomDataObjectPtr)
 
-class URLDataObject(DataObjectComposite):
+class URLDataObject(DataObject):
     """
     This data object holds a URL in a format that is compatible with some
     browsers such that it is able to be dragged to or from them.
@@ -6105,3 +6254,4 @@ def StandardPaths_Get(*args, **kwargs):
     return _misc_.StandardPaths_Get(*args, **kwargs)
 
 
+

wxPython/src/gtk/_windows.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 import _windows_
@@ -620,6 +620,7 @@ class Dialog(TopLevelWindow):
     """Proxy of C++ Dialog class"""
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    ButtonSizerFlags = _windows_.Dialog_ButtonSizerFlags
     def __init__(self, *args, **kwargs):
         """
         __init__(self, Window parent, int id=-1, String title=EmptyString, 
@@ -653,7 +654,7 @@ class Dialog(TopLevelWindow):
         return _windows_.Dialog_CreateTextSizer(*args, **kwargs)
 
     def CreateButtonSizer(*args, **kwargs):
-        """CreateButtonSizer(self, long flags) -> Sizer"""
+        """CreateButtonSizer(self, long flags, bool separated=False, int distance=0) -> Sizer"""
         return _windows_.Dialog_CreateButtonSizer(*args, **kwargs)
 
     def CreateStdDialogButtonSizer(*args, **kwargs):
@@ -2393,6 +2394,13 @@ class ColourDialogPtr(ColourDialog):
         self.__class__ = ColourDialog
 _windows_.ColourDialog_swigregister(ColourDialogPtr)
 
+
+def GetColourFromUser(*args, **kwargs):
+    """
+    GetColourFromUser(Window parent=(wxWindow *) NULL, Colour colInit=wxNullColour, 
+        String caption=EmptyString) -> Colour
+    """
+    return _windows_.GetColourFromUser(*args, **kwargs)
 class DirDialog(Dialog):
     """
     wx.DirDialog allows the user to select a directory by browising the
@@ -2996,6 +3004,10 @@ class FontDialogPtr(FontDialog):
         self.__class__ = FontDialog
 _windows_.FontDialog_swigregister(FontDialogPtr)
 
+
+def GetFontFromUser(*args, **kwargs):
+    """GetFontFromUser(Window parent=None, Font fontInit=wxNullFont, String caption=EmptyString) -> Font"""
+    return _windows_.GetFontFromUser(*args, **kwargs)
 class MessageDialog(Dialog):
     """
     This class provides a simple dialog that shows a single or multi-line
@@ -4702,6 +4714,7 @@ class PrintPreview(_core.Object):
     def __init__(self, *args):
         """
         __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PrintPreview
+        __init__(self, Printout printout, Printout printoutForPrinting) -> PrintPreview
         __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PrintPreview
         """
         newobj = _windows_.new_PrintPreview(*args)
@@ -4812,6 +4825,7 @@ class PyPrintPreview(PrintPreview):
     def __init__(self, *args):
         """
         __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PyPrintPreview
+        __init__(self, Printout printout, Printout printoutForPrinting) -> PyPrintPreview
         __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PyPrintPreview
         """
         newobj = _windows_.new_PyPrintPreview(*args)
@@ -4949,3 +4963,4 @@ class PyPreviewControlBarPtr(PyPreviewControlBar):
 _windows_.PyPreviewControlBar_swigregister(PyPreviewControlBarPtr)
 
 
+

wxPython/src/gtk/calendar.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -591,3 +591,4 @@ def _wxdate2pydate(date):
         return None
 
 
+

wxPython/src/gtk/grid.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -2436,3 +2436,4 @@ EVT_GRID_CMD_CELL_BEGIN_DRAG =     wx.PyEventBinder( wxEVT_GRID_CELL_BEGIN_DRAG,
     
 
 
+

wxPython/src/gtk/html.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -2074,3 +2074,4 @@ class HtmlModalHelpPtr(HtmlModalHelp):
 _html.HtmlModalHelp_swigregister(HtmlModalHelpPtr)
 
 
+

wxPython/src/gtk/media.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -179,7 +179,10 @@ def PreMediaCtrl(*args, **kwargs):
 
 wxEVT_MEDIA_FINISHED = _media.wxEVT_MEDIA_FINISHED
 wxEVT_MEDIA_STOP = _media.wxEVT_MEDIA_STOP
+wxEVT_MEDIA_LOADED = _media.wxEVT_MEDIA_LOADED
 EVT_MEDIA_FINISHED = wx.PyEventBinder( wxEVT_MEDIA_FINISHED, 1)
 EVT_MEDIA_STOP     = wx.PyEventBinder( wxEVT_MEDIA_STOP, 1)
+EVT_MEDIA_LOADED   = wx.PyEventBinder( wxEVT_MEDIA_LOADED, 1)    
+
 
 

wxPython/src/gtk/webkit.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -185,3 +185,4 @@ _webkit.WebKitStateChangedEvent_swigregister(WebKitStateChangedEventPtr)
 EVT_WEBKIT_STATE_CHANGED = wx.PyEventBinder(wxEVT_WEBKIT_STATE_CHANGED)
 
 
+

wxPython/src/gtk/wizard.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -368,3 +368,4 @@ def PreWizard(*args, **kwargs):
     return val
 
 
+

wxPython/src/gtk/xrc.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -738,3 +738,4 @@ XmlResource_AddSubclassFactory(XmlSubclassFactory_Python())
 #----------------------------------------------------------------------------
 
 
+

wxPython/src/mac/_controls.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 import _controls_
@@ -4695,7 +4695,7 @@ class ListCtrl(_core.Control):
         return _controls_.ListCtrl_InsertItem(*args, **kwargs)
 
     def InsertStringItem(*args, **kwargs):
-        """InsertStringItem(self, long index, String label) -> long"""
+        """InsertStringItem(self, long index, String label, int imageIndex=-1) -> long"""
         return _controls_.ListCtrl_InsertStringItem(*args, **kwargs)
 
     def InsertImageItem(*args, **kwargs):
@@ -6428,3 +6428,4 @@ def PreDatePickerCtrl(*args, **kwargs):
     return val
 
 
+

wxPython/src/mac/_core.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 import _core_
@@ -2937,6 +2937,16 @@ class Image(Object):
         """
         return _core_.Image_Replace(*args, **kwargs)
 
+    def ConvertToGreyscale(*args, **kwargs):
+        """
+        ConvertToGreyscale(self, double lr=0.299, double lg=0.587, double lb=0.114) -> Image
+
+        Convert to greyscale image. Uses the luminance component (Y) of the
+        image.  The luma value (YUV) is calculated using (R * lr) + (G * lg) + (B * lb),
+        defaults to ITU-T BT.601
+        """
+        return _core_.Image_ConvertToGreyscale(*args, **kwargs)
+
     def ConvertToMono(*args, **kwargs):
         """
         ConvertToMono(self, byte r, byte g, byte b) -> Image
@@ -7865,6 +7875,30 @@ def EventLoop_SetActive(*args, **kwargs):
     """EventLoop_SetActive(EventLoop loop)"""
     return _core_.EventLoop_SetActive(*args, **kwargs)
 
+class EventLoopActivator(object):
+    """Proxy of C++ EventLoopActivator class"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxEventLoopActivator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(self, EventLoop evtLoop) -> EventLoopActivator"""
+        newobj = _core_.new_EventLoopActivator(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def __del__(self, destroy=_core_.delete_EventLoopActivator):
+        """__del__(self)"""
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+
+
+class EventLoopActivatorPtr(EventLoopActivator):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = EventLoopActivator
+_core_.EventLoopActivator_swigregister(EventLoopActivatorPtr)
+
 #---------------------------------------------------------------------------
 
 class AcceleratorEntry(object):
@@ -10871,6 +10905,14 @@ class MenuItem(Object):
         """SetAccel(self, AcceleratorEntry accel)"""
         return _core_.MenuItem_SetAccel(*args, **kwargs)
 
+    def SetBitmap(*args, **kwargs):
+        """SetBitmap(self, Bitmap bitmap)"""
+        return _core_.MenuItem_SetBitmap(*args, **kwargs)
+
+    def GetBitmap(*args, **kwargs):
+        """GetBitmap(self) -> Bitmap"""
+        return _core_.MenuItem_GetBitmap(*args, **kwargs)
+
     def SetFont(*args, **kwargs):
         """SetFont(self, Font font)"""
         return _core_.MenuItem_SetFont(*args, **kwargs)
@@ -10932,14 +10974,6 @@ class MenuItem(Object):
         """ResetOwnerDrawn(self)"""
         return _core_.MenuItem_ResetOwnerDrawn(*args, **kwargs)
 
-    def SetBitmap(*args, **kwargs):
-        """SetBitmap(self, Bitmap bitmap)"""
-        return _core_.MenuItem_SetBitmap(*args, **kwargs)
-
-    def GetBitmap(*args, **kwargs):
-        """GetBitmap(self) -> Bitmap"""
-        return _core_.MenuItem_GetBitmap(*args, **kwargs)
-
 
 class MenuItemPtr(MenuItem):
     def __init__(self, this):
@@ -11565,6 +11599,14 @@ class SizerItem(Object):
         """
         return _core_.SizerItem_GetUserData(*args, **kwargs)
 
+    def SetUserData(*args, **kwargs):
+        """
+        SetUserData(self, PyObject userData)
+
+        Associate a Python object with this sizer item.
+        """
+        return _core_.SizerItem_SetUserData(*args, **kwargs)
+
 
 class SizerItemPtr(SizerItem):
     def __init__(self, this):
@@ -13594,3 +13636,4 @@ _core_._wxPyFixStockObjects()
 #----------------------------------------------------------------------------
 
 
+

wxPython/src/mac/_gdi.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 import _gdi_
@@ -93,13 +93,15 @@ class Colour(_core.Object):
     window colours, etc.  Valid RGB values are in the range 0 to 255.
 
     In wxPython there are typemaps that will automatically convert from a
-    colour name, or from a '#RRGGBB' colour hex value string to a
-    wx.Colour object when calling C++ methods that expect a wxColour.
-    This means that the following are all equivallent::
+    colour name, from a '#RRGGBB' colour hex value string, or from a 3
+    integer tuple to a wx.Colour object when calling C++ methods that
+    expect a wxColour.  This means that the following are all
+    equivallent::
 
         win.SetBackgroundColour(wxColour(0,0,255))
         win.SetBackgroundColour('BLUE')
         win.SetBackgroundColour('#0000FF')
+        win.SetBackgroundColour((0,0,255))
 
     Additional colour names and their coresponding values can be added
     using `wx.ColourDatabase`.  Various system colours (as set in the
@@ -4205,7 +4207,10 @@ class BufferedDC(MemoryDC):
     def __init__(self, *args):
         """
         __init__(self, DC dc, Bitmap buffer=NullBitmap, int style=BUFFER_CLIENT_AREA) -> BufferedDC
+        __init__(self, DC dc, Bitmap buffer=NullBitmap) -> BufferedDC
+        __init__(self, DC dc) -> BufferedDC
         __init__(self, DC dc, Size area, int style=BUFFER_CLIENT_AREA) -> BufferedDC
+        __init__(self, DC dc, Size area) -> BufferedDC
 
         Constructs a buffered DC.
         """
@@ -5300,3 +5305,4 @@ def RendererNative_Set(*args, **kwargs):
     return _gdi_.RendererNative_Set(*args, **kwargs)
 
 
+

wxPython/src/mac/_misc.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 import _misc_
@@ -319,10 +319,6 @@ def GetElapsedTime(*args, **kwargs):
     """GetElapsedTime(bool resetTimer=True) -> long"""
     return _misc_.GetElapsedTime(*args, **kwargs)
 
-def GetMousePosition(*args, **kwargs):
-    """GetMousePosition() -> (x,y)"""
-    return _misc_.GetMousePosition(*args, **kwargs)
-
 def IsBusy(*args, **kwargs):
     """IsBusy() -> bool"""
     return _misc_.IsBusy(*args, **kwargs)
@@ -539,8 +535,29 @@ def BeginBusyCursor(*args, **kwargs):
     """BeginBusyCursor(Cursor cursor=wxHOURGLASS_CURSOR)"""
     return _misc_.BeginBusyCursor(*args, **kwargs)
 
+def GetMousePosition(*args, **kwargs):
+    """
+    GetMousePosition() -> Point
+
+    Get the current mouse position on the screen.
+    """
+    return _misc_.GetMousePosition(*args, **kwargs)
+
+def FindWindowAtPointer(*args, **kwargs):
+    """
+    FindWindowAtPointer() -> Window
+
+    Returns the window currently under the mouse pointer, if it belongs to
+        this application.  Otherwise it returns None.
+    """
+    return _misc_.FindWindowAtPointer(*args, **kwargs)
+
 def GetActiveWindow(*args, **kwargs):
-    """GetActiveWindow() -> Window"""
+    """
+    GetActiveWindow() -> Window
+
+    Get the currently active window of this application, or None
+    """
     return _misc_.GetActiveWindow(*args, **kwargs)
 
 def GenericFindWindowAtPoint(*args, **kwargs):
@@ -571,10 +588,144 @@ def GetKeyState(*args, **kwargs):
 
     Get the state of a key (true if pressed or toggled on, false if not.)
     This is generally most useful getting the state of the modifier or
-    toggle keys.  On some platforms those may be the only keys that work.
+    toggle keys.  On some platforms those may be the only keys that this
+    function is able to detect.
 
     """
     return _misc_.GetKeyState(*args, **kwargs)
+class MouseState(object):
+    """
+    `wx.MouseState` is used to hold information about mouse button and
+    modifier key states and is what is returned from `wx.GetMouseState`.
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMouseState instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self) -> MouseState
+
+        `wx.MouseState` is used to hold information about mouse button and
+        modifier key states and is what is returned from `wx.GetMouseState`.
+        """
+        newobj = _misc_.new_MouseState(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def __del__(self, destroy=_misc_.delete_MouseState):
+        """__del__(self)"""
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+
+    def GetX(*args, **kwargs):
+        """GetX(self) -> int"""
+        return _misc_.MouseState_GetX(*args, **kwargs)
+
+    def GetY(*args, **kwargs):
+        """GetY(self) -> int"""
+        return _misc_.MouseState_GetY(*args, **kwargs)
+
+    def LeftDown(*args, **kwargs):
+        """LeftDown(self) -> bool"""
+        return _misc_.MouseState_LeftDown(*args, **kwargs)
+
+    def MiddleDown(*args, **kwargs):
+        """MiddleDown(self) -> bool"""
+        return _misc_.MouseState_MiddleDown(*args, **kwargs)
+
+    def RightDown(*args, **kwargs):
+        """RightDown(self) -> bool"""
+        return _misc_.MouseState_RightDown(*args, **kwargs)
+
+    def ControlDown(*args, **kwargs):
+        """ControlDown(self) -> bool"""
+        return _misc_.MouseState_ControlDown(*args, **kwargs)
+
+    def ShiftDown(*args, **kwargs):
+        """ShiftDown(self) -> bool"""
+        return _misc_.MouseState_ShiftDown(*args, **kwargs)
+
+    def AltDown(*args, **kwargs):
+        """AltDown(self) -> bool"""
+        return _misc_.MouseState_AltDown(*args, **kwargs)
+
+    def MetaDown(*args, **kwargs):
+        """MetaDown(self) -> bool"""
+        return _misc_.MouseState_MetaDown(*args, **kwargs)
+
+    def CmdDown(*args, **kwargs):
+        """CmdDown(self) -> bool"""
+        return _misc_.MouseState_CmdDown(*args, **kwargs)
+
+    def SetX(*args, **kwargs):
+        """SetX(self, int x)"""
+        return _misc_.MouseState_SetX(*args, **kwargs)
+
+    def SetY(*args, **kwargs):
+        """SetY(self, int y)"""
+        return _misc_.MouseState_SetY(*args, **kwargs)
+
+    def SetLeftDown(*args, **kwargs):
+        """SetLeftDown(self, bool down)"""
+        return _misc_.MouseState_SetLeftDown(*args, **kwargs)
+
+    def SetMiddleDown(*args, **kwargs):
+        """SetMiddleDown(self, bool down)"""
+        return _misc_.MouseState_SetMiddleDown(*args, **kwargs)
+
+    def SetRightDown(*args, **kwargs):
+        """SetRightDown(self, bool down)"""
+        return _misc_.MouseState_SetRightDown(*args, **kwargs)
+
+    def SetControlDown(*args, **kwargs):
+        """SetControlDown(self, bool down)"""
+        return _misc_.MouseState_SetControlDown(*args, **kwargs)
+
+    def SetShiftDown(*args, **kwargs):
+        """SetShiftDown(self, bool down)"""
+        return _misc_.MouseState_SetShiftDown(*args, **kwargs)
+
+    def SetAltDown(*args, **kwargs):
+        """SetAltDown(self, bool down)"""
+        return _misc_.MouseState_SetAltDown(*args, **kwargs)
+
+    def SetMetaDown(*args, **kwargs):
+        """SetMetaDown(self, bool down)"""
+        return _misc_.MouseState_SetMetaDown(*args, **kwargs)
+
+    x = property(GetX, SetX)
+    y = property(GetY, SetY)
+    leftDown = property(LeftDown, SetLeftDown)
+    middleDown = property(MiddleDown, SetMiddleDown)
+    rightDown = property(RightDown, SetRightDown)
+    controlDown = property(ControlDown, SetControlDown)
+    shiftDown = property(ShiftDown, SetShiftDown)
+    altDown = property(AltDown, SetAltDown)
+    metaDown = property(MetaDown, SetMetaDown)
+    cmdDown = property(CmdDown)
+
+
+class MouseStatePtr(MouseState):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = MouseState
+_misc_.MouseState_swigregister(MouseStatePtr)
+FileSelectorPromptStr = cvar.FileSelectorPromptStr
+FileSelectorDefaultWildcardStr = cvar.FileSelectorDefaultWildcardStr
+DirSelectorPromptStr = cvar.DirSelectorPromptStr
+
+
+def GetMouseState(*args, **kwargs):
+    """
+    GetMouseState() -> MouseState
+
+    Returns the current state of the mouse.  Returns an instance of a
+    `wx.MouseState` object that contains the current position of the mouse
+    pointer in screen coordinants, as well as boolean values indicating
+    the up/down status of the mouse buttons and the modifier keys.
+    """
+    return _misc_.GetMouseState(*args, **kwargs)
 
 def WakeUpMainThread(*args, **kwargs):
     """WakeUpMainThread()"""
@@ -610,9 +761,6 @@ class MutexGuiLockerPtr(MutexGuiLocker):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = MutexGuiLocker
 _misc_.MutexGuiLocker_swigregister(MutexGuiLockerPtr)
-FileSelectorPromptStr = cvar.FileSelectorPromptStr
-FileSelectorDefaultWildcardStr = cvar.FileSelectorDefaultWildcardStr
-DirSelectorPromptStr = cvar.DirSelectorPromptStr
 
 
 def Thread_IsMain(*args, **kwargs):
@@ -1162,6 +1310,7 @@ class TimerRunner(object):
         """
         __init__(self, wxTimer timer) -> TimerRunner
         __init__(self, wxTimer timer, int milli, bool oneShot=False) -> TimerRunner
+        __init__(self, wxTimer timer, int milli) -> TimerRunner
         """
         newobj = _misc_.new_TimerRunner(*args)
         self.this = newobj.this
@@ -5177,7 +5326,7 @@ class CustomDataObjectPtr(CustomDataObject):
         self.__class__ = CustomDataObject
 _misc_.CustomDataObject_swigregister(CustomDataObjectPtr)
 
-class URLDataObject(DataObjectComposite):
+class URLDataObject(DataObject):
     """
     This data object holds a URL in a format that is compatible with some
     browsers such that it is able to be dragged to or from them.
@@ -6113,3 +6262,4 @@ def StandardPaths_Get(*args, **kwargs):
     return _misc_.StandardPaths_Get(*args, **kwargs)
 
 
+

wxPython/src/mac/_windows.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 import _windows_
@@ -628,6 +628,7 @@ class Dialog(TopLevelWindow):
     """Proxy of C++ Dialog class"""
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    ButtonSizerFlags = _windows_.Dialog_ButtonSizerFlags
     def __init__(self, *args, **kwargs):
         """
         __init__(self, Window parent, int id=-1, String title=EmptyString, 
@@ -661,7 +662,7 @@ class Dialog(TopLevelWindow):
         return _windows_.Dialog_CreateTextSizer(*args, **kwargs)
 
     def CreateButtonSizer(*args, **kwargs):
-        """CreateButtonSizer(self, long flags) -> Sizer"""
+        """CreateButtonSizer(self, long flags, bool separated=False, int distance=0) -> Sizer"""
         return _windows_.Dialog_CreateButtonSizer(*args, **kwargs)
 
     def CreateStdDialogButtonSizer(*args, **kwargs):
@@ -2373,6 +2374,13 @@ class ColourDialogPtr(ColourDialog):
         self.__class__ = ColourDialog
 _windows_.ColourDialog_swigregister(ColourDialogPtr)
 
+
+def GetColourFromUser(*args, **kwargs):
+    """
+    GetColourFromUser(Window parent=(wxWindow *) NULL, Colour colInit=wxNullColour, 
+        String caption=EmptyString) -> Colour
+    """
+    return _windows_.GetColourFromUser(*args, **kwargs)
 class DirDialog(Dialog):
     """
     wx.DirDialog allows the user to select a directory by browising the
@@ -2976,6 +2984,10 @@ class FontDialogPtr(FontDialog):
         self.__class__ = FontDialog
 _windows_.FontDialog_swigregister(FontDialogPtr)
 
+
+def GetFontFromUser(*args, **kwargs):
+    """GetFontFromUser(Window parent=None, Font fontInit=wxNullFont, String caption=EmptyString) -> Font"""
+    return _windows_.GetFontFromUser(*args, **kwargs)
 class MessageDialog(Dialog):
     """
     This class provides a simple dialog that shows a single or multi-line
@@ -4682,6 +4694,7 @@ class PrintPreview(_core.Object):
     def __init__(self, *args):
         """
         __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PrintPreview
+        __init__(self, Printout printout, Printout printoutForPrinting) -> PrintPreview
         __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PrintPreview
         """
         newobj = _windows_.new_PrintPreview(*args)
@@ -4792,6 +4805,7 @@ class PyPrintPreview(PrintPreview):
     def __init__(self, *args):
         """
         __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PyPrintPreview
+        __init__(self, Printout printout, Printout printoutForPrinting) -> PyPrintPreview
         __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PyPrintPreview
         """
         newobj = _windows_.new_PyPrintPreview(*args)
@@ -4929,3 +4943,4 @@ class PyPreviewControlBarPtr(PyPreviewControlBar):
 _windows_.PyPreviewControlBar_swigregister(PyPreviewControlBarPtr)
 
 
+