From c24da6d6a664b0adf7bdbf4f3dee50a3dadf8da6 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 2 May 2004 03:13:30 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/activex/activex.py | 4 +- wxPython/contrib/gizmos/msw/gizmos.py | 2 +- wxPython/contrib/glcanvas/msw/glcanvas.py | 2 +- wxPython/contrib/iewin/iewin.py | 2 +- wxPython/contrib/ogl/msw/ogl.py | 2 +- wxPython/contrib/stc/msw/stc.py | 8 +- wxPython/contrib/xrc/msw/xrc.py | 10 +- wxPython/src/msw/_controls.py | 153 ++- wxPython/src/msw/_core.py | 507 ++++++--- wxPython/src/msw/_core_wrap.cpp | 189 +--- wxPython/src/msw/_gdi.py | 754 ++++++------- wxPython/src/msw/_gdi_wrap.cpp | 1216 ++++++++++----------- wxPython/src/msw/_misc.py | 427 +++++--- wxPython/src/msw/_windows.py | 332 ++++-- wxPython/src/msw/_windows_wrap.cpp | 51 +- wxPython/src/msw/calendar.py | 138 ++- wxPython/src/msw/grid.py | 2 +- wxPython/src/msw/html.py | 8 +- wxPython/src/msw/wizard.py | 3 +- 19 files changed, 2094 insertions(+), 1716 deletions(-) diff --git a/wxPython/contrib/activex/activex.py b/wxPython/contrib/activex/activex.py index f9a5010a0a..1573f35d7f 100644 --- a/wxPython/contrib/activex/activex.py +++ b/wxPython/contrib/activex/activex.py @@ -5,7 +5,7 @@ import _activex import _core wx = _core -__docfilter__ = wx.__docfilter__ +__docfilter__ = wx.__DocFilter(globals()) #--------------------------------------------------------------------------- class CLSID(object): @@ -361,7 +361,7 @@ class ActiveXEvent(_core.CommandEvent): ActiveX events. Any event parameters from the ActiveX cntrol are turned into attributes of the Python proxy for this event object. Additionally, there is a property called eventName that will - return (suprizingly ) the name of the ActiveX event. + return (surprisingly ) the name of the ActiveX event. """ def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): diff --git a/wxPython/contrib/gizmos/msw/gizmos.py b/wxPython/contrib/gizmos/msw/gizmos.py index 6be9719050..ee13d478f4 100644 --- a/wxPython/contrib/gizmos/msw/gizmos.py +++ b/wxPython/contrib/gizmos/msw/gizmos.py @@ -7,7 +7,7 @@ import _windows import _core import _controls wx = _core -__docfilter__ = wx.__docfilter__ +__docfilter__ = wx.__DocFilter(globals()) wxEVT_DYNAMIC_SASH_SPLIT = _gizmos.wxEVT_DYNAMIC_SASH_SPLIT wxEVT_DYNAMIC_SASH_UNIFY = _gizmos.wxEVT_DYNAMIC_SASH_UNIFY DS_MANAGE_SCROLLBARS = _gizmos.DS_MANAGE_SCROLLBARS diff --git a/wxPython/contrib/glcanvas/msw/glcanvas.py b/wxPython/contrib/glcanvas/msw/glcanvas.py index 64e8dcb779..56553faf39 100644 --- a/wxPython/contrib/glcanvas/msw/glcanvas.py +++ b/wxPython/contrib/glcanvas/msw/glcanvas.py @@ -5,7 +5,7 @@ import _glcanvas import _core wx = _core -__docfilter__ = wx.__docfilter__ +__docfilter__ = wx.__DocFilter(globals()) class GLContext(_core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxGLContext instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) diff --git a/wxPython/contrib/iewin/iewin.py b/wxPython/contrib/iewin/iewin.py index 00f1ecef3f..81ee6579bb 100644 --- a/wxPython/contrib/iewin/iewin.py +++ b/wxPython/contrib/iewin/iewin.py @@ -5,7 +5,7 @@ import _iewin import _core wx = _core -__docfilter__ = wx.__docfilter__ +__docfilter__ = wx.__DocFilter(globals()) class MSHTMLEvent(_core.NotifyEvent): def __repr__(self): return "<%s.%s; proxy of C++ wxMSHTMLEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) diff --git a/wxPython/contrib/ogl/msw/ogl.py b/wxPython/contrib/ogl/msw/ogl.py index ca2383219a..2360c8308c 100644 --- a/wxPython/contrib/ogl/msw/ogl.py +++ b/wxPython/contrib/ogl/msw/ogl.py @@ -6,7 +6,7 @@ import _ogl import _windows import _core wx = _core -__docfilter__ = wx.__docfilter__ +__docfilter__ = wx.__DocFilter(globals()) #--------------------------------------------------------------------------- class ShapeRegion(_core.Object): diff --git a/wxPython/contrib/stc/msw/stc.py b/wxPython/contrib/stc/msw/stc.py index bcd03c39f5..554c1a83ba 100644 --- a/wxPython/contrib/stc/msw/stc.py +++ b/wxPython/contrib/stc/msw/stc.py @@ -6,7 +6,7 @@ import _stc import _core import _misc wx = _core -__docfilter__ = wx.__docfilter__ +__docfilter__ = wx.__DocFilter(globals()) STC_USE_DND = _stc.STC_USE_DND STC_USE_POPUP = _stc.STC_USE_POPUP STC_INVALID_POSITION = _stc.STC_INVALID_POSITION @@ -1985,11 +1985,7 @@ class StyledTextCtrl(_core.Control): return _stc.StyledTextCtrl_DocumentEndExtend(*args, **kwargs) def PageUp(*args, **kwargs): - """ - PageUp(self) - - This is just a wrapper for ScrollPages(-1). - """ + """PageUp(self)""" return _stc.StyledTextCtrl_PageUp(*args, **kwargs) def PageUpExtend(*args, **kwargs): diff --git a/wxPython/contrib/xrc/msw/xrc.py b/wxPython/contrib/xrc/msw/xrc.py index 94510f8828..b93c81a2e6 100644 --- a/wxPython/contrib/xrc/msw/xrc.py +++ b/wxPython/contrib/xrc/msw/xrc.py @@ -5,7 +5,7 @@ import _xrc import _core wx = _core -__docfilter__ = wx.__docfilter__ +__docfilter__ = wx.__DocFilter(globals()) #--------------------------------------------------------------------------- WX_XMLRES_CURRENT_VERSION_MAJOR = _xrc.WX_XMLRES_CURRENT_VERSION_MAJOR @@ -56,7 +56,7 @@ class XmlResource(_core.Object): return _xrc.XmlResource_ClearHandlers(*args, **kwargs) def AddSubclassFactory(*args, **kwargs): - """XmlResource.AddSubclassFactory(XmlSubclassFactory factory)""" + """AddSubclassFactory(XmlSubclassFactory factory)""" return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs) AddSubclassFactory = staticmethod(AddSubclassFactory) @@ -121,7 +121,7 @@ class XmlResource(_core.Object): return _xrc.XmlResource_AttachUnknownControl(*args, **kwargs) def GetXRCID(*args, **kwargs): - """XmlResource.GetXRCID(String str_id) -> int""" + """GetXRCID(String str_id) -> int""" return _xrc.XmlResource_GetXRCID(*args, **kwargs) GetXRCID = staticmethod(GetXRCID) @@ -134,12 +134,12 @@ class XmlResource(_core.Object): return _xrc.XmlResource_CompareVersion(*args, **kwargs) def Get(*args, **kwargs): - """XmlResource.Get() -> XmlResource""" + """Get() -> XmlResource""" return _xrc.XmlResource_Get(*args, **kwargs) Get = staticmethod(Get) def Set(*args, **kwargs): - """XmlResource.Set(XmlResource res) -> XmlResource""" + """Set(XmlResource res) -> XmlResource""" return _xrc.XmlResource_Set(*args, **kwargs) Set = staticmethod(Set) diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index 1e26f25220..da43133dbc 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -5,7 +5,6 @@ import _controls_ import _core wx = _core -__docfilter__ = wx.__docfilter__ #--------------------------------------------------------------------------- BU_LEFT = _controls_.BU_LEFT @@ -19,6 +18,29 @@ class Button(_core.Control): A button is a control that contains a text string, and is one of the most common elements of a GUI. It may be placed on a dialog box or panel, or indeed almost any other window. + + Window Styles + ------------- + ============== ========================================== + wx.BU_LEFT Left-justifies the label. WIN32 only. + wx.BU_TOP Aligns the label to the top of the button. + WIN32 only. + wx.BU_RIGHT Right-justifies the bitmap label. WIN32 only. + wx.BU_BOTTOM Aligns the label to the bottom of the button. + WIN32 only. + wx.BU_EXACTFIT Creates the button as small as possible + instead of making it of the standard size + (which is the default behaviour.) + ============== ========================================== + + Events + ------ + ============ ========================================== + EVT_BUTTON Sent when the button is clicked. + ============ ========================================== + + :see: `wx.BitmapButton` + """ def __repr__(self): return "<%s.%s; proxy of C++ wxButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -55,7 +77,11 @@ class Button(_core.Control): return _controls_.Button_SetDefault(*args, **kwargs) def GetDefaultSize(*args, **kwargs): - """Button.GetDefaultSize() -> Size""" + """ + GetDefaultSize() -> Size + + Returns the default button size for this platform. + """ return _controls_.Button_GetDefaultSize(*args, **kwargs) GetDefaultSize = staticmethod(GetDefaultSize) @@ -80,16 +106,48 @@ def PreButton(*args, **kwargs): return val def Button_GetDefaultSize(*args, **kwargs): - """Button_GetDefaultSize() -> Size""" + """ + Button_GetDefaultSize() -> Size + + Returns the default button size for this platform. + """ return _controls_.Button_GetDefaultSize(*args, **kwargs) class BitmapButton(Button): """ A Button that contains a bitmap. A bitmap button can be supplied with a - single bitmap, and wxWindows will draw all button states using this bitmap. If + single bitmap, and wxWidgets will draw all button states using this bitmap. If the application needs more control, additional bitmaps for the selected state, unpressed focused state, and greyed-out state may be supplied. + Window Styles + ------------- + ============== ============================================= + wx.BU_AUTODRAW If this is specified, the button will be drawn + automatically using the label bitmap only, + providing a 3D-look border. If this style is + not specified, the button will be drawn + without borders and using all provided + bitmaps. WIN32 only. + wx.BU_LEFT Left-justifies the label. WIN32 only. + wx.BU_TOP Aligns the label to the top of the button. WIN32 + only. + wx.BU_RIGHT Right-justifies the bitmap label. WIN32 only. + wx.BU_BOTTOM Aligns the label to the bottom of the + button. WIN32 only. + wx.BU_EXACTFIT Creates the button as small as possible + instead of making it of the standard size + (which is the default behaviour.) + ============== ============================================= + + Events + ------ + =========== ================================== + EVT_BUTTON Sent when the button is clicked. + =========== ================================== + + :see: `wx.Button`, `wx.Bitmap` + """ def __repr__(self): return "<%s.%s; proxy of C++ wxBitmapButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -224,10 +282,36 @@ CHK_CHECKED = _controls_.CHK_CHECKED CHK_UNDETERMINED = _controls_.CHK_UNDETERMINED class CheckBox(_core.Control): """ - A checkbox is a labelled box which by default is either on (checkmark is - visible) or off (no checkmark). Optionally (When the wxCHK_3STATE style flag - is set) it can have a third state, called the mixed or undetermined - state. Often this is used as a "Does Not Apply" state. + A checkbox is a labelled box which by default is either on (the + checkmark is visible) or off (no checkmark). Optionally (When the + wx.CHK_3STATE style flag is set) it can have a third state, called the + mixed or undetermined state. Often this is used as a "Does Not + Apply" state. + + Window Styles + ------------- + ================================= =============================== + wx.CHK_2STATE Create a 2-state checkbox. + This is the default. + wx.CHK_3STATE Create a 3-state checkbox. + wx.CHK_ALLOW_3RD_STATE_FOR_USER By default a user can't set a + 3-state checkbox to the + third state. It can only be + done from code. Using this + flags allows the user to set + the checkbox to the third + state by clicking. + wx.ALIGN_RIGHT Makes the + text appear on the left of + the checkbox. + ================================= =============================== + + Events + ------ + =============================== =============================== + EVT_CHECKBOX Sent when checkbox is clicked. + =============================== =============================== + """ def __repr__(self): return "<%s.%s; proxy of C++ wxCheckBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -268,7 +352,8 @@ class CheckBox(_core.Control): """ IsChecked(self) -> bool - Similar to GetValue, but raises an exception if it is not a 2-state CheckBox. + Similar to GetValue, but raises an exception if it is not a 2-state + CheckBox. """ return _controls_.CheckBox_IsChecked(*args, **kwargs) @@ -276,8 +361,8 @@ class CheckBox(_core.Control): """ SetValue(self, bool state) - Set the state of a 2-state CheckBox. Pass True for checked, - False for unchecked. + Set the state of a 2-state CheckBox. Pass True for checked, False for + unchecked. """ return _controls_.CheckBox_SetValue(*args, **kwargs) @@ -285,9 +370,10 @@ class CheckBox(_core.Control): """ Get3StateValue(self) -> int - Returns wx.CHK_UNCHECKED when the CheckBox is unchecked, wx.CHK_CHECKED when - it is checked and wx.CHK_UNDETERMINED when it's in the undetermined state. - Raises an exceptiion when the function is used with a 2-state CheckBox. + Returns wx.CHK_UNCHECKED when the CheckBox is unchecked, + wx.CHK_CHECKED when it is checked and wx.CHK_UNDETERMINED when it's in + the undetermined state. Raises an exceptiion when the function is + used with a 2-state CheckBox. """ return _controls_.CheckBox_Get3StateValue(*args, **kwargs) @@ -295,11 +381,11 @@ class CheckBox(_core.Control): """ Set3StateValue(self, int state) - Sets the CheckBox to the given state. The state parameter can be - one of the following: wx.CHK_UNCHECKED (Check is off), wx.CHK_CHECKED - (Check is on) or wx.CHK_UNDETERMINED (Check is mixed). Raises an - exception when the CheckBox is a 2-state checkbox and setting the state - to wx.CHK_UNDETERMINED. + Sets the CheckBox to the given state. The state parameter can be one + of the following: wx.CHK_UNCHECKED (Check is off), wx.CHK_CHECKED (the + Check is on) or wx.CHK_UNDETERMINED (Check is mixed). Raises an + exception when the CheckBox is a 2-state checkbox and setting the + state to wx.CHK_UNDETERMINED. """ return _controls_.CheckBox_Set3StateValue(*args, **kwargs) @@ -315,7 +401,8 @@ class CheckBox(_core.Control): """ Is3rdStateAllowedForUser(self) -> bool - Returns whether or not the user can set the CheckBox to the third state. + Returns whether or not the user can set the CheckBox to the third + state. """ return _controls_.CheckBox_Is3rdStateAllowedForUser(*args, **kwargs) @@ -342,8 +429,16 @@ def PreCheckBox(*args, **kwargs): class Choice(_core.ControlWithItems): """ - A Choice control is used to select one of a list of strings. Unlike a ListBox, - only the selection is visible until the user pulls down the menu of choices. + A Choice control is used to select one of a list of strings. + Unlike a `wx.ListBox`, only the selection is visible until the + user pulls down the menu of choices. + + Events + ------ + ================ ========================================== + EVT_CHOICE Sent when an item in the list is selected. + ================ ========================================== + """ def __repr__(self): return "<%s.%s; proxy of C++ wxChoice instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -745,7 +840,7 @@ class StaticLine(_core.Control): return _controls_.StaticLine_IsVertical(*args, **kwargs) def GetDefaultSize(*args, **kwargs): - """StaticLine.GetDefaultSize() -> int""" + """GetDefaultSize() -> int""" return _controls_.StaticLine_GetDefaultSize(*args, **kwargs) GetDefaultSize = staticmethod(GetDefaultSize) @@ -967,7 +1062,7 @@ class ListBox(_core.ControlWithItems): def GetClassDefaultAttributes(*args, **kwargs): """ - ListBox.GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes Get the default attributes for this class. This is useful if you want to use the same font or colour in your own control as @@ -1249,7 +1344,7 @@ class TextAttr(object): return _controls_.TextAttr_IsDefault(*args, **kwargs) def Combine(*args, **kwargs): - """TextAttr.Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -> TextAttr""" + """Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -> TextAttr""" return _controls_.TextAttr_Combine(*args, **kwargs) Combine = staticmethod(Combine) @@ -3852,7 +3947,7 @@ class ListCtrl(_core.Control): def GetClassDefaultAttributes(*args, **kwargs): """ - ListCtrl.GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes Get the default attributes for this class. This is useful if you want to use the same font or colour in your own control as @@ -4542,7 +4637,7 @@ class TreeCtrl(_core.Control): def GetClassDefaultAttributes(*args, **kwargs): """ - TreeCtrl.GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes Get the default attributes for this class. This is useful if you want to use the same font or colour in your own control as @@ -5098,7 +5193,7 @@ class HelpProvider(object): return "<%s.%s; proxy of C++ wxHelpProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def Set(*args, **kwargs): """ - HelpProvider.Set(HelpProvider helpProvider) -> HelpProvider + Set(HelpProvider helpProvider) -> HelpProvider Sset the current, application-wide help provider. Returns the previous one. Unlike some other classes, the help provider is @@ -5110,7 +5205,7 @@ class HelpProvider(object): Set = staticmethod(Set) def Get(*args, **kwargs): """ - HelpProvider.Get() -> HelpProvider + Get() -> HelpProvider Return the current application-wide help provider. """ diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index adf89e8717..af81157e06 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -12,6 +12,26 @@ _core_._wxPySetDictionary(vars()) import sys as _sys wx = _sys.modules[__name__] + +#---------------------------------------------------------------------------- + +def _deprecated(callable, msg=None): + """ + Create a wrapper function that will raise a DeprecationWarning + before calling the callable. + """ + if msg is None: + msg = "%s is deprecated" % callable + def deprecatedWrapper(*args, **kwargs): + import warnings + warnings.warn(msg, DeprecationWarning, stacklevel=2) + return callable(*args, **kwargs) + deprecatedWrapper.__doc__ = msg + return deprecatedWrapper + + +#---------------------------------------------------------------------------- + NOT_FOUND = _core_.NOT_FOUND VSCROLL = _core_.VSCROLL HSCROLL = _core_.HSCROLL @@ -1706,17 +1726,17 @@ class FileSystem(Object): return _core_.FileSystem_FindNext(*args, **kwargs) def AddHandler(*args, **kwargs): - """FileSystem.AddHandler(CPPFileSystemHandler handler)""" + """AddHandler(CPPFileSystemHandler handler)""" return _core_.FileSystem_AddHandler(*args, **kwargs) AddHandler = staticmethod(AddHandler) def CleanUpHandlers(*args, **kwargs): - """FileSystem.CleanUpHandlers()""" + """CleanUpHandlers()""" return _core_.FileSystem_CleanUpHandlers(*args, **kwargs) CleanUpHandlers = staticmethod(CleanUpHandlers) def FileNameToURL(*args, **kwargs): - """FileSystem.FileNameToURL(String filename) -> String""" + """FileNameToURL(String filename) -> String""" return _core_.FileSystem_FileNameToURL(*args, **kwargs) FileNameToURL = staticmethod(FileNameToURL) @@ -1833,7 +1853,7 @@ class MemoryFSHandler(CPPFileSystemHandler): self.thisown = 1 del newobj.thisown def RemoveFile(*args, **kwargs): - """MemoryFSHandler.RemoveFile(String filename)""" + """RemoveFile(String filename)""" return _core_.MemoryFSHandler_RemoveFile(*args, **kwargs) RemoveFile = staticmethod(RemoveFile) @@ -1927,7 +1947,7 @@ class ImageHistogram(object): del newobj.thisown def MakeKey(*args, **kwargs): """ - ImageHistogram.MakeKey(unsigned char r, unsigned char g, unsigned char b) -> unsigned long + MakeKey(unsigned char r, unsigned char g, unsigned char b) -> unsigned long Get the key in the histogram for the given RGB values """ @@ -2042,12 +2062,12 @@ class Image(Object): return _core_.Image_SetMaskFromImage(*args, **kwargs) def CanRead(*args, **kwargs): - """Image.CanRead(String name) -> bool""" + """CanRead(String name) -> bool""" return _core_.Image_CanRead(*args, **kwargs) CanRead = staticmethod(CanRead) def GetImageCount(*args, **kwargs): - """Image.GetImageCount(String name, long type=BITMAP_TYPE_ANY) -> int""" + """GetImageCount(String name, long type=BITMAP_TYPE_ANY) -> int""" return _core_.Image_GetImageCount(*args, **kwargs) GetImageCount = staticmethod(GetImageCount) @@ -2068,7 +2088,7 @@ class Image(Object): return _core_.Image_SaveMimeFile(*args, **kwargs) def CanReadStream(*args, **kwargs): - """Image.CanReadStream(InputStream stream) -> bool""" + """CanReadStream(InputStream stream) -> bool""" return _core_.Image_CanReadStream(*args, **kwargs) CanReadStream = staticmethod(CanReadStream) @@ -2219,22 +2239,22 @@ class Image(Object): return _core_.Image_ComputeHistogram(*args, **kwargs) def AddHandler(*args, **kwargs): - """Image.AddHandler(ImageHandler handler)""" + """AddHandler(ImageHandler handler)""" return _core_.Image_AddHandler(*args, **kwargs) AddHandler = staticmethod(AddHandler) def InsertHandler(*args, **kwargs): - """Image.InsertHandler(ImageHandler handler)""" + """InsertHandler(ImageHandler handler)""" return _core_.Image_InsertHandler(*args, **kwargs) InsertHandler = staticmethod(InsertHandler) def RemoveHandler(*args, **kwargs): - """Image.RemoveHandler(String name) -> bool""" + """RemoveHandler(String name) -> bool""" return _core_.Image_RemoveHandler(*args, **kwargs) RemoveHandler = staticmethod(RemoveHandler) def GetImageExtWildcard(*args, **kwargs): - """Image.GetImageExtWildcard() -> String""" + """GetImageExtWildcard() -> String""" return _core_.Image_GetImageExtWildcard(*args, **kwargs) GetImageExtWildcard = staticmethod(GetImageExtWildcard) @@ -2273,12 +2293,9 @@ def ImageFromStreamMime(*args, **kwargs): val.thisown = 1 return val -def EmptyImage(*args): - """ - EmptyImage(int width=0, int height=0, bool clear=True) -> Image - EmptyImage(Size size, bool clear=True) -> Image - """ - val = _core_.new_EmptyImage(*args) +def EmptyImage(*args, **kwargs): + """EmptyImage(int width=0, int height=0, bool clear=True) -> Image""" + val = _core_.new_EmptyImage(*args, **kwargs) val.thisown = 1 return val @@ -2614,6 +2631,14 @@ class EvtHandler(Object): id = source.GetId() event.Bind(self, id, id2, handler) + def Unbind(self, event, source=None, id=wx.ID_ANY, id2=wx.ID_ANY): + """ + Disconencts the event handler binding for event from self. + Returns True if successful. + """ + if source is not None: + id = source.GetId() + return event.Unbind(self, id, id2) class EvtHandlerPtr(EvtHandler): @@ -2646,6 +2671,14 @@ class PyEventBinder(object): for et in self.evtType: target.Connect(id1, id2, et, function) + + def Unbind(self, target, id1, id2): + """Remove an event binding.""" + success = 0 + for et in self.evtType: + success += target.Disconnect(id1, id2, et) + return success != 0 + def __call__(self, *args): """ @@ -4033,32 +4066,32 @@ class UpdateUIEvent(CommandEvent): return _core_.UpdateUIEvent_SetText(*args, **kwargs) def SetUpdateInterval(*args, **kwargs): - """UpdateUIEvent.SetUpdateInterval(long updateInterval)""" + """SetUpdateInterval(long updateInterval)""" return _core_.UpdateUIEvent_SetUpdateInterval(*args, **kwargs) SetUpdateInterval = staticmethod(SetUpdateInterval) def GetUpdateInterval(*args, **kwargs): - """UpdateUIEvent.GetUpdateInterval() -> long""" + """GetUpdateInterval() -> long""" return _core_.UpdateUIEvent_GetUpdateInterval(*args, **kwargs) GetUpdateInterval = staticmethod(GetUpdateInterval) def CanUpdate(*args, **kwargs): - """UpdateUIEvent.CanUpdate(Window win) -> bool""" + """CanUpdate(Window win) -> bool""" return _core_.UpdateUIEvent_CanUpdate(*args, **kwargs) CanUpdate = staticmethod(CanUpdate) def ResetUpdateTime(*args, **kwargs): - """UpdateUIEvent.ResetUpdateTime()""" + """ResetUpdateTime()""" return _core_.UpdateUIEvent_ResetUpdateTime(*args, **kwargs) ResetUpdateTime = staticmethod(ResetUpdateTime) def SetMode(*args, **kwargs): - """UpdateUIEvent.SetMode(int mode)""" + """SetMode(int mode)""" return _core_.UpdateUIEvent_SetMode(*args, **kwargs) SetMode = staticmethod(SetMode) def GetMode(*args, **kwargs): - """UpdateUIEvent.GetMode() -> int""" + """GetMode() -> int""" return _core_.UpdateUIEvent_GetMode(*args, **kwargs) GetMode = staticmethod(GetMode) @@ -4345,17 +4378,17 @@ class IdleEvent(Event): return _core_.IdleEvent_MoreRequested(*args, **kwargs) def SetMode(*args, **kwargs): - """IdleEvent.SetMode(int mode)""" + """SetMode(int mode)""" return _core_.IdleEvent_SetMode(*args, **kwargs) SetMode = staticmethod(SetMode) def GetMode(*args, **kwargs): - """IdleEvent.GetMode() -> int""" + """GetMode() -> int""" return _core_.IdleEvent_GetMode(*args, **kwargs) GetMode = staticmethod(GetMode) def CanSend(*args, **kwargs): - """IdleEvent.CanSend(Window win) -> bool""" + """CanSend(Window win) -> bool""" return _core_.IdleEvent_CanSend(*args, **kwargs) CanSend = staticmethod(CanSend) @@ -4456,6 +4489,10 @@ PYAPP_ASSERT_LOG = _core_.PYAPP_ASSERT_LOG PRINT_WINDOWS = _core_.PRINT_WINDOWS PRINT_POSTSCRIPT = _core_.PRINT_POSTSCRIPT class PyApp(EvtHandler): + """ + The ``wx.PyApp`` class is an *implementation detail*, please use the + `wx.App` class (or some other derived class) instead. + """ def __repr__(self): return "<%s.%s; proxy of C++ wxPyApp instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4493,8 +4530,8 @@ class PyApp(EvtHandler): """ SetAppName(self, String name) - Set the application name. This value may be used automatically - by wx.Config and such. + Set the application name. This value may be used automatically by + `wx.Config` and such. """ return _core_.PyApp_SetAppName(*args, **kwargs) @@ -4510,8 +4547,8 @@ class PyApp(EvtHandler): """ SetClassName(self, String name) - Set the application's class name. This value may be used for X-resources if - applicable for the platform + Set the application's class name. This value may be used for + X-resources if applicable for the platform """ return _core_.PyApp_SetClassName(*args, **kwargs) @@ -4527,8 +4564,8 @@ class PyApp(EvtHandler): """ SetVendorName(self, String name) - Set the application's vendor name. This value may be used automatically - by wx.Config and such. + Set the application's vendor name. This value may be used + automatically by `wx.Config` and such. """ return _core_.PyApp_SetVendorName(*args, **kwargs) @@ -4536,11 +4573,14 @@ class PyApp(EvtHandler): """ GetTraits(self) -> wxAppTraits - Create the app traits object to which we delegate for everything which either - should be configurable by the user (then he can change the default behaviour - simply by overriding CreateTraits() and returning his own traits object) or - which is GUI/console dependent as then wx.AppTraits allows us to abstract the - differences behind the common facade + Return (and create if necessary) the app traits object to which we + delegate for everything which either should be configurable by the + user (then he can change the default behaviour simply by overriding + CreateTraits() and returning his own traits object) or which is + GUI/console dependent as then wx.AppTraits allows us to abstract the + differences behind the common facade. + + :todo: Add support for overriding CreateAppTraits in wxPython. """ return _core_.PyApp_GetTraits(*args, **kwargs) @@ -4548,9 +4588,9 @@ class PyApp(EvtHandler): """ ProcessPendingEvents(self) - Process all events in the Pending Events list -- it is necessary to call this - function to process posted events. This happens during each event loop - iteration. + Process all events in the Pending Events list -- it is necessary to + call this function to process posted events. This normally happens + during each event loop iteration. """ return _core_.PyApp_ProcessPendingEvents(*args, **kwargs) @@ -4558,15 +4598,16 @@ class PyApp(EvtHandler): """ Yield(self, bool onlyIfNeeded=False) -> bool - Process all currently pending events right now, instead of waiting until - return to the event loop. It is an error to call Yield() recursively unless - the value of onlyIfNeeded is True. + Process all currently pending events right now, instead of waiting + until return to the event loop. It is an error to call ``Yield`` + recursively unless the value of ``onlyIfNeeded`` is True. - WARNING: This function is dangerous as it can lead to unexpected - reentrancies (i.e. when called from an event handler it - may result in calling the same event handler again), use - with _extreme_ care or, better, don't use at all! + :warning: This function is dangerous as it can lead to unexpected + reentrancies (i.e. when called from an event handler it may + result in calling the same event handler again), use with + _extreme_ care or, better, don't use at all! + :see: `wx.Yield`, `wx.YieldIfNeeded`, `wx.SafeYield` """ return _core_.PyApp_Yield(*args, **kwargs) @@ -4574,7 +4615,8 @@ class PyApp(EvtHandler): """ WakeUpIdle(self) - Make sure that idle events are sent again + Make sure that idle events are sent again. + :see: `wx.WakeUpIdle` """ return _core_.PyApp_WakeUpIdle(*args, **kwargs) @@ -4582,7 +4624,8 @@ class PyApp(EvtHandler): """ MainLoop(self) -> int - Execute the main GUI loop, the function returns when the loop ends. + Execute the main GUI loop, the function doesn't normally return until + all top level windows have been closed and destroyed. """ return _core_.PyApp_MainLoop(*args, **kwargs) @@ -4591,6 +4634,7 @@ class PyApp(EvtHandler): Exit(self) Exit the main loop thus terminating the application. + :see: `wx.Exit` """ return _core_.PyApp_Exit(*args, **kwargs) @@ -4598,8 +4642,8 @@ class PyApp(EvtHandler): """ ExitMainLoop(self) - Exit the main GUI loop during the next iteration (i.e. it does not - stop the program immediately!) + Exit the main GUI loop during the next iteration of the main + loop, (i.e. it does not stop the program immediately!) """ return _core_.PyApp_ExitMainLoop(*args, **kwargs) @@ -4624,9 +4668,9 @@ class PyApp(EvtHandler): """ ProcessIdle(self) -> bool - Called from the MainLoop when the application becomes idle and sends an - IdleEvent to all interested parties. Returns True is more idle events are - needed, False if not. + Called from the MainLoop when the application becomes idle (there are + no pending events) and sends a `wx.IdleEvent` to all interested + parties. Returns True if more idle events are needed, False if not. """ return _core_.PyApp_ProcessIdle(*args, **kwargs) @@ -4634,8 +4678,8 @@ class PyApp(EvtHandler): """ SendIdleEvents(self, Window win, IdleEvent event) -> bool - Send idle event to window and all subwindows. Returns True if more idle time - is requested. + Send idle event to window and all subwindows. Returns True if more + idle time is requested. """ return _core_.PyApp_SendIdleEvents(*args, **kwargs) @@ -4651,7 +4695,7 @@ class PyApp(EvtHandler): """ SetTopWindow(self, Window win) - Set the "main" top level window + Set the *main* top level window """ return _core_.PyApp_SetTopWindow(*args, **kwargs) @@ -4659,9 +4703,9 @@ class PyApp(EvtHandler): """ GetTopWindow(self) -> Window - Return the "main" top level window (if it hadn't been set previously with - SetTopWindow(), will return just some top level window and, if there not any, - will return None) + Return the *main* top level window (if it hadn't been set previously + with SetTopWindow(), will return just some top level window and, if + there not any, will return None) """ return _core_.PyApp_GetTopWindow(*args, **kwargs) @@ -4669,12 +4713,11 @@ class PyApp(EvtHandler): """ SetExitOnFrameDelete(self, bool flag) - Control the exit behaviour: by default, the program will exit the main loop - (and so, usually, terminate) when the last top-level program window is - deleted. Beware that if you disable this behaviour (with - SetExitOnFrameDelete(False)), you'll have to call ExitMainLoop() explicitly - from somewhere. - + Control the exit behaviour: by default, the program will exit the main + loop (and so, usually, terminate) when the last top-level program + window is deleted. Beware that if you disable this behaviour (with + SetExitOnFrameDelete(False)), you'll have to call ExitMainLoop() + explicitly from somewhere. """ return _core_.PyApp_SetExitOnFrameDelete(*args, **kwargs) @@ -4690,8 +4733,8 @@ class PyApp(EvtHandler): """ SetUseBestVisual(self, bool flag) - Set whether the app should try to use the best available visual on systems - where more than one is available, (Sun, SGI, XFree86 4, etc.) + Set whether the app should try to use the best available visual on + systems where more than one is available, (Sun, SGI, XFree86 4, etc.) """ return _core_.PyApp_SetUseBestVisual(*args, **kwargs) @@ -4715,13 +4758,17 @@ class PyApp(EvtHandler): """ SetAssertMode(self, int mode) - Set the OnAssert behaviour for debug and hybrid builds. The following flags - may be or'd together: + Set the OnAssert behaviour for debug and hybrid builds. The following + flags may be or'd together: + + ========================= ======================================= + wx.PYAPP_ASSERT_SUPPRESS Don't do anything + wx.PYAPP_ASSERT_EXCEPTION Turn it into a Python exception if possible + (default) + wx.PYAPP_ASSERT_DIALOG Display a message dialog + wx.PYAPP_ASSERT_LOG Write the assertion info to the wx.Log + ========================= ======================================= - wx.PYAPP_ASSERT_SUPPRESS Don't do anything - wx.PYAPP_ASSERT_EXCEPTION Turn it into a Python exception if possible (default) - wx.PYAPP_ASSERT_DIALOG Display a message dialog - wx.PYAPP_ASSERT_LOG Write the assertion info to the wx.Log """ return _core_.PyApp_SetAssertMode(*args, **kwargs) @@ -4735,52 +4782,52 @@ class PyApp(EvtHandler): return _core_.PyApp_GetAssertMode(*args, **kwargs) def GetMacSupportPCMenuShortcuts(*args, **kwargs): - """PyApp.GetMacSupportPCMenuShortcuts() -> bool""" + """GetMacSupportPCMenuShortcuts() -> bool""" return _core_.PyApp_GetMacSupportPCMenuShortcuts(*args, **kwargs) GetMacSupportPCMenuShortcuts = staticmethod(GetMacSupportPCMenuShortcuts) def GetMacAboutMenuItemId(*args, **kwargs): - """PyApp.GetMacAboutMenuItemId() -> long""" + """GetMacAboutMenuItemId() -> long""" return _core_.PyApp_GetMacAboutMenuItemId(*args, **kwargs) GetMacAboutMenuItemId = staticmethod(GetMacAboutMenuItemId) def GetMacPreferencesMenuItemId(*args, **kwargs): - """PyApp.GetMacPreferencesMenuItemId() -> long""" + """GetMacPreferencesMenuItemId() -> long""" return _core_.PyApp_GetMacPreferencesMenuItemId(*args, **kwargs) GetMacPreferencesMenuItemId = staticmethod(GetMacPreferencesMenuItemId) def GetMacExitMenuItemId(*args, **kwargs): - """PyApp.GetMacExitMenuItemId() -> long""" + """GetMacExitMenuItemId() -> long""" return _core_.PyApp_GetMacExitMenuItemId(*args, **kwargs) GetMacExitMenuItemId = staticmethod(GetMacExitMenuItemId) def GetMacHelpMenuTitleName(*args, **kwargs): - """PyApp.GetMacHelpMenuTitleName() -> String""" + """GetMacHelpMenuTitleName() -> String""" return _core_.PyApp_GetMacHelpMenuTitleName(*args, **kwargs) GetMacHelpMenuTitleName = staticmethod(GetMacHelpMenuTitleName) def SetMacSupportPCMenuShortcuts(*args, **kwargs): - """PyApp.SetMacSupportPCMenuShortcuts(bool val)""" + """SetMacSupportPCMenuShortcuts(bool val)""" return _core_.PyApp_SetMacSupportPCMenuShortcuts(*args, **kwargs) SetMacSupportPCMenuShortcuts = staticmethod(SetMacSupportPCMenuShortcuts) def SetMacAboutMenuItemId(*args, **kwargs): - """PyApp.SetMacAboutMenuItemId(long val)""" + """SetMacAboutMenuItemId(long val)""" return _core_.PyApp_SetMacAboutMenuItemId(*args, **kwargs) SetMacAboutMenuItemId = staticmethod(SetMacAboutMenuItemId) def SetMacPreferencesMenuItemId(*args, **kwargs): - """PyApp.SetMacPreferencesMenuItemId(long val)""" + """SetMacPreferencesMenuItemId(long val)""" return _core_.PyApp_SetMacPreferencesMenuItemId(*args, **kwargs) SetMacPreferencesMenuItemId = staticmethod(SetMacPreferencesMenuItemId) def SetMacExitMenuItemId(*args, **kwargs): - """PyApp.SetMacExitMenuItemId(long val)""" + """SetMacExitMenuItemId(long val)""" return _core_.PyApp_SetMacExitMenuItemId(*args, **kwargs) SetMacExitMenuItemId = staticmethod(SetMacExitMenuItemId) def SetMacHelpMenuTitleName(*args, **kwargs): - """PyApp.SetMacHelpMenuTitleName(String val)""" + """SetMacHelpMenuTitleName(String val)""" return _core_.PyApp_SetMacHelpMenuTitleName(*args, **kwargs) SetMacHelpMenuTitleName = staticmethod(SetMacHelpMenuTitleName) @@ -4794,11 +4841,10 @@ class PyApp(EvtHandler): def GetComCtl32Version(*args, **kwargs): """ - PyApp.GetComCtl32Version() -> int + GetComCtl32Version() -> int - Returns 400, 470, 471, etc. for comctl32.dll 4.00, 4.70, 4.71 or - 0 if it wasn't found at all. Raises an exception on non-Windows - platforms. + Returns 400, 470, 471, etc. for comctl32.dll 4.00, 4.70, 4.71 or 0 if + it wasn't found at all. Raises an exception on non-Windows platforms. """ return _core_.PyApp_GetComCtl32Version(*args, **kwargs) @@ -4855,9 +4901,8 @@ def PyApp_GetComCtl32Version(*args, **kwargs): """ PyApp_GetComCtl32Version() -> int - Returns 400, 470, 471, etc. for comctl32.dll 4.00, 4.70, 4.71 or - 0 if it wasn't found at all. Raises an exception on non-Windows - platforms. + Returns 400, 470, 471, etc. for comctl32.dll 4.00, 4.70, 4.71 or 0 if + it wasn't found at all. Raises an exception on non-Windows platforms. """ return _core_.PyApp_GetComCtl32Version(*args, **kwargs) @@ -4892,12 +4937,13 @@ def SafeYield(*args, **kwargs): """ SafeYield(Window win=None, bool onlyIfNeeded=False) -> bool - This function is similar to wx.Yield, except that it disables the user input - to all program windows before calling wx.Yield and re-enables it again - afterwards. If win is not None, this window will remain enabled, allowing the - implementation of some limited user interaction. + This function is similar to `wx.Yield`, except that it disables the + user input to all program windows before calling `wx.Yield` and + re-enables it again afterwards. If ``win`` is not None, this window + will remain enabled, allowing the implementation of some limited user + interaction. - Returns the result of the call to wx.Yield. + :Returns: the result of the call to `wx.Yield`. """ return _core_.SafeYield(*args, **kwargs) @@ -4905,7 +4951,8 @@ def WakeUpIdle(*args, **kwargs): """ WakeUpIdle() - Cause the message queue to become empty again, so idle events will be sent. + Cause the message queue to become empty again, so idle events will be + sent. """ return _core_.WakeUpIdle(*args, **kwargs) @@ -4913,7 +4960,8 @@ def PostEvent(*args, **kwargs): """ PostEvent(EvtHandler dest, Event event) - Send an event to a window or other wx.EvtHandler to be processed later. + Send an event to a window or other wx.EvtHandler to be processed + later. """ return _core_.PostEvent(*args, **kwargs) @@ -4921,7 +4969,8 @@ def App_CleanUp(*args, **kwargs): """ App_CleanUp() - For internal use only, it is used to cleanup after wxWindows when Python shuts down. + For internal use only, it is used to cleanup after wxWindows when + Python shuts down. """ return _core_.App_CleanUp(*args, **kwargs) @@ -5000,12 +5049,61 @@ _defRedirect = (wx.Platform == '__WXMSW__' or wx.Platform == '__WXMAC__') class App(wx.PyApp): """ - The main application class. Derive from this and implement an OnInit - method that creates a frame and then calls self.SetTopWindow(frame) + The ``wx.App`` class represents the application and is used to: + + * bootstrap the wxPython system and initialize the underlying + gui toolkit + * set and get application-wide properties + * implement the windowing system main message or event loop, + and to dispatch events to window instances + * etc. + + Every application must have a ``wx.App`` instance, and all + creation of UI objects should be delayed until after the + ``wx.App`` object has been created in order to ensure that the gui + platform and wxWidgets have been fully initialized. + + Normally you would derive from this class and implement an + ``OnInit`` method that creates a frame and then calls + ``self.SetTopWindow(frame)``. + + :see: `wx.PySimpleApp` for a simpler app class that can be used + directly. """ + outputWindowClass = PyOnDemandOutputWindow - def __init__(self, redirect=_defRedirect, filename=None, useBestVisual=False): + def __init__(self, redirect=_defRedirect, filename=None, + useBestVisual=False, clearSigInt=True): + """ + Construct a ``wx.App`` object. + + :param redirect: Should ``sys.stdout`` and ``sys.stderr`` be + redirected? Defaults to True on Windows and Mac, False + otherwise. If `filename` is None then output will be + redirected to a window that pops up as needed. (You can + control what kind of window is created for the output by + resetting the class variable ``outputWindowClass`` to a + class of your choosing.) + + :param filename: The name of a file to redirect output to, if + redirect is True. + + :param useBestVisual: Should the app try to use the best + available visual provided by the system (only relevant on + systems that have more than one visual.) This parameter + must be used instead of calling `SetUseBestVisual` later + on because it must be set before the underlying GUI + toolkit is initialized. + + :param clearSigInt: Should SIGINT be cleared? This allows the + app to terminate upon a Ctrl-C in the console like other + GUI apps will. + + :note: You should override OnInit to do applicaition + initialization to ensure that the system, toolkit and + wxWidgets are fully initialized. + """ wx.PyApp.__init__(self) if wx.Platform == "__WXMAC__": @@ -5029,11 +5127,12 @@ your Mac.""" # KeyboardInterrupt???) but will later segfault on exit. By # setting the default handler then the app will exit, as # expected (depending on platform.) - try: - import signal - signal.signal(signal.SIGINT, signal.SIG_DFL) - except: - pass + if clearSigInt: + try: + import signal + signal.signal(signal.SIGINT, signal.SIG_DFL) + except: + pass # Save and redirect the stdio to a window? self.stdioWin = None @@ -5080,7 +5179,7 @@ your Mac.""" -# change from wxPyApp_ to wxApp_ +# change from wx.PyApp_XX to wx.App_XX App_GetMacSupportPCMenuShortcuts = _core_.PyApp_GetMacSupportPCMenuShortcuts App_GetMacAboutMenuItemId = _core_.PyApp_GetMacAboutMenuItemId App_GetMacPreferencesMenuItemId = _core_.PyApp_GetMacPreferencesMenuItemId @@ -5099,16 +5198,29 @@ class PySimpleApp(wx.App): """ A simple application class. You can just create one of these and then then make your top level windows later, and not have to worry - about OnInit.""" + about OnInit. For example:: - def __init__(self, redirect=False, filename=None, useBestVisual=False): - wx.App.__init__(self, redirect, filename, useBestVisual) + app = wx.PySimpleApp() + frame = wx.Frame(None, title='Hello World') + frame.Show() + app.MainLoop() + + :see: `wx.App` + """ + + def __init__(self, redirect=False, filename=None, + useBestVisual=False, clearSigInt=True): + """ + :see: `wx.App.__init__` + """ + wx.App.__init__(self, redirect, filename, useBestVisual, clearSigInt) def OnInit(self): wx.InitAllImageHandlers() return True + # Is anybody using this one? class PyWidgetTester(wx.App): def __init__(self, size = (250, 100)): @@ -5120,15 +5232,15 @@ class PyWidgetTester(wx.App): self.SetTopWindow(self.frame) return True - def SetWidget(self, widgetClass, *args): - w = widgetClass(self.frame, *args) + def SetWidget(self, widgetClass, *args, **kwargs): + w = widgetClass(self.frame, *args, **kwargs) self.frame.Show(True) #---------------------------------------------------------------------------- # DO NOT hold any other references to this object. This is how we -# know when to cleanup system resources that wxWin is holding. When +# know when to cleanup system resources that wxWidgets is holding. When # the sys module is unloaded, the refcount on sys.__wxPythonCleanup -# goes to zero and it calls the wxApp_CleanUp function. +# goes to zero and it calls the wx.App_CleanUp function. class __wxPyCleanup: def __init__(self): @@ -5139,11 +5251,8 @@ class __wxPyCleanup: _sys.__wxPythonCleanup = __wxPyCleanup() ## # another possible solution, but it gets called too early... -## if sys.version[0] == '2': -## import atexit -## atexit.register(_core_.wxApp_CleanUp) -## else: -## sys.exitfunc = _core_.wxApp_CleanUp +## import atexit +## atexit.register(_core_.wxApp_CleanUp) #---------------------------------------------------------------------------- @@ -5151,10 +5260,30 @@ _sys.__wxPythonCleanup = __wxPyCleanup() #--------------------------------------------------------------------------- class AcceleratorEntry(object): + """ + A class used to define items in an `wx.AcceleratorTable`. wxPython + programs can choose to use wx.AcceleratorEntry objects, but using a + list of 3-tuple of integers (flags, keyCode, cmdID) usually works just + as well. See `__init__` for details of the tuple values. + + :see: `wx.AcceleratorTable` + """ def __repr__(self): return "<%s.%s; proxy of C++ wxAcceleratorEntry instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(self, int flags=0, int keyCode=0, int cmd=0, MenuItem item=None) -> AcceleratorEntry""" + """ + __init__(self, int flags=0, int keyCode=0, int cmdID=0) -> AcceleratorEntry + + Construct a wx.AcceleratorEntry. + + :param flags: A bitmask of wx.ACCEL_ALT, wx.ACCEL_SHIFT, + wx.ACCEL_CTRL or wx.ACCEL_NORMAL used to specify + which modifier keys are held down. + :param keyCode: The keycode to be detected + :param cmdID: The menu or control command ID to use for the + accellerator event. + + """ newobj = _core_.new_AcceleratorEntry(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -5166,27 +5295,36 @@ class AcceleratorEntry(object): except: pass def Set(*args, **kwargs): - """Set(self, int flags, int keyCode, int cmd, MenuItem item=None)""" - return _core_.AcceleratorEntry_Set(*args, **kwargs) - - def SetMenuItem(*args, **kwargs): - """SetMenuItem(self, MenuItem item)""" - return _core_.AcceleratorEntry_SetMenuItem(*args, **kwargs) + """ + Set(self, int flags, int keyCode, int cmd) - def GetMenuItem(*args, **kwargs): - """GetMenuItem(self) -> MenuItem""" - return _core_.AcceleratorEntry_GetMenuItem(*args, **kwargs) + (Re)set the attributes of a wx.AcceleratorEntry. + :see `__init__` + """ + return _core_.AcceleratorEntry_Set(*args, **kwargs) def GetFlags(*args, **kwargs): - """GetFlags(self) -> int""" + """ + GetFlags(self) -> int + + Get the AcceleratorEntry's flags. + """ return _core_.AcceleratorEntry_GetFlags(*args, **kwargs) def GetKeyCode(*args, **kwargs): - """GetKeyCode(self) -> int""" + """ + GetKeyCode(self) -> int + + Get the AcceleratorEntry's keycode. + """ return _core_.AcceleratorEntry_GetKeyCode(*args, **kwargs) def GetCommand(*args, **kwargs): - """GetCommand(self) -> int""" + """ + GetCommand(self) -> int + + Get the AcceleratorEntry's command ID. + """ return _core_.AcceleratorEntry_GetCommand(*args, **kwargs) @@ -5198,14 +5336,43 @@ class AcceleratorEntryPtr(AcceleratorEntry): _core_.AcceleratorEntry_swigregister(AcceleratorEntryPtr) class AcceleratorTable(Object): + """ + An accelerator table allows the application to specify a table of + keyboard shortcuts for menus or other commands. On Windows, menu or + button commands are supported; on GTK, only menu commands are + supported. + + The object ``wx.NullAcceleratorTable`` is defined to be a table with + no data, and is the initial accelerator table for a window. + + An accelerator takes precedence over normal processing and can be a + convenient way to program some event handling. For example, you can + use an accelerator table to make a hotkey generate an event no matter + which window within a frame has the focus. + + Foe example:: + + aTable = wx.AcceleratorTable([(wx.ACCEL_ALT, ord('X'), exitID), + (wx.ACCEL_CTRL, ord('H'), helpID), + (wx.ACCEL_CTRL, ord('F'), findID), + (wx.ACCEL_NORMAL, wx.WXK_F3, findnextID) + ]) + self.SetAcceleratorTable(aTable) + + + :see: `wx.AcceleratorEntry`, `wx.Window.SetAcceleratorTable` + + """ def __repr__(self): return "<%s.%s; proxy of C++ wxAcceleratorTable instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ __init__(entries) -> AcceleratorTable - Construct an AcceleratorTable from a list of AcceleratorEntry items or - 3-tuples (flags, keyCode, cmdID) + Construct an AcceleratorTable from a list of `wx.AcceleratorEntry` + items or or of 3-tuples (flags, keyCode, cmdID) + + :see: `wx.AcceleratorEntry` """ newobj = _core_.new_AcceleratorTable(*args, **kwargs) self.this = newobj.this @@ -5466,7 +5633,7 @@ class Window(EvtHandler): def NewControlId(*args, **kwargs): """ - Window.NewControlId() -> int + NewControlId() -> int Generate a control id for the controls which were not given one. """ @@ -5475,7 +5642,7 @@ class Window(EvtHandler): NewControlId = staticmethod(NewControlId) def NextControlId(*args, **kwargs): """ - Window.NextControlId(int winid) -> int + NextControlId(int winid) -> int Get the id of the control following the one with the given (autogenerated) id @@ -5485,7 +5652,7 @@ class Window(EvtHandler): NextControlId = staticmethod(NextControlId) def PrevControlId(*args, **kwargs): """ - Window.PrevControlId(int winid) -> int + PrevControlId(int winid) -> int Get the id of the control preceding the one with the given (autogenerated) id @@ -6041,7 +6208,7 @@ class Window(EvtHandler): def FindFocus(*args, **kwargs): """ - Window.FindFocus() -> Window + FindFocus() -> Window Returns the window or control that currently has the keyboard focus, or None. @@ -6437,7 +6604,7 @@ class Window(EvtHandler): def GetCapture(*args, **kwargs): """ - Window.GetCapture() -> Window + GetCapture() -> Window Returns the window which currently captures the mouse or None """ @@ -6596,7 +6763,7 @@ class Window(EvtHandler): def GetClassDefaultAttributes(*args, **kwargs): """ - Window.GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes Get the default attributes for this class. This is useful if you want to use the same font or colour in your own control as @@ -7439,12 +7606,12 @@ class Validator(EvtHandler): return _core_.Validator_SetWindow(*args, **kwargs) def IsSilent(*args, **kwargs): - """Validator.IsSilent() -> bool""" + """IsSilent() -> bool""" return _core_.Validator_IsSilent(*args, **kwargs) IsSilent = staticmethod(IsSilent) def SetBellOnError(*args, **kwargs): - """Validator.SetBellOnError(int doIt=True)""" + """SetBellOnError(int doIt=True)""" return _core_.Validator_SetBellOnError(*args, **kwargs) SetBellOnError = staticmethod(SetBellOnError) @@ -7907,7 +8074,7 @@ class MenuItem(Object): return _core_.MenuItem_GetText(*args, **kwargs) def GetLabelFromText(*args, **kwargs): - """MenuItem.GetLabelFromText(String text) -> String""" + """GetLabelFromText(String text) -> String""" return _core_.MenuItem_GetLabelFromText(*args, **kwargs) GetLabelFromText = staticmethod(GetLabelFromText) @@ -8020,7 +8187,7 @@ class MenuItem(Object): return _core_.MenuItem_GetMarginWidth(*args, **kwargs) def GetDefaultMarginWidth(*args, **kwargs): - """MenuItem.GetDefaultMarginWidth() -> int""" + """GetDefaultMarginWidth() -> int""" return _core_.MenuItem_GetDefaultMarginWidth(*args, **kwargs) GetDefaultMarginWidth = staticmethod(GetDefaultMarginWidth) @@ -8123,7 +8290,7 @@ class Control(Window): def GetClassDefaultAttributes(*args, **kwargs): """ - Control.GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes Get the default attributes for this class. This is useful if you want to use the same font or colour in your own control as @@ -8575,16 +8742,30 @@ class Sizer(Object): return _core_.Sizer_PrependItem(*args, **kwargs) def AddMany(self, widgets): + """ + AddMany is a convenience method for adding several items + to a sizer at one time. Simply pass it a list of tuples, + where each tuple consists of the parameters that you + would normally pass to the `Add` method. + """ for childinfo in widgets: if type(childinfo) != type(()) or (len(childinfo) == 2 and type(childinfo[0]) == type(1)): childinfo = (childinfo, ) self.Add(*childinfo) # for backwards compatibility only, please do not use in new code - AddWindow = AddSizer = AddSpacer = Add - PrependWindow = PrependSizer = PrependSpacer = Prepend - InsertWindow = InsertSizer = InsertSpacer = Insert - RemoveWindow = RemoveSizer = RemovePos = Remove + AddWindow = wx._deprecated(Add, "AddWindow is deprecated, use `Add` instead.") + AddSizer = wx._deprecated(Add, "AddSizer is deprecated, use `Add` instead.") + AddSpacer = wx._deprecated(Add, "AddSpacer is deprecated, use `Add` instead.") + PrependWindow = wx._deprecated(Prepend, "PrependWindow is deprecated, use `Prepend` instead.") + PrependSizer = wx._deprecated(Prepend, "PrependSizer is deprecated, use `Prepend` instead.") + PrependSpacer = wx._deprecated(Prepend, "PrependSpacer is deprecated, use `Prepend` instead.") + InsertWindow = wx._deprecated(Insert, "InsertWindow is deprecated, use `Insert` instead.") + InsertSizer = wx._deprecated(Insert, "InsertSizer is deprecated, use `Insert` instead.") + InsertSpacer = wx._deprecated(Insert, "InsertSpacer is deprecated, use `Insert` instead.") + RemoveWindow = wx._deprecated(Remove, "RemoveWindow is deprecated, use `Remove` instead.") + RemoveSizer = wx._deprecated(Remove, "RemoveSizer is deprecated, use `Remove` instead.") + RemovePos = wx._deprecated(Remove, "RemovePos is deprecated, use `Remove` instead.") def SetItemMinSize(self, item, *args): @@ -9741,14 +9922,22 @@ class FutureCall: # documented (or will be) as part of the classes/functions/methods # where they should be used. -def __docfilter__(name): - import types - obj = globals().get(name, None) - if type(obj) not in [type, types.ClassType, types.FunctionType, types.BuiltinFunctionType]: - return False - if name.startswith('_') or name.endswith('Ptr') or name.startswith('EVT'): - return False - return True +class __DocFilter: + """ + A filter for epydoc that only allows non-Ptr classes and + fucntions, in order to reduce the clutter in the API docs. + """ + def __init__(self, globals): + self._globals = globals + + def __call__(self, name): + import types + obj = self._globals.get(name, None) + if type(obj) not in [type, types.ClassType, types.FunctionType, types.BuiltinFunctionType]: + return False + if name.startswith('_') or name.endswith('Ptr') or name.startswith('EVT'): + return False + return True #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index 0c1cf2cb23..86aa5774bc 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -1094,15 +1094,12 @@ SWIG_CheckUnsignedChar(PyObject* obj) } } -wxImage *new_wxImage__SWIG_0(int width,int height,bool clear){ +wxImage *new_wxImage(int width,int height,bool clear){ if (width > 0 && height > 0) return new wxImage(width, height, clear); else return new wxImage; } -wxImage *new_wxImage__SWIG_1(wxSize const &size,bool clear){ - return new wxImage(size.x, size.y, clear); - } wxImage *new_wxImage(wxBitmap const &bitmap){ return new wxImage(bitmap.ConvertToImage()); } @@ -1664,21 +1661,27 @@ PyObject *wxSizer_GetChildren(wxSizer *self){ return wxPy_ConvertList(&list); } void wxSizer_Show(wxSizer *self,PyObject *item,bool show){ + bool blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False); + wxPyEndBlockThreads(blocked); if ( info.window ) self->Show(info.window, show); else if ( info.sizer ) self->Show(info.sizer, show); } void wxSizer_Hide(wxSizer *self,PyObject *item){ + bool blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False); + wxPyEndBlockThreads(blocked); if ( info.window ) self->Hide(info.window); else if ( info.sizer ) self->Hide(info.sizer); } bool wxSizer_IsShown(wxSizer *self,PyObject *item){ + bool blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False); + wxPyEndBlockThreads(blocked); if ( info.window ) return self->IsShown(info.window); else if ( info.sizer ) @@ -8790,7 +8793,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P } -static PyObject *_wrap_new_EmptyImage__SWIG_0(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 = (int) 0 ; int arg2 = (int) 0 ; @@ -8799,8 +8802,11 @@ static PyObject *_wrap_new_EmptyImage__SWIG_0(PyObject *self, PyObject *args) { PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "width",(char *) "height",(char *) "clear", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"|OOO:new_EmptyImage",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_EmptyImage",kwnames,&obj0,&obj1,&obj2)) goto fail; if (obj0) { arg1 = (int) SWIG_AsInt(obj0); if (PyErr_Occurred()) SWIG_fail; @@ -8815,39 +8821,7 @@ static PyObject *_wrap_new_EmptyImage__SWIG_0(PyObject *self, PyObject *args) { } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxImage *)new_wxImage__SWIG_0(arg1,arg2,arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_EmptyImage__SWIG_1(PyObject *self, PyObject *args) { - PyObject *resultobj; - wxSize *arg1 = 0 ; - bool arg2 = (bool) True ; - wxImage *result; - wxSize temp1 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O|O:new_EmptyImage",&obj0,&obj1)) goto fail; - { - arg1 = &temp1; - if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail; - } - if (obj1) { - arg2 = (bool) SWIG_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxImage *)new_wxImage__SWIG_1((wxSize const &)*arg1,arg2); + result = (wxImage *)new_wxImage(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8859,58 +8833,6 @@ static PyObject *_wrap_new_EmptyImage__SWIG_1(PyObject *self, PyObject *args) { } -static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[4]; - int ii; - - argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 3); ii++) { - argv[ii] = PyTuple_GetItem(args,ii); - } - if ((argc >= 0) && (argc <= 3)) { - int _v; - if (argc <= 0) { - return _wrap_new_EmptyImage__SWIG_0(self,args); - } - _v = SWIG_CheckInt(argv[0]); - if (_v) { - if (argc <= 1) { - return _wrap_new_EmptyImage__SWIG_0(self,args); - } - _v = SWIG_CheckInt(argv[1]); - if (_v) { - if (argc <= 2) { - return _wrap_new_EmptyImage__SWIG_0(self,args); - } - _v = SWIG_CheckBool(argv[2]); - if (_v) { - return _wrap_new_EmptyImage__SWIG_0(self,args); - } - } - } - } - if ((argc >= 1) && (argc <= 2)) { - int _v; - { - _v = wxPySimple_typecheck(argv[0], wxT("wxSize"), 2); - } - if (_v) { - if (argc <= 1) { - return _wrap_new_EmptyImage__SWIG_1(self,args); - } - _v = SWIG_CheckBool(argv[1]); - if (_v) { - return _wrap_new_EmptyImage__SWIG_1(self,args); - } - } - } - - PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_EmptyImage'"); - return NULL; -} - - static PyObject *_wrap_new_ImageFromBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBitmap *arg1 = 0 ; @@ -20859,17 +20781,15 @@ static PyObject *_wrap_new_AcceleratorEntry(PyObject *self, PyObject *args, PyOb int arg1 = (int) 0 ; int arg2 = (int) 0 ; int arg3 = (int) 0 ; - wxMenuItem *arg4 = (wxMenuItem *) NULL ; wxAcceleratorEntry *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL + (char *) "flags",(char *) "keyCode",(char *) "cmdID", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_AcceleratorEntry",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_AcceleratorEntry",kwnames,&obj0,&obj1,&obj2)) goto fail; if (obj0) { arg1 = (int) SWIG_AsInt(obj0); if (PyErr_Occurred()) SWIG_fail; @@ -20882,13 +20802,9 @@ static PyObject *_wrap_new_AcceleratorEntry(PyObject *self, PyObject *args, PyOb arg3 = (int) SWIG_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } - if (obj3) { - if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxMenuItem, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxAcceleratorEntry *)new wxAcceleratorEntry(arg1,arg2,arg3,arg4); + result = (wxAcceleratorEntry *)new wxAcceleratorEntry(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20931,17 +20847,15 @@ static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyOb int arg2 ; int arg3 ; int arg4 ; - wxMenuItem *arg5 = (wxMenuItem *) NULL ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL + (char *) "self",(char *) "flags",(char *) "keyCode",(char *) "cmd", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:AcceleratorEntry_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AcceleratorEntry_Set",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorEntry, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -20950,13 +20864,9 @@ static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; arg4 = (int) SWIG_AsInt(obj3); if (PyErr_Occurred()) SWIG_fail; - if (obj4) { - if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_wxMenuItem, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Set(arg2,arg3,arg4,arg5); + (arg1)->Set(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20968,63 +20878,6 @@ static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyOb } -static PyObject *_wrap_AcceleratorEntry_SetMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; - wxMenuItem *arg2 = (wxMenuItem *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "item", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AcceleratorEntry_SetMenuItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorEntry, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenuItem, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetMenuItem(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_AcceleratorEntry_GetMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; - wxMenuItem *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetMenuItem",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorEntry, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMenuItem *)((wxAcceleratorEntry const *)arg1)->GetMenuItem(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = wxPyMake_wxObject(result); - } - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; @@ -40998,7 +40851,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_ImageFromMime", (PyCFunction) _wrap_new_ImageFromMime, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_ImageFromStream", (PyCFunction) _wrap_new_ImageFromStream, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_ImageFromStreamMime", (PyCFunction) _wrap_new_ImageFromStreamMime, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_EmptyImage", _wrap_new_EmptyImage, METH_VARARGS }, + { (char *)"new_EmptyImage", (PyCFunction) _wrap_new_EmptyImage, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_ImageFromBitmap", (PyCFunction) _wrap_new_ImageFromBitmap, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_ImageFromData", (PyCFunction) _wrap_new_ImageFromData, METH_VARARGS | METH_KEYWORDS }, { (char *)"Image_Create", (PyCFunction) _wrap_Image_Create, METH_VARARGS | METH_KEYWORDS }, @@ -41445,8 +41298,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_AcceleratorEntry", (PyCFunction) _wrap_new_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_AcceleratorEntry", (PyCFunction) _wrap_delete_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS }, { (char *)"AcceleratorEntry_Set", (PyCFunction) _wrap_AcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"AcceleratorEntry_SetMenuItem", (PyCFunction) _wrap_AcceleratorEntry_SetMenuItem, METH_VARARGS | METH_KEYWORDS }, - { (char *)"AcceleratorEntry_GetMenuItem", (PyCFunction) _wrap_AcceleratorEntry_GetMenuItem, METH_VARARGS | METH_KEYWORDS }, { (char *)"AcceleratorEntry_GetFlags", (PyCFunction) _wrap_AcceleratorEntry_GetFlags, METH_VARARGS | METH_KEYWORDS }, { (char *)"AcceleratorEntry_GetKeyCode", (PyCFunction) _wrap_AcceleratorEntry_GetKeyCode, METH_VARARGS | METH_KEYWORDS }, { (char *)"AcceleratorEntry_GetCommand", (PyCFunction) _wrap_AcceleratorEntry_GetCommand, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py index e519f5399b..20917d52bf 100644 --- a/wxPython/src/msw/_gdi.py +++ b/wxPython/src/msw/_gdi.py @@ -5,7 +5,6 @@ import _gdi_ import _core wx = _core -__docfilter__ = wx.__docfilter__ #--------------------------------------------------------------------------- class GDIObject(_core.Object): @@ -324,13 +323,15 @@ class Pen(GDIObject): """GetDashes(self) -> PyObject""" return _gdi_.Pen_GetDashes(*args, **kwargs) - def __eq__(*args, **kwargs): - """__eq__(self, Pen other) -> bool""" - return _gdi_.Pen___eq__(*args, **kwargs) + def _SetDashes(*args, **kwargs): + """_SetDashes(self, PyObject _self, PyObject pyDashes)""" + return _gdi_.Pen__SetDashes(*args, **kwargs) - def __ne__(*args, **kwargs): - """__ne__(self, Pen other) -> bool""" - return _gdi_.Pen___ne__(*args, **kwargs) + def SetDashes(self, dashes): + """ + Associate a list of dash lengths with the Pen. + """ + self._SetDashes(self, dashes) def GetDashCount(*args, **kwargs): """GetDashCount(self) -> int""" @@ -344,6 +345,14 @@ class Pen(GDIObject): """SetStipple(self, Bitmap stipple)""" return _gdi_.Pen_SetStipple(*args, **kwargs) + def __eq__(*args, **kwargs): + """__eq__(self, Pen other) -> bool""" + return _gdi_.Pen___eq__(*args, **kwargs) + + def __ne__(*args, **kwargs): + """__ne__(self, Pen other) -> bool""" + return _gdi_.Pen___ne__(*args, **kwargs) + def __nonzero__(self): return self.Ok() class PenPtr(Pen): @@ -353,40 +362,25 @@ class PenPtr(Pen): self.__class__ = Pen _gdi_.Pen_swigregister(PenPtr) -class PyPen(Pen): - def __repr__(self): - return "<%s.%s; proxy of C++ wxPyPen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args, **kwargs): - """__init__(self, Colour colour, int width=1, int style=SOLID) -> PyPen""" - newobj = _gdi_.new_PyPen(*args, **kwargs) - self.this = newobj.this - self.thisown = 1 - del newobj.thisown - def __del__(self, destroy=_gdi_.delete_PyPen): - """__del__(self)""" - try: - if self.thisown: destroy(self) - except: pass +#--------------------------------------------------------------------------- - def SetDashes(*args, **kwargs): - """SetDashes(self, int dashes, wxDash dashes_array)""" - return _gdi_.PyPen_SetDashes(*args, **kwargs) +class Brush(GDIObject): + """ + A brush is a drawing tool for filling in areas. It is used for + painting the background of rectangles, ellipses, etc. when drawing on + a `wx.DC`. It has a colour and a style. + :warning: Do not create instances of wx.Brush before the `wx.App` + object has been created because, depending on the platform, + required internal data structures may not have been initialized + yet. Instead create your brushes in the app's OnInit or as they + are needed for drawing. -class PyPenPtr(PyPen): - def __init__(self, this): - self.this = this - if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = PyPen -_gdi_.PyPen_swigregister(PyPenPtr) + :note: On monochrome displays all brushes are white, unless the colour + really is black. -Pen = PyPen -#--------------------------------------------------------------------------- + :see: `wx.BrushList`, `wx.DC`, `wx.DC.SetBrush` -class Brush(GDIObject): - """ - A brush is a drawing tool for filling in areas. It is used for painting the - background of rectangles, ellipses, etc. It has a colour and a style. """ def __repr__(self): return "<%s.%s; proxy of C++ wxBrush instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -394,7 +388,24 @@ class Brush(GDIObject): """ __init__(self, Colour colour, int style=SOLID) -> Brush - Constructs a brush from a colour object and style. + Constructs a brush from a `wx.Colour` object and a style. The style + parameter may be one of the following: + + =================== ============================= + Style Meaning + =================== ============================= + wx.TRANSPARENT Transparent (no fill). + wx.SOLID Solid. + wx.STIPPLE Uses a bitmap as a stipple. + wx.BDIAGONAL_HATCH Backward diagonal hatch. + wx.CROSSDIAG_HATCH Cross-diagonal hatch. + wx.FDIAGONAL_HATCH Forward diagonal hatch. + wx.CROSS_HATCH Cross hatch. + wx.HORIZONTAL_HATCH Horizontal hatch. + wx.VERTICAL_HATCH Vertical hatch. + =================== ============================= + + """ newobj = _gdi_.new_Brush(*args, **kwargs) self.this = newobj.this @@ -407,31 +418,62 @@ class Brush(GDIObject): except: pass def SetColour(*args, **kwargs): - """SetColour(self, Colour col)""" + """ + SetColour(self, Colour col) + + Set the brush's `wx.Colour`. + """ return _gdi_.Brush_SetColour(*args, **kwargs) def SetStyle(*args, **kwargs): - """SetStyle(self, int style)""" + """ + SetStyle(self, int style) + + Sets the style of the brush. See `__init__` for a listing of styles. + """ return _gdi_.Brush_SetStyle(*args, **kwargs) def SetStipple(*args, **kwargs): - """SetStipple(self, Bitmap stipple)""" + """ + SetStipple(self, Bitmap stipple) + + Sets the stipple `wx.Bitmap`. + """ return _gdi_.Brush_SetStipple(*args, **kwargs) def GetColour(*args, **kwargs): - """GetColour(self) -> Colour""" + """ + GetColour(self) -> Colour + + Returns the `wx.Colour` of the brush. + """ return _gdi_.Brush_GetColour(*args, **kwargs) def GetStyle(*args, **kwargs): - """GetStyle(self) -> int""" + """ + GetStyle(self) -> int + + Returns the style of the brush. See `__init__` for a listing of + styles. + """ return _gdi_.Brush_GetStyle(*args, **kwargs) def GetStipple(*args, **kwargs): - """GetStipple(self) -> Bitmap""" + """ + GetStipple(self) -> Bitmap + + Returns the stiple `wx.Bitmap` of the brush. If the brush does not + have a wx.STIPPLE style, then the return value may be non-None but an + uninitialised bitmap (`wx.Bitmap.Ok` returns False). + """ return _gdi_.Brush_GetStipple(*args, **kwargs) def Ok(*args, **kwargs): - """Ok(self) -> bool""" + """ + Ok(self) -> bool + + Returns True if the brush is initialised and valid. + """ return _gdi_.Brush_Ok(*args, **kwargs) def __nonzero__(self): return self.Ok() @@ -444,6 +486,27 @@ class BrushPtr(Brush): _gdi_.Brush_swigregister(BrushPtr) class Bitmap(GDIObject): + """ + The wx.Bitmap class encapsulates the concept of a platform-dependent + bitmap. It can be either monochrome or colour, and either loaded from + a file or created dynamically. A bitmap can be selected into a memory + device context (instance of `wx.MemoryDC`). This enables the bitmap to + be copied to a window or memory device context using `wx.DC.Blit`, or + to be used as a drawing surface. + + The BMP and XMP image file formats are supported on all platforms by + wx.Bitmap. Other formats are automatically loaded by `wx.Image` and + converted to a wx.Bitmap, so any image file format supported by + `wx.Image` can be used. + + :todo: Add wrappers and support for raw bitmap data access. Can this + be be put into Python without losing the speed benefits of the + teplates and iterators in rawbmp.h? + + :todo: Find a way to do very efficient PIL Image <--> wx.Bitmap + converstions. + + """ def __repr__(self): return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -451,6 +514,33 @@ class Bitmap(GDIObject): __init__(self, String name, int type=BITMAP_TYPE_ANY) -> Bitmap Loads a bitmap from a file. + + :param name: Name of the file to load the bitmap from. + :param type: The type of image to expect. Can be one of the following + constants (assuming that the neccessary `wx.Image` handlers are + loaded): + + * wx.BITMAP_TYPE_ANY + * wx.BITMAP_TYPE_BMP + * wx.BITMAP_TYPE_ICO + * wx.BITMAP_TYPE_CUR + * wx.BITMAP_TYPE_XBM + * wx.BITMAP_TYPE_XPM + * wx.BITMAP_TYPE_TIF + * wx.BITMAP_TYPE_GIF + * wx.BITMAP_TYPE_PNG + * wx.BITMAP_TYPE_JPEG + * wx.BITMAP_TYPE_PNM + * wx.BITMAP_TYPE_PCX + * wx.BITMAP_TYPE_PICT + * wx.BITMAP_TYPE_ICON + * wx.BITMAP_TYPE_ANI + * wx.BITMAP_TYPE_IFF + + :see: Alternate constructors `wx.EmptyBitmap`, `wx.BitmapFromIcon`, + `wx.BitmapFromImage`, `wx.BitmapFromXPMData`, + `wx.BitmapFromBits` + """ newobj = _gdi_.new_Bitmap(*args, **kwargs) self.this = newobj.this @@ -515,9 +605,9 @@ class Bitmap(GDIObject): """ ConvertToImage(self) -> Image - Creates a platform-independent image from a platform-dependent bitmap. This - preserves mask information so that bitmaps and images can be converted back - and forth without loss in that respect. + Creates a platform-independent image from a platform-dependent + bitmap. This preserves mask information so that bitmaps and images can + be converted back and forth without loss in that respect. """ return _gdi_.Bitmap_ConvertToImage(*args, **kwargs) @@ -525,8 +615,11 @@ class Bitmap(GDIObject): """ GetMask(self) -> Mask - Gets the associated mask (if any) which may have been loaded from a file - or explpicitly set for the bitmap. + Gets the associated mask (if any) which may have been loaded from a + file or explpicitly set for the bitmap. + + :see: `SetMask`, `wx.Mask` + """ return _gdi_.Bitmap_GetMask(*args, **kwargs) @@ -535,6 +628,9 @@ class Bitmap(GDIObject): SetMask(self, Mask mask) Sets the mask for this bitmap. + + :see: `GetMask`, `wx.Mask` + """ return _gdi_.Bitmap_SetMask(*args, **kwargs) @@ -550,16 +646,18 @@ class Bitmap(GDIObject): """ GetSubBitmap(self, Rect rect) -> Bitmap - Returns a sub bitmap of the current one as long as the rect belongs entirely - to the bitmap. This function preserves bit depth and mask information. + Returns a sub-bitmap of the current one as long as the rect belongs + entirely to the bitmap. This function preserves bit depth and mask + information. """ return _gdi_.Bitmap_GetSubBitmap(*args, **kwargs) def SaveFile(*args, **kwargs): """ - SaveFile(self, String name, int type, Palette palette=(wxPalette *) NULL) -> bool + SaveFile(self, String name, int type, Palette palette=None) -> bool - Saves a bitmap in the named file. + Saves a bitmap in the named file. See `__init__` for a description of + the ``type`` parameter. """ return _gdi_.Bitmap_SaveFile(*args, **kwargs) @@ -567,7 +665,8 @@ class Bitmap(GDIObject): """ LoadFile(self, String name, int type) -> bool - Loads a bitmap from a file + Loads a bitmap from a file. See `__init__` for a description of the + ``type`` parameter. """ return _gdi_.Bitmap_LoadFile(*args, **kwargs) @@ -579,7 +678,7 @@ class Bitmap(GDIObject): """ SetHeight(self, int height) - Set the height property (does not affect the bitmap data). + Set the height property (does not affect the existing bitmap data). """ return _gdi_.Bitmap_SetHeight(*args, **kwargs) @@ -587,7 +686,7 @@ class Bitmap(GDIObject): """ SetWidth(self, int width) - Set the width property (does not affect the bitmap data). + Set the width property (does not affect the existing bitmap data). """ return _gdi_.Bitmap_SetWidth(*args, **kwargs) @@ -595,7 +694,7 @@ class Bitmap(GDIObject): """ SetDepth(self, int depth) - Set the depth property (does not affect the bitmap data). + Set the depth property (does not affect the existing bitmap data). """ return _gdi_.Bitmap_SetDepth(*args, **kwargs) @@ -603,7 +702,7 @@ class Bitmap(GDIObject): """ SetSize(self, Size size) - Set the bitmap size + Set the bitmap size (does not affect the existing bitmap data). """ return _gdi_.Bitmap_SetSize(*args, **kwargs) @@ -636,11 +735,23 @@ class BitmapPtr(Bitmap): self.__class__ = Bitmap _gdi_.Bitmap_swigregister(BitmapPtr) +def EmptyBitmap(*args, **kwargs): + """ + EmptyBitmap(int width, int height, int depth=-1) -> Bitmap + + Creates a new bitmap of the given size. A depth of -1 indicates the + depth of the current screen or visual. Some platforms only support 1 + for monochrome and -1 for the current colour setting. + """ + val = _gdi_.new_EmptyBitmap(*args, **kwargs) + val.thisown = 1 + return val + def BitmapFromIcon(*args, **kwargs): """ BitmapFromIcon(Icon icon) -> Bitmap - Create a new bitmap from an Icon object. + Create a new bitmap from a `wx.Icon` object. """ val = _gdi_.new_BitmapFromIcon(*args, **kwargs) val.thisown = 1 @@ -650,10 +761,11 @@ def BitmapFromImage(*args, **kwargs): """ BitmapFromImage(Image image, int depth=-1) -> Bitmap - Creates bitmap object from the image. This has to be done to actually display - an image as you cannot draw an image directly on a window. The resulting - bitmap will use the provided colour depth (or that of the current system if - depth is -1) which entails that a colour reduction has to take place. + Creates bitmap object from a `wx.Image`. This has to be done to + actually display a `wx.Image` as you cannot draw an image directly on + a window. The resulting bitmap will use the provided colour depth (or + that of the current screen colour depth if depth is -1) which entails + that a colour reduction may have to take place. """ val = _gdi_.new_BitmapFromImage(*args, **kwargs) val.thisown = 1 @@ -673,34 +785,27 @@ def BitmapFromBits(*args, **kwargs): """ BitmapFromBits(PyObject bits, int width, int height, int depth=1) -> Bitmap - Creates a bitmap from an array of bits. You should only use this function for - monochrome bitmaps (depth 1) in portable programs: in this case the bits - parameter should contain an XBM image. For other bit depths, the behaviour is - platform dependent. + Creates a bitmap from an array of bits. You should only use this + function for monochrome bitmaps (depth 1) in portable programs: in + this case the bits parameter should contain an XBM image. For other + bit depths, the behaviour is platform dependent. """ val = _gdi_.new_BitmapFromBits(*args, **kwargs) val.thisown = 1 return val -def EmptyBitmap(*args): +class Mask(_core.Object): """ - EmptyBitmap(int width, int height, int depth=-1) -> Bitmap - EmptyBitmap(Size size, int depth=-1) -> Bitmap + This class encapsulates a monochrome mask bitmap, where the masked + area is black and the unmasked area is white. When associated with a + bitmap and drawn in a device context, the unmasked area of the bitmap + will be drawn, and the masked area will not be drawn. - Creates a new bitmap of the given size. A depth of -1 indicates - the depth of the current screen or visual. Some platforms only - support 1 for monochrome and -1 for the current colour setting. - """ - val = _gdi_.new_EmptyBitmap(*args) - val.thisown = 1 - return val + A mask may be associated with a `wx.Bitmap`. It is used in + `wx.DC.DrawBitmap` or `wx.DC.Blit` when the source device context is a + `wx.MemoryDC` with a `wx.Bitmap` selected into it that contains a + mask. -class Mask(_core.Object): - """ - This class encapsulates a monochrome mask bitmap, where the masked area is - black and the unmasked area is white. When associated with a bitmap and drawn - in a device context, the unmasked area of the bitmap will be drawn, and the - masked area will not be drawn. """ def __repr__(self): return "<%s.%s; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -708,8 +813,13 @@ class Mask(_core.Object): """ __init__(self, Bitmap bitmap, Colour colour=NullColour) -> Mask - Constructs a mask from a bitmap and a colour in that bitmap that indicates - the transparent portions of the mask, by default BLACK is used. + Constructs a mask from a `wx.Bitmap` and a `wx.Colour` in that bitmap + that indicates the transparent portions of the mask. In other words, + the pixels in ``bitmap`` that match ``colour`` will be the transparent + portions of the mask. If no ``colour`` or an invalid ``colour`` is + passed then BLACK is used. + + :see: `wx.Bitmap`, `wx.Colour` """ newobj = _gdi_.new_Mask(*args, **kwargs) self.this = newobj.this @@ -723,7 +833,7 @@ class MaskPtr(Mask): self.__class__ = Mask _gdi_.Mask_swigregister(MaskPtr) -MaskColour = Mask +MaskColour = wx._deprecated(Mask, "wx.MaskColour is deprecated, use `wx.Mask` instead.") class Icon(GDIObject): def __repr__(self): return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -1523,12 +1633,12 @@ class FontMapper(object): except: pass def Get(*args, **kwargs): - """FontMapper.Get() -> FontMapper""" + """Get() -> FontMapper""" return _gdi_.FontMapper_Get(*args, **kwargs) Get = staticmethod(Get) def Set(*args, **kwargs): - """FontMapper.Set(FontMapper mapper) -> FontMapper""" + """Set(FontMapper mapper) -> FontMapper""" return _gdi_.FontMapper_Set(*args, **kwargs) Set = staticmethod(Set) @@ -1537,27 +1647,27 @@ class FontMapper(object): return _gdi_.FontMapper_CharsetToEncoding(*args, **kwargs) def GetSupportedEncodingsCount(*args, **kwargs): - """FontMapper.GetSupportedEncodingsCount() -> size_t""" + """GetSupportedEncodingsCount() -> size_t""" return _gdi_.FontMapper_GetSupportedEncodingsCount(*args, **kwargs) GetSupportedEncodingsCount = staticmethod(GetSupportedEncodingsCount) def GetEncoding(*args, **kwargs): - """FontMapper.GetEncoding(size_t n) -> int""" + """GetEncoding(size_t n) -> int""" return _gdi_.FontMapper_GetEncoding(*args, **kwargs) GetEncoding = staticmethod(GetEncoding) def GetEncodingName(*args, **kwargs): - """FontMapper.GetEncodingName(int encoding) -> String""" + """GetEncodingName(int encoding) -> String""" return _gdi_.FontMapper_GetEncodingName(*args, **kwargs) GetEncodingName = staticmethod(GetEncodingName) def GetEncodingDescription(*args, **kwargs): - """FontMapper.GetEncodingDescription(int encoding) -> String""" + """GetEncodingDescription(int encoding) -> String""" return _gdi_.FontMapper_GetEncodingDescription(*args, **kwargs) GetEncodingDescription = staticmethod(GetEncodingDescription) def GetEncodingFromName(*args, **kwargs): - """FontMapper.GetEncodingFromName(String name) -> int""" + """GetEncodingFromName(String name) -> int""" return _gdi_.FontMapper_GetEncodingFromName(*args, **kwargs) GetEncodingFromName = staticmethod(GetEncodingFromName) @@ -1570,7 +1680,7 @@ class FontMapper(object): return _gdi_.FontMapper_SetConfigPath(*args, **kwargs) def GetDefaultConfigPath(*args, **kwargs): - """FontMapper.GetDefaultConfigPath() -> String""" + """GetDefaultConfigPath() -> String""" return _gdi_.FontMapper_GetDefaultConfigPath(*args, **kwargs) GetDefaultConfigPath = staticmethod(GetDefaultConfigPath) @@ -1769,12 +1879,12 @@ class Font(GDIObject): return _gdi_.Font_GetNoAntiAliasing(*args, **kwargs) def GetDefaultEncoding(*args, **kwargs): - """Font.GetDefaultEncoding() -> int""" + """GetDefaultEncoding() -> int""" return _gdi_.Font_GetDefaultEncoding(*args, **kwargs) GetDefaultEncoding = staticmethod(GetDefaultEncoding) def SetDefaultEncoding(*args, **kwargs): - """Font.SetDefaultEncoding(int encoding)""" + """SetDefaultEncoding(int encoding)""" return _gdi_.Font_SetDefaultEncoding(*args, **kwargs) SetDefaultEncoding = staticmethod(SetDefaultEncoding) @@ -2153,17 +2263,17 @@ class Locale(object): return val def GetSystemLanguage(*args, **kwargs): - """Locale.GetSystemLanguage() -> int""" + """GetSystemLanguage() -> int""" return _gdi_.Locale_GetSystemLanguage(*args, **kwargs) GetSystemLanguage = staticmethod(GetSystemLanguage) def GetSystemEncoding(*args, **kwargs): - """Locale.GetSystemEncoding() -> int""" + """GetSystemEncoding() -> int""" return _gdi_.Locale_GetSystemEncoding(*args, **kwargs) GetSystemEncoding = staticmethod(GetSystemEncoding) def GetSystemEncodingName(*args, **kwargs): - """Locale.GetSystemEncodingName() -> String""" + """GetSystemEncodingName() -> String""" return _gdi_.Locale_GetSystemEncodingName(*args, **kwargs) GetSystemEncodingName = staticmethod(GetSystemEncodingName) @@ -2189,7 +2299,7 @@ class Locale(object): return _gdi_.Locale_GetCanonicalName(*args, **kwargs) def AddCatalogLookupPathPrefix(*args, **kwargs): - """Locale.AddCatalogLookupPathPrefix(String prefix)""" + """AddCatalogLookupPathPrefix(String prefix)""" return _gdi_.Locale_AddCatalogLookupPathPrefix(*args, **kwargs) AddCatalogLookupPathPrefix = staticmethod(AddCatalogLookupPathPrefix) @@ -2202,22 +2312,22 @@ class Locale(object): return _gdi_.Locale_IsLoaded(*args, **kwargs) def GetLanguageInfo(*args, **kwargs): - """Locale.GetLanguageInfo(int lang) -> LanguageInfo""" + """GetLanguageInfo(int lang) -> LanguageInfo""" return _gdi_.Locale_GetLanguageInfo(*args, **kwargs) GetLanguageInfo = staticmethod(GetLanguageInfo) def GetLanguageName(*args, **kwargs): - """Locale.GetLanguageName(int lang) -> String""" + """GetLanguageName(int lang) -> String""" return _gdi_.Locale_GetLanguageName(*args, **kwargs) GetLanguageName = staticmethod(GetLanguageName) def FindLanguageInfo(*args, **kwargs): - """Locale.FindLanguageInfo(String locale) -> LanguageInfo""" + """FindLanguageInfo(String locale) -> LanguageInfo""" return _gdi_.Locale_FindLanguageInfo(*args, **kwargs) FindLanguageInfo = staticmethod(FindLanguageInfo) def AddLanguage(*args, **kwargs): - """Locale.AddLanguage(LanguageInfo info)""" + """AddLanguage(LanguageInfo info)""" return _gdi_.Locale_AddLanguage(*args, **kwargs) AddLanguage = staticmethod(AddLanguage) @@ -2306,17 +2416,17 @@ class EncodingConverter(_core.Object): return _gdi_.EncodingConverter_Convert(*args, **kwargs) def GetPlatformEquivalents(*args, **kwargs): - """EncodingConverter.GetPlatformEquivalents(int enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray""" + """GetPlatformEquivalents(int enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray""" return _gdi_.EncodingConverter_GetPlatformEquivalents(*args, **kwargs) GetPlatformEquivalents = staticmethod(GetPlatformEquivalents) def GetAllEquivalents(*args, **kwargs): - """EncodingConverter.GetAllEquivalents(int enc) -> wxFontEncodingArray""" + """GetAllEquivalents(int enc) -> wxFontEncodingArray""" return _gdi_.EncodingConverter_GetAllEquivalents(*args, **kwargs) GetAllEquivalents = staticmethod(GetAllEquivalents) def CanConvert(*args, **kwargs): - """EncodingConverter.CanConvert(int encIn, int encOut) -> bool""" + """CanConvert(int encIn, int encOut) -> bool""" return _gdi_.EncodingConverter_CanConvert(*args, **kwargs) CanConvert = staticmethod(CanConvert) @@ -2388,160 +2498,176 @@ class DC(_core.Object): """EndDrawing(self)""" return _gdi_.DC_EndDrawing(*args, **kwargs) - def FloodFillXY(*args, **kwargs): - """FloodFillXY(self, int x, int y, Colour col, int style=FLOOD_SURFACE) -> bool""" - return _gdi_.DC_FloodFillXY(*args, **kwargs) - def FloodFill(*args, **kwargs): - """FloodFill(self, Point pt, Colour col, int style=FLOOD_SURFACE) -> bool""" + """FloodFill(self, int x, int y, Colour col, int style=FLOOD_SURFACE) -> bool""" return _gdi_.DC_FloodFill(*args, **kwargs) - def GetPixelXY(*args, **kwargs): - """GetPixelXY(self, int x, int y) -> Colour""" - return _gdi_.DC_GetPixelXY(*args, **kwargs) + def FloodFillPoint(*args, **kwargs): + """FloodFillPoint(self, Point pt, Colour col, int style=FLOOD_SURFACE) -> bool""" + return _gdi_.DC_FloodFillPoint(*args, **kwargs) def GetPixel(*args, **kwargs): - """GetPixel(self, Point pt) -> Colour""" + """GetPixel(self, int x, int y) -> Colour""" return _gdi_.DC_GetPixel(*args, **kwargs) - def DrawLineXY(*args, **kwargs): - """DrawLineXY(self, int x1, int y1, int x2, int y2)""" - return _gdi_.DC_DrawLineXY(*args, **kwargs) + def GetPixelPoint(*args, **kwargs): + """GetPixelPoint(self, Point pt) -> Colour""" + return _gdi_.DC_GetPixelPoint(*args, **kwargs) def DrawLine(*args, **kwargs): - """DrawLine(self, Point pt1, Point pt2)""" + """DrawLine(self, int x1, int y1, int x2, int y2)""" return _gdi_.DC_DrawLine(*args, **kwargs) - def CrossHairXY(*args, **kwargs): - """CrossHairXY(self, int x, int y)""" - return _gdi_.DC_CrossHairXY(*args, **kwargs) + def DrawLinePoint(*args, **kwargs): + """DrawLinePoint(self, Point pt1, Point pt2)""" + return _gdi_.DC_DrawLinePoint(*args, **kwargs) def CrossHair(*args, **kwargs): - """CrossHair(self, Point pt)""" + """CrossHair(self, int x, int y)""" return _gdi_.DC_CrossHair(*args, **kwargs) - def DrawArcXY(*args, **kwargs): - """DrawArcXY(self, int x1, int y1, int x2, int y2, int xc, int yc)""" - return _gdi_.DC_DrawArcXY(*args, **kwargs) + def CrossHairPoint(*args, **kwargs): + """CrossHairPoint(self, Point pt)""" + return _gdi_.DC_CrossHairPoint(*args, **kwargs) def DrawArc(*args, **kwargs): - """DrawArc(self, Point pt1, Point pt2, Point centre)""" + """DrawArc(self, int x1, int y1, int x2, int y2, int xc, int yc)""" return _gdi_.DC_DrawArc(*args, **kwargs) - def DrawCheckMarkXY(*args, **kwargs): - """DrawCheckMarkXY(self, int x, int y, int width, int height)""" - return _gdi_.DC_DrawCheckMarkXY(*args, **kwargs) + def DrawArcPoint(*args, **kwargs): + """DrawArcPoint(self, Point pt1, Point pt2, Point centre)""" + return _gdi_.DC_DrawArcPoint(*args, **kwargs) def DrawCheckMark(*args, **kwargs): - """DrawCheckMark(self, Rect rect)""" + """DrawCheckMark(self, int x, int y, int width, int height)""" return _gdi_.DC_DrawCheckMark(*args, **kwargs) - def DrawEllipticArcXY(*args, **kwargs): - """DrawEllipticArcXY(self, int x, int y, int w, int h, double sa, double ea)""" - return _gdi_.DC_DrawEllipticArcXY(*args, **kwargs) + def DrawCheckMarkRect(*args, **kwargs): + """DrawCheckMarkRect(self, Rect rect)""" + return _gdi_.DC_DrawCheckMarkRect(*args, **kwargs) def DrawEllipticArc(*args, **kwargs): - """DrawEllipticArc(self, Point pt, Size sz, double sa, double ea)""" + """DrawEllipticArc(self, int x, int y, int w, int h, double sa, double ea)""" return _gdi_.DC_DrawEllipticArc(*args, **kwargs) - def DrawPointXY(*args, **kwargs): - """DrawPointXY(self, int x, int y)""" - return _gdi_.DC_DrawPointXY(*args, **kwargs) + def DrawEllipticArcPointSize(*args, **kwargs): + """DrawEllipticArcPointSize(self, Point pt, Size sz, double sa, double ea)""" + return _gdi_.DC_DrawEllipticArcPointSize(*args, **kwargs) def DrawPoint(*args, **kwargs): - """DrawPoint(self, Point pt)""" + """DrawPoint(self, int x, int y)""" return _gdi_.DC_DrawPoint(*args, **kwargs) - def DrawRectangleXY(*args, **kwargs): - """DrawRectangleXY(self, int x, int y, int width, int height)""" - return _gdi_.DC_DrawRectangleXY(*args, **kwargs) + def DrawPointPoint(*args, **kwargs): + """DrawPointPoint(self, Point pt)""" + return _gdi_.DC_DrawPointPoint(*args, **kwargs) def DrawRectangle(*args, **kwargs): - """DrawRectangle(self, Point pt, Size sz)""" + """DrawRectangle(self, int x, int y, int width, int height)""" return _gdi_.DC_DrawRectangle(*args, **kwargs) def DrawRectangleRect(*args, **kwargs): """DrawRectangleRect(self, Rect rect)""" return _gdi_.DC_DrawRectangleRect(*args, **kwargs) - def DrawRoundedRectangleXY(*args, **kwargs): - """DrawRoundedRectangleXY(self, int x, int y, int width, int height, double radius)""" - return _gdi_.DC_DrawRoundedRectangleXY(*args, **kwargs) + def DrawRectanglePointSize(*args, **kwargs): + """DrawRectanglePointSize(self, Point pt, Size sz)""" + return _gdi_.DC_DrawRectanglePointSize(*args, **kwargs) def DrawRoundedRectangle(*args, **kwargs): - """DrawRoundedRectangle(self, Point pt, Size sz, double radius)""" + """DrawRoundedRectangle(self, int x, int y, int width, int height, double radius)""" return _gdi_.DC_DrawRoundedRectangle(*args, **kwargs) def DrawRoundedRectangleRect(*args, **kwargs): """DrawRoundedRectangleRect(self, Rect r, double radius)""" return _gdi_.DC_DrawRoundedRectangleRect(*args, **kwargs) - def DrawCircleXY(*args, **kwargs): - """DrawCircleXY(self, int x, int y, int radius)""" - return _gdi_.DC_DrawCircleXY(*args, **kwargs) + def DrawRoundedRectanglePointSize(*args, **kwargs): + """DrawRoundedRectanglePointSize(self, Point pt, Size sz, double radius)""" + return _gdi_.DC_DrawRoundedRectanglePointSize(*args, **kwargs) def DrawCircle(*args, **kwargs): - """DrawCircle(self, Point pt, int radius)""" + """DrawCircle(self, int x, int y, int radius)""" return _gdi_.DC_DrawCircle(*args, **kwargs) - def DrawEllipseXY(*args, **kwargs): - """DrawEllipseXY(self, int x, int y, int width, int height)""" - return _gdi_.DC_DrawEllipseXY(*args, **kwargs) + def DrawCirclePoint(*args, **kwargs): + """DrawCirclePoint(self, Point pt, int radius)""" + return _gdi_.DC_DrawCirclePoint(*args, **kwargs) def DrawEllipse(*args, **kwargs): - """DrawEllipse(self, Point pt, Size sz)""" + """DrawEllipse(self, int x, int y, int width, int height)""" return _gdi_.DC_DrawEllipse(*args, **kwargs) def DrawEllipseRect(*args, **kwargs): """DrawEllipseRect(self, Rect rect)""" return _gdi_.DC_DrawEllipseRect(*args, **kwargs) - def DrawIconXY(*args, **kwargs): - """DrawIconXY(self, Icon icon, int x, int y)""" - return _gdi_.DC_DrawIconXY(*args, **kwargs) + def DrawEllipsePointSize(*args, **kwargs): + """DrawEllipsePointSize(self, Point pt, Size sz)""" + return _gdi_.DC_DrawEllipsePointSize(*args, **kwargs) def DrawIcon(*args, **kwargs): - """DrawIcon(self, Icon icon, Point pt)""" + """DrawIcon(self, Icon icon, int x, int y)""" return _gdi_.DC_DrawIcon(*args, **kwargs) - def DrawBitmapXY(*args, **kwargs): - """DrawBitmapXY(self, Bitmap bmp, int x, int y, bool useMask=False)""" - return _gdi_.DC_DrawBitmapXY(*args, **kwargs) + def DrawIconPoint(*args, **kwargs): + """DrawIconPoint(self, Icon icon, Point pt)""" + return _gdi_.DC_DrawIconPoint(*args, **kwargs) def DrawBitmap(*args, **kwargs): - """DrawBitmap(self, Bitmap bmp, Point pt, bool useMask=False)""" + """DrawBitmap(self, Bitmap bmp, int x, int y, bool useMask=False)""" return _gdi_.DC_DrawBitmap(*args, **kwargs) - def DrawTextXY(*args, **kwargs): - """DrawTextXY(self, String text, int x, int y)""" - return _gdi_.DC_DrawTextXY(*args, **kwargs) + def DrawBitmapPoint(*args, **kwargs): + """DrawBitmapPoint(self, Bitmap bmp, Point pt, bool useMask=False)""" + return _gdi_.DC_DrawBitmapPoint(*args, **kwargs) def DrawText(*args, **kwargs): - """DrawText(self, String text, Point pt)""" + """DrawText(self, String text, int x, int y)""" return _gdi_.DC_DrawText(*args, **kwargs) - def DrawRotatedTextXY(*args, **kwargs): - """DrawRotatedTextXY(self, String text, int x, int y, double angle)""" - return _gdi_.DC_DrawRotatedTextXY(*args, **kwargs) + def DrawTextPoint(*args, **kwargs): + """DrawTextPoint(self, String text, Point pt)""" + return _gdi_.DC_DrawTextPoint(*args, **kwargs) def DrawRotatedText(*args, **kwargs): - """DrawRotatedText(self, String text, Point pt, double angle)""" + """DrawRotatedText(self, String text, int x, int y, double angle)""" return _gdi_.DC_DrawRotatedText(*args, **kwargs) - def BlitXY(*args, **kwargs): + def DrawRotatedTextPoint(*args, **kwargs): + """DrawRotatedTextPoint(self, String text, Point pt, double angle)""" + return _gdi_.DC_DrawRotatedTextPoint(*args, **kwargs) + + def Blit(*args, **kwargs): """ - BlitXY(self, int xdest, int ydest, int width, int height, DC source, + Blit(self, int xdest, int ydest, int width, int height, DC source, int xsrc, int ysrc, int rop=COPY, bool useMask=False, int xsrcMask=-1, int ysrcMask=-1) -> bool """ - return _gdi_.DC_BlitXY(*args, **kwargs) + return _gdi_.DC_Blit(*args, **kwargs) - def Blit(*args, **kwargs): + def BlitPointSize(*args, **kwargs): """ - Blit(self, Point destPt, Size sz, DC source, Point srcPt, int rop=COPY, + BlitPointSize(self, Point destPt, Size sz, DC source, Point srcPt, int rop=COPY, bool useMask=False, Point srcPtMask=DefaultPosition) -> bool """ - return _gdi_.DC_Blit(*args, **kwargs) + return _gdi_.DC_BlitPointSize(*args, **kwargs) + + def SetClippingRegion(*args, **kwargs): + """SetClippingRegion(self, int x, int y, int width, int height)""" + return _gdi_.DC_SetClippingRegion(*args, **kwargs) + + def SetClippingRegionPointSize(*args, **kwargs): + """SetClippingRegionPointSize(self, Point pt, Size sz)""" + return _gdi_.DC_SetClippingRegionPointSize(*args, **kwargs) + + def SetClippingRegionAsRegion(*args, **kwargs): + """SetClippingRegionAsRegion(self, Region region)""" + return _gdi_.DC_SetClippingRegionAsRegion(*args, **kwargs) + + def SetClippingRect(*args, **kwargs): + """SetClippingRect(self, Rect rect)""" + return _gdi_.DC_SetClippingRect(*args, **kwargs) def DrawLines(*args, **kwargs): """DrawLines(self, int points, Point points_array, int xoffset=0, int yoffset=0)""" @@ -2616,22 +2742,6 @@ class DC(_core.Object): """SetPalette(self, Palette palette)""" return _gdi_.DC_SetPalette(*args, **kwargs) - def SetClippingRegionXY(*args, **kwargs): - """SetClippingRegionXY(self, int x, int y, int width, int height)""" - return _gdi_.DC_SetClippingRegionXY(*args, **kwargs) - - def SetClippingRegion(*args, **kwargs): - """SetClippingRegion(self, Point pt, Size sz)""" - return _gdi_.DC_SetClippingRegion(*args, **kwargs) - - def SetClippingRect(*args, **kwargs): - """SetClippingRect(self, Rect rect)""" - return _gdi_.DC_SetClippingRect(*args, **kwargs) - - def SetClippingRegionAsRegion(*args, **kwargs): - """SetClippingRegionAsRegion(self, Region region)""" - return _gdi_.DC_SetClippingRegionAsRegion(*args, **kwargs) - def DestroyClippingRegion(*args, **kwargs): """DestroyClippingRegion(self)""" return _gdi_.DC_DestroyClippingRegion(*args, **kwargs) @@ -2841,6 +2951,10 @@ class DC(_core.Object): """SetLogicalOrigin(self, int x, int y)""" return _gdi_.DC_SetLogicalOrigin(*args, **kwargs) + def SetLogicalOriginPoint(*args, **kwargs): + """SetLogicalOriginPoint(self, Point point)""" + return _gdi_.DC_SetLogicalOriginPoint(*args, **kwargs) + def GetDeviceOrigin(*args, **kwargs): """GetDeviceOrigin(self) -> Point""" return _gdi_.DC_GetDeviceOrigin(*args, **kwargs) @@ -2853,6 +2967,10 @@ class DC(_core.Object): """SetDeviceOrigin(self, int x, int y)""" return _gdi_.DC_SetDeviceOrigin(*args, **kwargs) + def SetDeviceOriginPoint(*args, **kwargs): + """SetDeviceOriginPoint(self, Point point)""" + return _gdi_.DC_SetDeviceOriginPoint(*args, **kwargs) + def SetAxisOrientation(*args, **kwargs): """SetAxisOrientation(self, bool xLeftRight, bool yBottomUp)""" return _gdi_.DC_SetAxisOrientation(*args, **kwargs) @@ -2877,6 +2995,10 @@ class DC(_core.Object): """CalcBoundingBox(self, int x, int y)""" return _gdi_.DC_CalcBoundingBox(*args, **kwargs) + def CalcBoundingBoxPoint(*args, **kwargs): + """CalcBoundingBoxPoint(self, Point point)""" + return _gdi_.DC_CalcBoundingBoxPoint(*args, **kwargs) + def ResetBoundingBox(*args, **kwargs): """ResetBoundingBox(self)""" return _gdi_.DC_ResetBoundingBox(*args, **kwargs) @@ -3243,12 +3365,12 @@ class PostScriptDC(DC): return _gdi_.PostScriptDC_SetPrintData(*args, **kwargs) def SetResolution(*args, **kwargs): - """PostScriptDC.SetResolution(int ppi)""" + """SetResolution(int ppi)""" return _gdi_.PostScriptDC_SetResolution(*args, **kwargs) SetResolution = staticmethod(SetResolution) def GetResolution(*args, **kwargs): - """PostScriptDC.GetResolution() -> int""" + """GetResolution() -> int""" return _gdi_.PostScriptDC_GetResolution(*args, **kwargs) GetResolution = staticmethod(GetResolution) @@ -3359,246 +3481,6 @@ class PrinterDCPtr(PrinterDC): self.__class__ = PrinterDC _gdi_.PrinterDC_swigregister(PrinterDCPtr) -class DC_old(DC): - """DC class that has methods with 2.4 compatible parameters.""" - FloodFill = DC.FloodFillXY - GetPixel = DC.GetPixelXY - DrawLine = DC.DrawLineXY - CrossHair = DC.CrossHairXY - DrawArc = DC.DrawArcXY - DrawCheckMark = DC.DrawCheckMarkXY - DrawEllipticArc = DC.DrawEllipticArcXY - DrawPoint = DC.DrawPointXY - DrawRectangle = DC.DrawRectangleXY - DrawRoundedRectangle = DC.DrawRoundedRectangleXY - DrawCircle = DC.DrawCircleXY - DrawEllipse = DC.DrawEllipseXY - DrawIcon = DC.DrawIconXY - DrawBitmap = DC.DrawBitmapXY - DrawText = DC.DrawTextXY - DrawRotatedText = DC.DrawRotatedTextXY - Blit = DC.BlitXY - -class MemoryDC_old(MemoryDC): - """DC class that has methods with 2.4 compatible parameters.""" - FloodFill = MemoryDC.FloodFillXY - GetPixel = MemoryDC.GetPixelXY - DrawLine = MemoryDC.DrawLineXY - CrossHair = MemoryDC.CrossHairXY - DrawArc = MemoryDC.DrawArcXY - DrawCheckMark = MemoryDC.DrawCheckMarkXY - DrawEllipticArc = MemoryDC.DrawEllipticArcXY - DrawPoint = MemoryDC.DrawPointXY - DrawRectangle = MemoryDC.DrawRectangleXY - DrawRoundedRectangle = MemoryDC.DrawRoundedRectangleXY - DrawCircle = MemoryDC.DrawCircleXY - DrawEllipse = MemoryDC.DrawEllipseXY - DrawIcon = MemoryDC.DrawIconXY - DrawBitmap = MemoryDC.DrawBitmapXY - DrawText = MemoryDC.DrawTextXY - DrawRotatedText = MemoryDC.DrawRotatedTextXY - Blit = MemoryDC.BlitXY - -class BufferedDC_old(BufferedDC): - """DC class that has methods with 2.4 compatible parameters.""" - FloodFill = BufferedDC.FloodFillXY - GetPixel = BufferedDC.GetPixelXY - DrawLine = BufferedDC.DrawLineXY - CrossHair = BufferedDC.CrossHairXY - DrawArc = BufferedDC.DrawArcXY - DrawCheckMark = BufferedDC.DrawCheckMarkXY - DrawEllipticArc = BufferedDC.DrawEllipticArcXY - DrawPoint = BufferedDC.DrawPointXY - DrawRectangle = BufferedDC.DrawRectangleXY - DrawRoundedRectangle = BufferedDC.DrawRoundedRectangleXY - DrawCircle = BufferedDC.DrawCircleXY - DrawEllipse = BufferedDC.DrawEllipseXY - DrawIcon = BufferedDC.DrawIconXY - DrawBitmap = BufferedDC.DrawBitmapXY - DrawText = BufferedDC.DrawTextXY - DrawRotatedText = BufferedDC.DrawRotatedTextXY - Blit = BufferedDC.BlitXY - -class BufferedPaintDC_old(BufferedPaintDC): - """DC class that has methods with 2.4 compatible parameters.""" - FloodFill = BufferedPaintDC.FloodFillXY - GetPixel = BufferedPaintDC.GetPixelXY - DrawLine = BufferedPaintDC.DrawLineXY - CrossHair = BufferedPaintDC.CrossHairXY - DrawArc = BufferedPaintDC.DrawArcXY - DrawCheckMark = BufferedPaintDC.DrawCheckMarkXY - DrawEllipticArc = BufferedPaintDC.DrawEllipticArcXY - DrawPoint = BufferedPaintDC.DrawPointXY - DrawRectangle = BufferedPaintDC.DrawRectangleXY - DrawRoundedRectangle = BufferedPaintDC.DrawRoundedRectangleXY - DrawCircle = BufferedPaintDC.DrawCircleXY - DrawEllipse = BufferedPaintDC.DrawEllipseXY - DrawIcon = BufferedPaintDC.DrawIconXY - DrawBitmap = BufferedPaintDC.DrawBitmapXY - DrawText = BufferedPaintDC.DrawTextXY - DrawRotatedText = BufferedPaintDC.DrawRotatedTextXY - Blit = BufferedPaintDC.BlitXY - -class ScreenDC_old(ScreenDC): - """DC class that has methods with 2.4 compatible parameters.""" - FloodFill = ScreenDC.FloodFillXY - GetPixel = ScreenDC.GetPixelXY - DrawLine = ScreenDC.DrawLineXY - CrossHair = ScreenDC.CrossHairXY - DrawArc = ScreenDC.DrawArcXY - DrawCheckMark = ScreenDC.DrawCheckMarkXY - DrawEllipticArc = ScreenDC.DrawEllipticArcXY - DrawPoint = ScreenDC.DrawPointXY - DrawRectangle = ScreenDC.DrawRectangleXY - DrawRoundedRectangle = ScreenDC.DrawRoundedRectangleXY - DrawCircle = ScreenDC.DrawCircleXY - DrawEllipse = ScreenDC.DrawEllipseXY - DrawIcon = ScreenDC.DrawIconXY - DrawBitmap = ScreenDC.DrawBitmapXY - DrawText = ScreenDC.DrawTextXY - DrawRotatedText = ScreenDC.DrawRotatedTextXY - Blit = ScreenDC.BlitXY - -class ClientDC_old(ClientDC): - """DC class that has methods with 2.4 compatible parameters.""" - FloodFill = ClientDC.FloodFillXY - GetPixel = ClientDC.GetPixelXY - DrawLine = ClientDC.DrawLineXY - CrossHair = ClientDC.CrossHairXY - DrawArc = ClientDC.DrawArcXY - DrawCheckMark = ClientDC.DrawCheckMarkXY - DrawEllipticArc = ClientDC.DrawEllipticArcXY - DrawPoint = ClientDC.DrawPointXY - DrawRectangle = ClientDC.DrawRectangleXY - DrawRoundedRectangle = ClientDC.DrawRoundedRectangleXY - DrawCircle = ClientDC.DrawCircleXY - DrawEllipse = ClientDC.DrawEllipseXY - DrawIcon = ClientDC.DrawIconXY - DrawBitmap = ClientDC.DrawBitmapXY - DrawText = ClientDC.DrawTextXY - DrawRotatedText = ClientDC.DrawRotatedTextXY - Blit = ClientDC.BlitXY - -class PaintDC_old(PaintDC): - """DC class that has methods with 2.4 compatible parameters.""" - FloodFill = PaintDC.FloodFillXY - GetPixel = PaintDC.GetPixelXY - DrawLine = PaintDC.DrawLineXY - CrossHair = PaintDC.CrossHairXY - DrawArc = PaintDC.DrawArcXY - DrawCheckMark = PaintDC.DrawCheckMarkXY - DrawEllipticArc = PaintDC.DrawEllipticArcXY - DrawPoint = PaintDC.DrawPointXY - DrawRectangle = PaintDC.DrawRectangleXY - DrawRoundedRectangle = PaintDC.DrawRoundedRectangleXY - DrawCircle = PaintDC.DrawCircleXY - DrawEllipse = PaintDC.DrawEllipseXY - DrawIcon = PaintDC.DrawIconXY - DrawBitmap = PaintDC.DrawBitmapXY - DrawText = PaintDC.DrawTextXY - DrawRotatedText = PaintDC.DrawRotatedTextXY - Blit = PaintDC.BlitXY - -class WindowDC_old(WindowDC): - """DC class that has methods with 2.4 compatible parameters.""" - FloodFill = WindowDC.FloodFillXY - GetPixel = WindowDC.GetPixelXY - DrawLine = WindowDC.DrawLineXY - CrossHair = WindowDC.CrossHairXY - DrawArc = WindowDC.DrawArcXY - DrawCheckMark = WindowDC.DrawCheckMarkXY - DrawEllipticArc = WindowDC.DrawEllipticArcXY - DrawPoint = WindowDC.DrawPointXY - DrawRectangle = WindowDC.DrawRectangleXY - DrawRoundedRectangle = WindowDC.DrawRoundedRectangleXY - DrawCircle = WindowDC.DrawCircleXY - DrawEllipse = WindowDC.DrawEllipseXY - DrawIcon = WindowDC.DrawIconXY - DrawBitmap = WindowDC.DrawBitmapXY - DrawText = WindowDC.DrawTextXY - DrawRotatedText = WindowDC.DrawRotatedTextXY - Blit = WindowDC.BlitXY - -class MirrorDC_old(MirrorDC): - """DC class that has methods with 2.4 compatible parameters.""" - FloodFill = MirrorDC.FloodFillXY - GetPixel = MirrorDC.GetPixelXY - DrawLine = MirrorDC.DrawLineXY - CrossHair = MirrorDC.CrossHairXY - DrawArc = MirrorDC.DrawArcXY - DrawCheckMark = MirrorDC.DrawCheckMarkXY - DrawEllipticArc = MirrorDC.DrawEllipticArcXY - DrawPoint = MirrorDC.DrawPointXY - DrawRectangle = MirrorDC.DrawRectangleXY - DrawRoundedRectangle = MirrorDC.DrawRoundedRectangleXY - DrawCircle = MirrorDC.DrawCircleXY - DrawEllipse = MirrorDC.DrawEllipseXY - DrawIcon = MirrorDC.DrawIconXY - DrawBitmap = MirrorDC.DrawBitmapXY - DrawText = MirrorDC.DrawTextXY - DrawRotatedText = MirrorDC.DrawRotatedTextXY - Blit = MirrorDC.BlitXY - -class PostScriptDC_old(PostScriptDC): - """DC class that has methods with 2.4 compatible parameters.""" - FloodFill = PostScriptDC.FloodFillXY - GetPixel = PostScriptDC.GetPixelXY - DrawLine = PostScriptDC.DrawLineXY - CrossHair = PostScriptDC.CrossHairXY - DrawArc = PostScriptDC.DrawArcXY - DrawCheckMark = PostScriptDC.DrawCheckMarkXY - DrawEllipticArc = PostScriptDC.DrawEllipticArcXY - DrawPoint = PostScriptDC.DrawPointXY - DrawRectangle = PostScriptDC.DrawRectangleXY - DrawRoundedRectangle = PostScriptDC.DrawRoundedRectangleXY - DrawCircle = PostScriptDC.DrawCircleXY - DrawEllipse = PostScriptDC.DrawEllipseXY - DrawIcon = PostScriptDC.DrawIconXY - DrawBitmap = PostScriptDC.DrawBitmapXY - DrawText = PostScriptDC.DrawTextXY - DrawRotatedText = PostScriptDC.DrawRotatedTextXY - Blit = PostScriptDC.BlitXY - -class MetaFileDC_old(MetaFileDC): - """DC class that has methods with 2.4 compatible parameters.""" - FloodFill = MetaFileDC.FloodFillXY - GetPixel = MetaFileDC.GetPixelXY - DrawLine = MetaFileDC.DrawLineXY - CrossHair = MetaFileDC.CrossHairXY - DrawArc = MetaFileDC.DrawArcXY - DrawCheckMark = MetaFileDC.DrawCheckMarkXY - DrawEllipticArc = MetaFileDC.DrawEllipticArcXY - DrawPoint = MetaFileDC.DrawPointXY - DrawRectangle = MetaFileDC.DrawRectangleXY - DrawRoundedRectangle = MetaFileDC.DrawRoundedRectangleXY - DrawCircle = MetaFileDC.DrawCircleXY - DrawEllipse = MetaFileDC.DrawEllipseXY - DrawIcon = MetaFileDC.DrawIconXY - DrawBitmap = MetaFileDC.DrawBitmapXY - DrawText = MetaFileDC.DrawTextXY - DrawRotatedText = MetaFileDC.DrawRotatedTextXY - Blit = MetaFileDC.BlitXY - -class PrinterDC_old(PrinterDC): - """DC class that has methods with 2.4 compatible parameters.""" - FloodFill = PrinterDC.FloodFillXY - GetPixel = PrinterDC.GetPixelXY - DrawLine = PrinterDC.DrawLineXY - CrossHair = PrinterDC.CrossHairXY - DrawArc = PrinterDC.DrawArcXY - DrawCheckMark = PrinterDC.DrawCheckMarkXY - DrawEllipticArc = PrinterDC.DrawEllipticArcXY - DrawPoint = PrinterDC.DrawPointXY - DrawRectangle = PrinterDC.DrawRectangleXY - DrawRoundedRectangle = PrinterDC.DrawRoundedRectangleXY - DrawCircle = PrinterDC.DrawCircleXY - DrawEllipse = PrinterDC.DrawEllipseXY - DrawIcon = PrinterDC.DrawIconXY - DrawBitmap = PrinterDC.DrawBitmapXY - DrawText = PrinterDC.DrawTextXY - DrawRotatedText = PrinterDC.DrawRotatedTextXY - Blit = PrinterDC.BlitXY - #--------------------------------------------------------------------------- IMAGELIST_DRAW_NORMAL = _gdi_.IMAGELIST_DRAW_NORMAL diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index 6f1d18fac8..4b4b64deba 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -246,8 +246,8 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxIcon swig_types[37] #define SWIGTYPE_p_wxLocale swig_types[38] #define SWIGTYPE_p_wxRegion swig_types[39] -#define SWIGTYPE_p_wxConfigBase swig_types[40] -#define SWIGTYPE_p_wxLanguageInfo swig_types[41] +#define SWIGTYPE_p_wxLanguageInfo swig_types[40] +#define SWIGTYPE_p_wxConfigBase swig_types[41] #define SWIGTYPE_p_wxWindowDC swig_types[42] #define SWIGTYPE_p_wxPrintData swig_types[43] #define SWIGTYPE_p_wxBrushList swig_types[44] @@ -256,13 +256,12 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxBufferedPaintDC swig_types[47] #define SWIGTYPE_p_wxPaintDC swig_types[48] #define SWIGTYPE_p_wxPenList swig_types[49] -#define SWIGTYPE_p_wxPyPen swig_types[50] -#define SWIGTYPE_p_int swig_types[51] -#define SWIGTYPE_p_wxMetaFile swig_types[52] -#define SWIGTYPE_p_wxNativeFontInfo swig_types[53] -#define SWIGTYPE_p_wxEncodingConverter swig_types[54] -#define SWIGTYPE_p_wxColourDatabase swig_types[55] -static swig_type_info *swig_types[57]; +#define SWIGTYPE_p_int swig_types[50] +#define SWIGTYPE_p_wxMetaFile swig_types[51] +#define SWIGTYPE_p_wxNativeFontInfo swig_types[52] +#define SWIGTYPE_p_wxEncodingConverter swig_types[53] +#define SWIGTYPE_p_wxColourDatabase swig_types[54] +static swig_type_info *swig_types[56]; /* -------- TYPES TABLE (END) -------- */ @@ -541,27 +540,28 @@ PyObject *wxPen_GetDashes(wxPen *self){ wxPyEndBlockThreads(blocked); return retval; } +void wxPen__SetDashes(wxPen *self,PyObject *_self,PyObject *pyDashes){ + bool blocked = wxPyBeginBlockThreads(); + int size = PyList_Size(pyDashes); + wxDash* dashes = (wxDash*)byte_LIST_helper(pyDashes); + + // black magic warning! The array of wxDashes needs to exist as + // long as the pen does because wxPen does not copy the array. So + // stick a copy in a Python string object and attach it to _self, + // and then call SetDashes with a pointer to that array. Then + // when the Python pen object is destroyed the array will be + // cleaned up too. + PyObject* strDashes = PyString_FromStringAndSize((char*)dashes, size*sizeof(wxDash)); + PyObject_SetAttrString(_self, "_dashes", strDashes); + + self->SetDashes(size, (wxDash*)PyString_AS_STRING(strDashes)); + delete [] dashes; + Py_DECREF(strDashes); + wxPyEndBlockThreads(blocked); + } bool wxPen___eq__(wxPen *self,wxPen const *other){ return other ? (*self == *other) : False; } bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*self != *other) : True; } -wxPyPen::~wxPyPen() -{ - if (m_dash) - delete [] m_dash; -} - -void wxPyPen::SetDashes(int nb_dashes, const wxDash *dash) -{ - if (m_dash) - delete [] m_dash; - m_dash = new wxDash[nb_dashes]; - for (int i=0; i static char** ConvertListOfStrings(PyObject* listOfStrings) { @@ -600,12 +600,6 @@ wxBitmap *new_wxBitmap(PyObject *bits,int width,int height,int depth){ PyString_AsStringAndSize(bits, &buf, &length); return new wxBitmap(buf, width, height, depth); } -wxBitmap *new_wxBitmap__SWIG_0(int width,int height,int depth){ - return new wxBitmap(width, height, depth); - } -wxBitmap *new_wxBitmap__SWIG_1(wxSize const &size,int depth){ - return new wxBitmap(size.x, size.y, depth); - } SWIGSTATICINLINE(int) SWIG_CheckLong(PyObject* obj) @@ -761,12 +755,12 @@ PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){ #include "wx/wxPython/pydrawxxx.h" -wxColour wxDC_GetPixelXY(wxDC *self,int x,int y){ +wxColour wxDC_GetPixel(wxDC *self,int x,int y){ wxColour col; self->GetPixel(x, y, &col); return col; } -wxColour wxDC_GetPixel(wxDC *self,wxPoint const &pt){ +wxColour wxDC_GetPixelPoint(wxDC *self,wxPoint const &pt){ wxColour col; self->GetPixel(pt, &col); return col; @@ -814,6 +808,15 @@ wxArrayInt wxDC_GetPartialTextExtents(wxDC *self,wxString const &text){ self->GetPartialTextExtents(text, widths); return widths; } +void wxDC_SetLogicalOriginPoint(wxDC *self,wxPoint const &point){ + self->SetLogicalOrigin(point.x, point.y); + } +void wxDC_SetDeviceOriginPoint(wxDC *self,wxPoint const &point){ + self->SetDeviceOrigin(point.x, point.y); + } +void wxDC_CalcBoundingBoxPoint(wxDC *self,wxPoint const &point){ + self->CalcBoundingBox(point.x, point.y); + } PyObject *wxDC__DrawPointList(wxDC *self,PyObject *pyCoords,PyObject *pyPens,PyObject *pyBrushes){ return wxPyDrawXXXList(*self, wxPyDrawXXXPoint, pyCoords, pyPens, pyBrushes); } @@ -2126,64 +2129,31 @@ static PyObject *_wrap_Pen_GetDashes(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_Pen___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPen *arg1 = (wxPen *) 0 ; - wxPen *arg2 = (wxPen *) 0 ; - bool result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "other", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen___eq__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPen, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxPen___eq__(arg1,(wxPen const *)arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Pen___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Pen__SetDashes(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPen *arg1 = (wxPen *) 0 ; - wxPen *arg2 = (wxPen *) 0 ; - bool result; + PyObject *arg2 = (PyObject *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "other", NULL + (char *) "self",(char *) "_self",(char *) "pyDashes", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen___ne__",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Pen__SetDashes",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPen, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = obj1; + arg3 = obj2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxPen___ne__(arg1,(wxPen const *)arg2); + wxPen__SetDashes(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; @@ -2276,122 +2246,74 @@ static PyObject *_wrap_Pen_SetStipple(PyObject *self, PyObject *args, PyObject * } -static PyObject * Pen_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxPen, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} -static PyObject *_wrap_new_PyPen(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Pen___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxColour *arg1 = 0 ; - int arg2 = (int) 1 ; - int arg3 = (int) wxSOLID ; - wxPyPen *result; - wxColour temp1 ; + wxPen *arg1 = (wxPen *) 0 ; + wxPen *arg2 = (wxPen *) 0 ; + bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "colour",(char *) "width",(char *) "style", NULL + (char *) "self",(char *) "other", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_PyPen",kwnames,&obj0,&obj1,&obj2)) goto fail; - { - arg1 = &temp1; - if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; - } - if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj2) { - arg3 = (int) SWIG_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen___eq__",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPen, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxPyPen *)new wxPyPen(*arg1,arg2,arg3); + result = (bool)wxPen___eq__(arg1,(wxPen const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyPen, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_delete_PyPen(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPyPen *arg1 = (wxPyPen *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PyPen",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPen, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - delete arg1; - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } - Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_PyPen_SetDashes(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Pen___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxPyPen *arg1 = (wxPyPen *) 0 ; - int arg2 ; - wxDash *arg3 = (wxDash *) 0 ; + wxPen *arg1 = (wxPen *) 0 ; + wxPen *arg2 = (wxPen *) 0 ; + bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "dashes", NULL + (char *) "self",(char *) "other", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPen_SetDashes",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPen, + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen___ne__",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPen, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPen, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - arg2 = PyList_Size(obj1); - arg3 = (wxDash*)byte_LIST_helper(obj1); - if (arg3 == NULL) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDashes(arg2,arg3); + result = (bool)wxPen___ne__(arg1,(wxPen const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; { - if (arg3) delete [] arg3; + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } return resultobj; fail: - { - if (arg3) delete [] arg3; - } return NULL; } -static PyObject * PyPen_swigregister(PyObject *self, PyObject *args) { +static PyObject * Pen_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxPyPen, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxPen, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } @@ -2736,6 +2658,42 @@ static PyObject *_wrap_delete_Bitmap(PyObject *self, PyObject *args, PyObject *k } +static PyObject *_wrap_new_EmptyBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 ; + int arg2 ; + int arg3 = (int) -1 ; + wxBitmap *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "width",(char *) "height",(char *) "depth", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_EmptyBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail; + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxBitmap *)new wxBitmap(arg1,arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 1); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_new_BitmapFromIcon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxIcon *arg1 = 0 ; @@ -2868,200 +2826,89 @@ static PyObject *_wrap_new_BitmapFromBits(PyObject *self, PyObject *args, PyObje } -static PyObject *_wrap_new_EmptyBitmap__SWIG_0(PyObject *self, PyObject *args) { +static PyObject *_wrap_Bitmap_SetPalette(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - int arg1 ; - int arg2 ; - int arg3 = (int) -1 ; - wxBitmap *result; + wxBitmap *arg1 = (wxBitmap *) 0 ; + wxPalette *arg2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "palette", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"OO|O:new_EmptyBitmap",&obj0,&obj1,&obj2)) goto fail; - arg1 = (int) SWIG_AsInt(obj0); - if (PyErr_Occurred()) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - if (obj2) { - arg3 = (int) SWIG_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetPalette",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPalette, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBitmap *)new_wxBitmap__SWIG_0(arg1,arg2,arg3); + (arg1)->SetPalette(*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 1); + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_new_EmptyBitmap__SWIG_1(PyObject *self, PyObject *args) { +static PyObject *_wrap_Bitmap_GetHandle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxSize *arg1 = 0 ; - int arg2 = (int) -1 ; - wxBitmap *result; - wxSize temp1 ; + wxBitmap *arg1 = (wxBitmap *) 0 ; + long result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"O|O:new_EmptyBitmap",&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetHandle",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { - arg1 = &temp1; - if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail; - } - if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (long)(arg1)->GetHandle(); + + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } + resultobj = SWIG_FromLong((long)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Bitmap_SetHandle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBitmap *arg1 = (wxBitmap *) 0 ; + long arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "handle", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetHandle",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBitmap *)new_wxBitmap__SWIG_1((wxSize const &)*arg1,arg2); + wxBitmap_SetHandle(arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_EmptyBitmap(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[4]; - int ii; - - argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 3); ii++) { - argv[ii] = PyTuple_GetItem(args,ii); - } - if ((argc >= 1) && (argc <= 2)) { - int _v; - { - _v = wxPySimple_typecheck(argv[0], wxT("wxSize"), 2); - } - if (_v) { - if (argc <= 1) { - return _wrap_new_EmptyBitmap__SWIG_1(self,args); - } - _v = SWIG_CheckInt(argv[1]); - if (_v) { - return _wrap_new_EmptyBitmap__SWIG_1(self,args); - } - } - } - if ((argc >= 2) && (argc <= 3)) { - int _v; - _v = SWIG_CheckInt(argv[0]); - if (_v) { - _v = SWIG_CheckInt(argv[1]); - if (_v) { - if (argc <= 2) { - return _wrap_new_EmptyBitmap__SWIG_0(self,args); - } - _v = SWIG_CheckInt(argv[2]); - if (_v) { - return _wrap_new_EmptyBitmap__SWIG_0(self,args); - } - } - } - } - - PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_EmptyBitmap'"); - return NULL; -} - - -static PyObject *_wrap_Bitmap_SetPalette(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBitmap *arg1 = (wxBitmap *) 0 ; - wxPalette *arg2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "palette", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetPalette",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPalette, - SWIG_POINTER_EXCEPTION | 0)) == -1) - SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); - SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetPalette(*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Bitmap_GetHandle(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBitmap *arg1 = (wxBitmap *) 0 ; - long result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetHandle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (long)(arg1)->GetHandle(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Bitmap_SetHandle(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBitmap *arg1 = (wxBitmap *) 0 ; - long arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "handle", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetHandle",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (long) SWIG_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxBitmap_SetHandle(arg1,arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; @@ -3363,7 +3210,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject wxBitmap *arg1 = (wxBitmap *) 0 ; wxString *arg2 = 0 ; int arg3 ; - wxPalette *arg4 = (wxPalette *) (wxPalette *) NULL ; + wxPalette *arg4 = (wxPalette *) NULL ; bool result; bool temp2 = False ; PyObject * obj0 = 0 ; @@ -11016,7 +10863,7 @@ static PyObject *_wrap_DC_EndDrawing(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -11034,7 +10881,7 @@ static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject * (char *) "self",(char *) "x",(char *) "y",(char *) "col",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_FloodFillXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -11065,7 +10912,7 @@ static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_FloodFillPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxPoint *arg2 = 0 ; @@ -11082,7 +10929,7 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw (char *) "self",(char *) "pt",(char *) "col",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_FloodFillPoint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -11113,7 +10960,7 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw } -static PyObject *_wrap_DC_GetPixelXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -11126,7 +10973,7 @@ static PyObject *_wrap_DC_GetPixelXY(PyObject *self, PyObject *args, PyObject *k (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_GetPixelXY",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_GetPixel",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -11135,7 +10982,7 @@ static PyObject *_wrap_DC_GetPixelXY(PyObject *self, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = wxDC_GetPixelXY(arg1,arg2,arg3); + result = wxDC_GetPixel(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11151,7 +10998,7 @@ static PyObject *_wrap_DC_GetPixelXY(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_GetPixelPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxPoint *arg2 = 0 ; @@ -11163,7 +11010,7 @@ static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwa (char *) "self",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_GetPixel",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_GetPixelPoint",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -11172,7 +11019,7 @@ static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwa } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = wxDC_GetPixel(arg1,(wxPoint const &)*arg2); + result = wxDC_GetPixelPoint(arg1,(wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11188,7 +11035,7 @@ static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwa } -static PyObject *_wrap_DC_DrawLineXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawLine(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -11204,7 +11051,7 @@ static PyObject *_wrap_DC_DrawLineXY(PyObject *self, PyObject *args, PyObject *k (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawLineXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawLine",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -11229,7 +11076,7 @@ static PyObject *_wrap_DC_DrawLineXY(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_DC_DrawLine(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawLinePoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxPoint *arg2 = 0 ; @@ -11243,7 +11090,7 @@ static PyObject *_wrap_DC_DrawLine(PyObject *self, PyObject *args, PyObject *kwa (char *) "self",(char *) "pt1",(char *) "pt2", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawLine",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawLinePoint",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -11268,7 +11115,7 @@ static PyObject *_wrap_DC_DrawLine(PyObject *self, PyObject *args, PyObject *kwa } -static PyObject *_wrap_DC_CrossHairXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_CrossHair(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -11280,7 +11127,7 @@ static PyObject *_wrap_DC_CrossHairXY(PyObject *self, PyObject *args, PyObject * (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CrossHairXY",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CrossHair",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -11301,7 +11148,7 @@ static PyObject *_wrap_DC_CrossHairXY(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_DC_CrossHair(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_CrossHairPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxPoint *arg2 = 0 ; @@ -11312,7 +11159,7 @@ static PyObject *_wrap_DC_CrossHair(PyObject *self, PyObject *args, PyObject *kw (char *) "self",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_CrossHair",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_CrossHairPoint",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -11333,7 +11180,7 @@ static PyObject *_wrap_DC_CrossHair(PyObject *self, PyObject *args, PyObject *kw } -static PyObject *_wrap_DC_DrawArcXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawArc(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -11353,7 +11200,7 @@ static PyObject *_wrap_DC_DrawArcXY(PyObject *self, PyObject *args, PyObject *kw (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2",(char *) "xc",(char *) "yc", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawArcXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawArc",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -11382,7 +11229,7 @@ static PyObject *_wrap_DC_DrawArcXY(PyObject *self, PyObject *args, PyObject *kw } -static PyObject *_wrap_DC_DrawArc(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawArcPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxPoint *arg2 = 0 ; @@ -11399,7 +11246,7 @@ static PyObject *_wrap_DC_DrawArc(PyObject *self, PyObject *args, PyObject *kwar (char *) "self",(char *) "pt1",(char *) "pt2",(char *) "centre", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawArcPoint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -11428,7 +11275,7 @@ static PyObject *_wrap_DC_DrawArc(PyObject *self, PyObject *args, PyObject *kwar } -static PyObject *_wrap_DC_DrawCheckMarkXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawCheckMark(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -11444,7 +11291,7 @@ static PyObject *_wrap_DC_DrawCheckMarkXY(PyObject *self, PyObject *args, PyObje (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawCheckMarkXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawCheckMark",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -11469,7 +11316,7 @@ static PyObject *_wrap_DC_DrawCheckMarkXY(PyObject *self, PyObject *args, PyObje } -static PyObject *_wrap_DC_DrawCheckMark(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawCheckMarkRect(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxRect *arg2 = 0 ; @@ -11480,7 +11327,7 @@ static PyObject *_wrap_DC_DrawCheckMark(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "rect", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawCheckMark",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawCheckMarkRect",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -11501,7 +11348,7 @@ static PyObject *_wrap_DC_DrawCheckMark(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_DC_DrawEllipticArcXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -11521,7 +11368,7 @@ static PyObject *_wrap_DC_DrawEllipticArcXY(PyObject *self, PyObject *args, PyOb (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h",(char *) "sa",(char *) "ea", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawEllipticArcXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -11550,7 +11397,7 @@ static PyObject *_wrap_DC_DrawEllipticArcXY(PyObject *self, PyObject *args, PyOb } -static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawEllipticArcPointSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxPoint *arg2 = 0 ; @@ -11568,7 +11415,7 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje (char *) "self",(char *) "pt",(char *) "sz",(char *) "sa",(char *) "ea", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipticArcPointSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -11597,7 +11444,7 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje } -static PyObject *_wrap_DC_DrawPointXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -11609,7 +11456,7 @@ static PyObject *_wrap_DC_DrawPointXY(PyObject *self, PyObject *args, PyObject * (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawPointXY",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawPoint",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -11630,7 +11477,7 @@ static PyObject *_wrap_DC_DrawPointXY(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_DC_DrawPoint(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawPointPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxPoint *arg2 = 0 ; @@ -11641,7 +11488,7 @@ static PyObject *_wrap_DC_DrawPoint(PyObject *self, PyObject *args, PyObject *kw (char *) "self",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawPoint",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawPointPoint",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -11662,7 +11509,7 @@ static PyObject *_wrap_DC_DrawPoint(PyObject *self, PyObject *args, PyObject *kw } -static PyObject *_wrap_DC_DrawRectangleXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawRectangle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -11678,7 +11525,7 @@ static PyObject *_wrap_DC_DrawRectangleXY(PyObject *self, PyObject *args, PyObje (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRectangleXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRectangle",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -11703,34 +11550,27 @@ static PyObject *_wrap_DC_DrawRectangleXY(PyObject *self, PyObject *args, PyObje } -static PyObject *_wrap_DC_DrawRectangle(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawRectangleRect(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxPoint *arg2 = 0 ; - wxSize *arg3 = 0 ; - wxPoint temp2 ; - wxSize temp3 ; + wxRect *arg2 = 0 ; + wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pt",(char *) "sz", NULL + (char *) "self",(char *) "rect", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawRectangle",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawRectangleRect",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; - } - { - arg3 = &temp3; - if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawRectangle((wxPoint const &)*arg2,(wxSize const &)*arg3); + (arg1)->DrawRectangle((wxRect const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11742,27 +11582,34 @@ static PyObject *_wrap_DC_DrawRectangle(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_DC_DrawRectangleRect(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawRectanglePointSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxRect *arg2 = 0 ; - wxRect temp2 ; + wxPoint *arg2 = 0 ; + wxSize *arg3 = 0 ; + wxPoint temp2 ; + wxSize temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "rect", NULL + (char *) "self",(char *) "pt",(char *) "sz", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawRectangleRect",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawRectanglePointSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; - if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawRectangle((wxRect const &)*arg2); + (arg1)->DrawRectangle((wxPoint const &)*arg2,(wxSize const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11774,7 +11621,7 @@ static PyObject *_wrap_DC_DrawRectangleRect(PyObject *self, PyObject *args, PyOb } -static PyObject *_wrap_DC_DrawRoundedRectangleXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -11792,7 +11639,7 @@ static PyObject *_wrap_DC_DrawRoundedRectangleXY(PyObject *self, PyObject *args, (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:DC_DrawRoundedRectangleXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:DC_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -11819,38 +11666,31 @@ static PyObject *_wrap_DC_DrawRoundedRectangleXY(PyObject *self, PyObject *args, } -static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxPoint *arg2 = 0 ; - wxSize *arg3 = 0 ; - double arg4 ; - wxPoint temp2 ; - wxSize temp3 ; + wxRect *arg2 = 0 ; + double arg3 ; + wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pt",(char *) "sz",(char *) "radius", NULL + (char *) "self",(char *) "r",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawRoundedRectangleRect",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; - } - { - arg3 = &temp3; - if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } - arg4 = (double) SWIG_AsDouble(obj3); + arg3 = (double) SWIG_AsDouble(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawRoundedRectangle((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4); + (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11862,31 +11702,38 @@ static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, P } -static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawRoundedRectanglePointSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxRect *arg2 = 0 ; - double arg3 ; - wxRect temp2 ; + wxPoint *arg2 = 0 ; + wxSize *arg3 = 0 ; + double arg4 ; + wxPoint temp2 ; + wxSize temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "r",(char *) "radius", NULL + (char *) "self",(char *) "pt",(char *) "sz",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawRoundedRectangleRect",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawRoundedRectanglePointSize",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; - if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + arg4 = (double) SWIG_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); + (arg1)->DrawRoundedRectangle((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11898,7 +11745,7 @@ static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *arg } -static PyObject *_wrap_DC_DrawCircleXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -11912,7 +11759,7 @@ static PyObject *_wrap_DC_DrawCircleXY(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "x",(char *) "y",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawCircleXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawCircle",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -11935,7 +11782,7 @@ static PyObject *_wrap_DC_DrawCircleXY(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawCirclePoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxPoint *arg2 = 0 ; @@ -11948,7 +11795,7 @@ static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *k (char *) "self",(char *) "pt",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawCircle",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawCirclePoint",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -11971,7 +11818,7 @@ static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_DC_DrawEllipseXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawEllipse(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -11987,7 +11834,7 @@ static PyObject *_wrap_DC_DrawEllipseXY(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipseXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipse",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -12012,34 +11859,27 @@ static PyObject *_wrap_DC_DrawEllipseXY(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_DC_DrawEllipse(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawEllipseRect(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxPoint *arg2 = 0 ; - wxSize *arg3 = 0 ; - wxPoint temp2 ; - wxSize temp3 ; + wxRect *arg2 = 0 ; + wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pt",(char *) "sz", NULL + (char *) "self",(char *) "rect", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawEllipse",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawEllipseRect",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; - } - { - arg3 = &temp3; - if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawEllipse((wxPoint const &)*arg2,(wxSize const &)*arg3); + (arg1)->DrawEllipse((wxRect const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12051,27 +11891,34 @@ static PyObject *_wrap_DC_DrawEllipse(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_DC_DrawEllipseRect(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawEllipsePointSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxRect *arg2 = 0 ; - wxRect temp2 ; + wxPoint *arg2 = 0 ; + wxSize *arg3 = 0 ; + wxPoint temp2 ; + wxSize temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "rect", NULL + (char *) "self",(char *) "pt",(char *) "sz", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DrawEllipseRect",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawEllipsePointSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; - if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawEllipse((wxRect const &)*arg2); + (arg1)->DrawEllipse((wxPoint const &)*arg2,(wxSize const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12083,7 +11930,7 @@ static PyObject *_wrap_DC_DrawEllipseRect(PyObject *self, PyObject *args, PyObje } -static PyObject *_wrap_DC_DrawIconXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawIcon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxIcon *arg2 = 0 ; @@ -12097,7 +11944,7 @@ static PyObject *_wrap_DC_DrawIconXY(PyObject *self, PyObject *args, PyObject *k (char *) "self",(char *) "icon",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawIconXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawIcon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxIcon, @@ -12125,7 +11972,7 @@ static PyObject *_wrap_DC_DrawIconXY(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_DC_DrawIcon(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawIconPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxIcon *arg2 = 0 ; @@ -12138,7 +11985,7 @@ static PyObject *_wrap_DC_DrawIcon(PyObject *self, PyObject *args, PyObject *kwa (char *) "self",(char *) "icon",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawIcon",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawIconPoint",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxIcon, @@ -12166,7 +12013,7 @@ static PyObject *_wrap_DC_DrawIcon(PyObject *self, PyObject *args, PyObject *kwa } -static PyObject *_wrap_DC_DrawBitmapXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxBitmap *arg2 = 0 ; @@ -12182,7 +12029,7 @@ static PyObject *_wrap_DC_DrawBitmapXY(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "bmp",(char *) "x",(char *) "y",(char *) "useMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_DrawBitmapXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_DrawBitmap",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap, @@ -12214,7 +12061,7 @@ static PyObject *_wrap_DC_DrawBitmapXY(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawBitmapPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxBitmap *arg2 = 0 ; @@ -12229,7 +12076,7 @@ static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *k (char *) "self",(char *) "bmp",(char *) "pt",(char *) "useMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_DrawBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_DrawBitmapPoint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap, @@ -12261,7 +12108,7 @@ static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_DC_DrawTextXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; @@ -12276,7 +12123,7 @@ static PyObject *_wrap_DC_DrawTextXY(PyObject *self, PyObject *args, PyObject *k (char *) "self",(char *) "text",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawTextXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -12310,7 +12157,7 @@ static PyObject *_wrap_DC_DrawTextXY(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawTextPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; @@ -12324,7 +12171,7 @@ static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwa (char *) "self",(char *) "text",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawText",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawTextPoint",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -12358,7 +12205,7 @@ static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwa } -static PyObject *_wrap_DC_DrawRotatedTextXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; @@ -12375,7 +12222,7 @@ static PyObject *_wrap_DC_DrawRotatedTextXY(PyObject *self, PyObject *args, PyOb (char *) "self",(char *) "text",(char *) "x",(char *) "y",(char *) "angle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRotatedTextXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRotatedText",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -12411,7 +12258,7 @@ static PyObject *_wrap_DC_DrawRotatedTextXY(PyObject *self, PyObject *args, PyOb } -static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_DrawRotatedTextPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; @@ -12427,7 +12274,7 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje (char *) "self",(char *) "text",(char *) "pt",(char *) "angle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawRotatedText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawRotatedTextPoint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -12463,7 +12310,7 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje } -static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -12494,7 +12341,7 @@ static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwarg (char *) "self",(char *) "xdest",(char *) "ydest",(char *) "width",(char *) "height",(char *) "source",(char *) "xsrc",(char *) "ysrc",(char *) "rop",(char *) "useMask",(char *) "xsrcMask",(char *) "ysrcMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO|OOOO:DC_BlitXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO|OOOO:DC_Blit",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -12543,7 +12390,7 @@ static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwarg } -static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_BlitPointSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxPoint *arg2 = 0 ; @@ -12571,7 +12418,7 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) (char *) "self",(char *) "destPt",(char *) "sz",(char *) "source",(char *) "srcPt",(char *) "rop",(char *) "useMask",(char *) "srcPtMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:DC_Blit",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:DC_BlitPointSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -12604,14 +12451,160 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Blit((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4,(wxPoint const &)*arg5,arg6,arg7,(wxPoint const &)*arg8); + result = (bool)(arg1)->Blit((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4,(wxPoint const &)*arg5,arg6,arg7,(wxPoint const &)*arg8); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_SetClippingRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetClippingRegion(arg2,arg3,arg4,arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_DC_SetClippingRegionPointSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxPoint *arg2 = 0 ; + wxSize *arg3 = 0 ; + wxPoint temp2 ; + wxSize temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pt",(char *) "sz", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetClippingRegionPointSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetClippingRegion((wxPoint const &)*arg2,(wxSize const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_DC_SetClippingRegionAsRegion(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxRegion *arg2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "region", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetClippingRegionAsRegion",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetClippingRegion((wxRegion const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_DC_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxRect *arg2 = 0 ; + wxRect temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "rect", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetClippingRect",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetClippingRegion((wxRect const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; @@ -13239,152 +13232,6 @@ static PyObject *_wrap_DC_SetPalette(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_DC_SetClippingRegionXY(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxDC *arg1 = (wxDC *) 0 ; - int arg2 ; - int arg3 ; - int arg4 ; - int arg5 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_SetClippingRegionXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - arg3 = (int) SWIG_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - arg4 = (int) SWIG_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - arg5 = (int) SWIG_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetClippingRegion(arg2,arg3,arg4,arg5); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxDC *arg1 = (wxDC *) 0 ; - wxPoint *arg2 = 0 ; - wxSize *arg3 = 0 ; - wxPoint temp2 ; - wxSize temp3 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "pt",(char *) "sz", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetClippingRegion",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; - } - { - arg3 = &temp3; - if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetClippingRegion((wxPoint const &)*arg2,(wxSize const &)*arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DC_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxDC *arg1 = (wxDC *) 0 ; - wxRect *arg2 = 0 ; - wxRect temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "rect", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetClippingRect",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetClippingRegion((wxRect const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DC_SetClippingRegionAsRegion(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxDC *arg1 = (wxDC *) 0 ; - wxRegion *arg2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "region", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetClippingRegionAsRegion",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxRegion, - SWIG_POINTER_EXCEPTION | 0)) == -1) - SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); - SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetClippingRegion((wxRegion const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_DC_DestroyClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; @@ -14888,6 +14735,38 @@ static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObj } +static PyObject *_wrap_DC_SetLogicalOriginPoint(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxPoint *arg2 = 0 ; + wxPoint temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "point", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetLogicalOriginPoint",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxDC_SetLogicalOriginPoint(arg1,(wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_DC_GetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; @@ -14990,6 +14869,38 @@ static PyObject *_wrap_DC_SetDeviceOrigin(PyObject *self, PyObject *args, PyObje } +static PyObject *_wrap_DC_SetDeviceOriginPoint(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxPoint *arg2 = 0 ; + wxPoint temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "point", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetDeviceOriginPoint",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxDC_SetDeviceOriginPoint(arg1,(wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_DC_SetAxisOrientation(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; @@ -15168,6 +15079,38 @@ static PyObject *_wrap_DC_CalcBoundingBox(PyObject *self, PyObject *args, PyObje } +static PyObject *_wrap_DC_CalcBoundingBoxPoint(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxPoint *arg2 = 0 ; + wxPoint temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "point", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_CalcBoundingBoxPoint",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxDC_CalcBoundingBoxPoint(arg1,(wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_DC_ResetBoundingBox(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; @@ -19022,16 +18965,13 @@ static PyMethodDef SwigMethods[] = { { (char *)"Pen_SetWidth", (PyCFunction) _wrap_Pen_SetWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_SetDashes", (PyCFunction) _wrap_Pen_SetDashes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_GetDashes", (PyCFunction) _wrap_Pen_GetDashes, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Pen___eq__", (PyCFunction) _wrap_Pen___eq__, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Pen___ne__", (PyCFunction) _wrap_Pen___ne__, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Pen__SetDashes", (PyCFunction) _wrap_Pen__SetDashes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_GetDashCount", (PyCFunction) _wrap_Pen_GetDashCount, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_GetStipple", (PyCFunction) _wrap_Pen_GetStipple, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_SetStipple", (PyCFunction) _wrap_Pen_SetStipple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Pen___eq__", (PyCFunction) _wrap_Pen___eq__, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Pen___ne__", (PyCFunction) _wrap_Pen___ne__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_swigregister", Pen_swigregister, METH_VARARGS }, - { (char *)"new_PyPen", (PyCFunction) _wrap_new_PyPen, METH_VARARGS | METH_KEYWORDS }, - { (char *)"delete_PyPen", (PyCFunction) _wrap_delete_PyPen, METH_VARARGS | METH_KEYWORDS }, - { (char *)"PyPen_SetDashes", (PyCFunction) _wrap_PyPen_SetDashes, METH_VARARGS | METH_KEYWORDS }, - { (char *)"PyPen_swigregister", PyPen_swigregister, METH_VARARGS }, { (char *)"new_Brush", (PyCFunction) _wrap_new_Brush, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_Brush", (PyCFunction) _wrap_delete_Brush, METH_VARARGS | METH_KEYWORDS }, { (char *)"Brush_SetColour", (PyCFunction) _wrap_Brush_SetColour, METH_VARARGS | METH_KEYWORDS }, @@ -19044,11 +18984,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"Brush_swigregister", Brush_swigregister, METH_VARARGS }, { (char *)"new_Bitmap", (PyCFunction) _wrap_new_Bitmap, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_Bitmap", (PyCFunction) _wrap_delete_Bitmap, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_EmptyBitmap", (PyCFunction) _wrap_new_EmptyBitmap, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_BitmapFromIcon", (PyCFunction) _wrap_new_BitmapFromIcon, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_BitmapFromImage", (PyCFunction) _wrap_new_BitmapFromImage, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_BitmapFromXPMData", (PyCFunction) _wrap_new_BitmapFromXPMData, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_BitmapFromBits", (PyCFunction) _wrap_new_BitmapFromBits, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_EmptyBitmap", _wrap_new_EmptyBitmap, METH_VARARGS }, { (char *)"Bitmap_SetPalette", (PyCFunction) _wrap_Bitmap_SetPalette, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_GetHandle", (PyCFunction) _wrap_Bitmap_GetHandle, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_SetHandle", (PyCFunction) _wrap_Bitmap_SetHandle, METH_VARARGS | METH_KEYWORDS }, @@ -19308,43 +19248,47 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_DC", (PyCFunction) _wrap_delete_DC, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_BeginDrawing", (PyCFunction) _wrap_DC_BeginDrawing, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_EndDrawing", (PyCFunction) _wrap_DC_EndDrawing, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_FloodFillXY", (PyCFunction) _wrap_DC_FloodFillXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_FloodFill", (PyCFunction) _wrap_DC_FloodFill, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_GetPixelXY", (PyCFunction) _wrap_DC_GetPixelXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_FloodFillPoint", (PyCFunction) _wrap_DC_FloodFillPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetPixel", (PyCFunction) _wrap_DC_GetPixel, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawLineXY", (PyCFunction) _wrap_DC_DrawLineXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_GetPixelPoint", (PyCFunction) _wrap_DC_GetPixelPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawLine", (PyCFunction) _wrap_DC_DrawLine, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_CrossHairXY", (PyCFunction) _wrap_DC_CrossHairXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawLinePoint", (PyCFunction) _wrap_DC_DrawLinePoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_CrossHair", (PyCFunction) _wrap_DC_CrossHair, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawArcXY", (PyCFunction) _wrap_DC_DrawArcXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_CrossHairPoint", (PyCFunction) _wrap_DC_CrossHairPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawArc", (PyCFunction) _wrap_DC_DrawArc, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawCheckMarkXY", (PyCFunction) _wrap_DC_DrawCheckMarkXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawArcPoint", (PyCFunction) _wrap_DC_DrawArcPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawCheckMark", (PyCFunction) _wrap_DC_DrawCheckMark, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawEllipticArcXY", (PyCFunction) _wrap_DC_DrawEllipticArcXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawCheckMarkRect", (PyCFunction) _wrap_DC_DrawCheckMarkRect, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawEllipticArc", (PyCFunction) _wrap_DC_DrawEllipticArc, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawPointXY", (PyCFunction) _wrap_DC_DrawPointXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawEllipticArcPointSize", (PyCFunction) _wrap_DC_DrawEllipticArcPointSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawPoint", (PyCFunction) _wrap_DC_DrawPoint, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawRectangleXY", (PyCFunction) _wrap_DC_DrawRectangleXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawPointPoint", (PyCFunction) _wrap_DC_DrawPointPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawRectangle", (PyCFunction) _wrap_DC_DrawRectangle, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawRectangleRect", (PyCFunction) _wrap_DC_DrawRectangleRect, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawRoundedRectangleXY", (PyCFunction) _wrap_DC_DrawRoundedRectangleXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawRectanglePointSize", (PyCFunction) _wrap_DC_DrawRectanglePointSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawRoundedRectangle", (PyCFunction) _wrap_DC_DrawRoundedRectangle, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawRoundedRectangleRect", (PyCFunction) _wrap_DC_DrawRoundedRectangleRect, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawCircleXY", (PyCFunction) _wrap_DC_DrawCircleXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawRoundedRectanglePointSize", (PyCFunction) _wrap_DC_DrawRoundedRectanglePointSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawCircle", (PyCFunction) _wrap_DC_DrawCircle, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawEllipseXY", (PyCFunction) _wrap_DC_DrawEllipseXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawCirclePoint", (PyCFunction) _wrap_DC_DrawCirclePoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawEllipse", (PyCFunction) _wrap_DC_DrawEllipse, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawEllipseRect", (PyCFunction) _wrap_DC_DrawEllipseRect, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawIconXY", (PyCFunction) _wrap_DC_DrawIconXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawEllipsePointSize", (PyCFunction) _wrap_DC_DrawEllipsePointSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawIcon", (PyCFunction) _wrap_DC_DrawIcon, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawBitmapXY", (PyCFunction) _wrap_DC_DrawBitmapXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawIconPoint", (PyCFunction) _wrap_DC_DrawIconPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawBitmap", (PyCFunction) _wrap_DC_DrawBitmap, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawTextXY", (PyCFunction) _wrap_DC_DrawTextXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawBitmapPoint", (PyCFunction) _wrap_DC_DrawBitmapPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawText", (PyCFunction) _wrap_DC_DrawText, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_DrawRotatedTextXY", (PyCFunction) _wrap_DC_DrawRotatedTextXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawTextPoint", (PyCFunction) _wrap_DC_DrawTextPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawRotatedText", (PyCFunction) _wrap_DC_DrawRotatedText, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_BlitXY", (PyCFunction) _wrap_DC_BlitXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_DrawRotatedTextPoint", (PyCFunction) _wrap_DC_DrawRotatedTextPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_Blit", (PyCFunction) _wrap_DC_Blit, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_BlitPointSize", (PyCFunction) _wrap_DC_BlitPointSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_SetClippingRect", (PyCFunction) _wrap_DC_SetClippingRect, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawLines", (PyCFunction) _wrap_DC_DrawLines, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawPolygon", (PyCFunction) _wrap_DC_DrawPolygon, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DrawLabel", (PyCFunction) _wrap_DC_DrawLabel, METH_VARARGS | METH_KEYWORDS }, @@ -19361,10 +19305,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"DC_SetBackground", (PyCFunction) _wrap_DC_SetBackground, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetBackgroundMode", (PyCFunction) _wrap_DC_SetBackgroundMode, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetPalette", (PyCFunction) _wrap_DC_SetPalette, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_SetClippingRegionXY", (PyCFunction) _wrap_DC_SetClippingRegionXY, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_SetClippingRect", (PyCFunction) _wrap_DC_SetClippingRect, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DestroyClippingRegion", (PyCFunction) _wrap_DC_DestroyClippingRegion, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetClippingBox", (PyCFunction) _wrap_DC_GetClippingBox, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetClippingRect", (PyCFunction) _wrap_DC_GetClippingRect, METH_VARARGS | METH_KEYWORDS }, @@ -19409,15 +19349,18 @@ static PyMethodDef SwigMethods[] = { { (char *)"DC_GetLogicalOrigin", (PyCFunction) _wrap_DC_GetLogicalOrigin, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetLogicalOriginTuple", (PyCFunction) _wrap_DC_GetLogicalOriginTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetLogicalOrigin", (PyCFunction) _wrap_DC_SetLogicalOrigin, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_SetLogicalOriginPoint", (PyCFunction) _wrap_DC_SetLogicalOriginPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetDeviceOrigin", (PyCFunction) _wrap_DC_GetDeviceOrigin, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetDeviceOriginTuple", (PyCFunction) _wrap_DC_GetDeviceOriginTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetDeviceOrigin", (PyCFunction) _wrap_DC_SetDeviceOrigin, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_SetDeviceOriginPoint", (PyCFunction) _wrap_DC_SetDeviceOriginPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetAxisOrientation", (PyCFunction) _wrap_DC_SetAxisOrientation, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetLogicalFunction", (PyCFunction) _wrap_DC_GetLogicalFunction, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetLogicalFunction", (PyCFunction) _wrap_DC_SetLogicalFunction, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetOptimization", (PyCFunction) _wrap_DC_SetOptimization, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetOptimization", (PyCFunction) _wrap_DC_GetOptimization, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_CalcBoundingBox", (PyCFunction) _wrap_DC_CalcBoundingBox, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_CalcBoundingBoxPoint", (PyCFunction) _wrap_DC_CalcBoundingBoxPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_ResetBoundingBox", (PyCFunction) _wrap_DC_ResetBoundingBox, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_MinX", (PyCFunction) _wrap_DC_MinX, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_MaxX", (PyCFunction) _wrap_DC_MaxX, METH_VARARGS | METH_KEYWORDS }, @@ -19794,9 +19737,6 @@ static void *_p_wxMetaFileDCTo_p_wxObject(void *x) { static void *_p_wxBrushListTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxBrushList *) x)); } -static void *_p_wxPyPenTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxGDIObject *)(wxPen *) ((wxPyPen *) x)); -} static void *_p_wxFileSystemTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxFileSystem *) x)); } @@ -19899,9 +19839,6 @@ static void *_p_wxPostScriptDCTo_p_wxDC(void *x) { static void *_p_wxPrinterDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxPrinterDC *) x)); } -static void *_p_wxPyPenTo_p_wxGDIObject(void *x) { - return (void *)((wxGDIObject *) (wxPen *) ((wxPyPen *) x)); -} static void *_p_wxIconTo_p_wxGDIObject(void *x) { return (void *)((wxGDIObject *) ((wxIcon *) x)); } @@ -19926,9 +19863,6 @@ static void *_p_wxRegionTo_p_wxGDIObject(void *x) { static void *_p_wxBrushTo_p_wxGDIObject(void *x) { return (void *)((wxGDIObject *) ((wxBrush *) x)); } -static void *_p_wxPyPenTo_p_wxPen(void *x) { - return (void *)((wxPen *) ((wxPyPen *) x)); -} static swig_type_info _swigt__p_wxPostScriptDC[] = {{"_p_wxPostScriptDC", 0, "wxPostScriptDC *", 0, 0, 0, 0},{"_p_wxPostScriptDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBrush[] = {{"_p_wxBrush", 0, "wxBrush *", 0, 0, 0, 0},{"_p_wxBrush", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -19951,7 +19885,7 @@ static swig_type_info _swigt__p_wxEffects[] = {{"_p_wxEffects", 0, "wxEffects *" static swig_type_info _swigt__p_wxNativeEncodingInfo[] = {{"_p_wxNativeEncodingInfo", 0, "wxNativeEncodingInfo *", 0, 0, 0, 0},{"_p_wxNativeEncodingInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPalette[] = {{"_p_wxPalette", 0, "wxPalette *", 0, 0, 0, 0},{"_p_wxPalette", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0, 0, 0, 0},{"_p_wxBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRegionIterator", _p_wxRegionIteratorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPen", _p_wxPenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDatabase", _p_wxColourDatabaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPenList", _p_wxPenListTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMask", _p_wxMaskTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFont", _p_wxFontTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxClientDC", _p_wxClientDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMemoryDC", _p_wxMemoryDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRegion", _p_wxRegionTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDC", _p_wxDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIcon", _p_wxIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDC", _p_wxWindowDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGDIObject", _p_wxGDIObjectTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEffects", _p_wxEffectsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPostScriptDC", _p_wxPostScriptDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintDC", _p_wxPaintDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinterDC", _p_wxPrinterDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScreenDC", _p_wxScreenDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPalette", _p_wxPaletteTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageList", _p_wxImageListTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCursor", _p_wxCursorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxMirrorDC", _p_wxMirrorDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEncodingConverter", _p_wxEncodingConverterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMetaFileDC", _p_wxMetaFileDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBrushList", _p_wxBrushListTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPen", _p_wxPyPenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBitmap", _p_wxBitmapTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBrush", _p_wxBrushTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMetaFile", _p_wxMetaFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColour", _p_wxColourTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontList", _p_wxFontListTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRegionIterator", _p_wxRegionIteratorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPen", _p_wxPenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDatabase", _p_wxColourDatabaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPenList", _p_wxPenListTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMask", _p_wxMaskTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFont", _p_wxFontTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxClientDC", _p_wxClientDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMemoryDC", _p_wxMemoryDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRegion", _p_wxRegionTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDC", _p_wxDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIcon", _p_wxIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDC", _p_wxWindowDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGDIObject", _p_wxGDIObjectTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEffects", _p_wxEffectsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPostScriptDC", _p_wxPostScriptDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintDC", _p_wxPaintDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinterDC", _p_wxPrinterDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScreenDC", _p_wxScreenDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPalette", _p_wxPaletteTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageList", _p_wxImageListTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCursor", _p_wxCursorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxMirrorDC", _p_wxMirrorDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEncodingConverter", _p_wxEncodingConverterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMetaFileDC", _p_wxMetaFileDCTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBrushList", _p_wxBrushListTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBitmap", _p_wxBitmapTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBrush", _p_wxBrushTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMetaFile", _p_wxMetaFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColour", _p_wxColourTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontList", _p_wxFontListTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxRegionIterator[] = {{"_p_wxRegionIterator", 0, "wxRegionIterator *", 0, 0, 0, 0},{"_p_wxRegionIterator", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0, 0, 0, 0},{"_p_wxRect", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0, 0, 0, 0},{"_p_wxString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -19965,21 +19899,20 @@ static swig_type_info _swigt__p_wxClientDC[] = {{"_p_wxClientDC", 0, "wxClientDC static swig_type_info _swigt__p_wxBufferedDC[] = {{"_p_wxBufferedDC", 0, "wxBufferedDC *", 0, 0, 0, 0},{"_p_wxBufferedDC", 0, 0, 0, 0, 0, 0},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxBufferedDC, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxImageList[] = {{"_p_wxImageList", 0, "wxImageList *", 0, 0, 0, 0},{"_p_wxImageList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{"_p_byte", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxGDIObject[] = {{"_p_wxGDIObject", 0, "wxGDIObject *", 0, 0, 0, 0},{"_p_wxIcon", _p_wxIconTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxPyPen", _p_wxPyPenTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxPen", _p_wxPenTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxFont", _p_wxFontTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxPalette", _p_wxPaletteTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxGDIObject", 0, 0, 0, 0, 0, 0},{"_p_wxCursor", _p_wxCursorTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxBitmap", _p_wxBitmapTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxRegion", _p_wxRegionTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxBrush", _p_wxBrushTo_p_wxGDIObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxGDIObject[] = {{"_p_wxGDIObject", 0, "wxGDIObject *", 0, 0, 0, 0},{"_p_wxIcon", _p_wxIconTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxPen", _p_wxPenTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxFont", _p_wxFontTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxPalette", _p_wxPaletteTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxGDIObject", 0, 0, 0, 0, 0, 0},{"_p_wxCursor", _p_wxCursorTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxBitmap", _p_wxBitmapTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxRegion", _p_wxRegionTo_p_wxGDIObject, 0, 0, 0, 0, 0},{"_p_wxBrush", _p_wxBrushTo_p_wxGDIObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxIcon[] = {{"_p_wxIcon", 0, "wxIcon *", 0, 0, 0, 0},{"_p_wxIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxLocale[] = {{"_p_wxLocale", 0, "wxLocale *", 0, 0, 0, 0},{"_p_wxLocale", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxRegion[] = {{"_p_wxRegion", 0, "wxRegion *", 0, 0, 0, 0},{"_p_wxRegion", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxConfigBase[] = {{"_p_wxConfigBase", 0, "wxConfigBase *", 0, 0, 0, 0},{"_p_wxConfigBase", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxLanguageInfo[] = {{"_p_wxLanguageInfo", 0, "wxLanguageInfo *", 0, 0, 0, 0},{"_p_wxLanguageInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxConfigBase[] = {{"_p_wxConfigBase", 0, "wxConfigBase *", 0, 0, 0, 0},{"_p_wxConfigBase", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxWindowDC[] = {{"_p_wxWindowDC", 0, "wxWindowDC *", 0, 0, 0, 0},{"_p_wxWindowDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrintData[] = {{"_p_wxPrintData", 0, "wxPrintData *", 0, 0, 0, 0},{"_p_wxPrintData", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBrushList[] = {{"_p_wxBrushList", 0, "wxBrushList *", 0, 0, 0, 0},{"_p_wxBrushList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxFontList[] = {{"_p_wxFontList", 0, "wxFontList *", 0, 0, 0, 0},{"_p_wxFontList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxPen[] = {{"_p_wxPen", 0, "wxPen *", 0, 0, 0, 0},{"_p_wxPyPen", _p_wxPyPenTo_p_wxPen, 0, 0, 0, 0, 0},{"_p_wxPen", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPen[] = {{"_p_wxPen", 0, "wxPen *", 0, 0, 0, 0},{"_p_wxPen", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBufferedPaintDC[] = {{"_p_wxBufferedPaintDC", 0, "wxBufferedPaintDC *", 0, 0, 0, 0},{"_p_wxBufferedPaintDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPaintDC[] = {{"_p_wxPaintDC", 0, "wxPaintDC *", 0, 0, 0, 0},{"_p_wxPaintDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPenList[] = {{"_p_wxPenList", 0, "wxPenList *", 0, 0, 0, 0},{"_p_wxPenList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxPyPen[] = {{"_p_wxPyPen", 0, "wxPyPen *", 0, 0, 0, 0},{"_p_wxPyPen", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMetaFile[] = {{"_p_wxMetaFile", 0, "wxMetaFile *", 0, 0, 0, 0},{"_p_wxMetaFile", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxNativeFontInfo[] = {{"_p_wxNativeFontInfo", 0, "wxNativeFontInfo *", 0, 0, 0, 0},{"_p_wxNativeFontInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -20027,8 +19960,8 @@ _swigt__p_wxGDIObject, _swigt__p_wxIcon, _swigt__p_wxLocale, _swigt__p_wxRegion, -_swigt__p_wxConfigBase, _swigt__p_wxLanguageInfo, +_swigt__p_wxConfigBase, _swigt__p_wxWindowDC, _swigt__p_wxPrintData, _swigt__p_wxBrushList, @@ -20037,7 +19970,6 @@ _swigt__p_wxPen, _swigt__p_wxBufferedPaintDC, _swigt__p_wxPaintDC, _swigt__p_wxPenList, -_swigt__p_wxPyPen, _swigt__p_int, _swigt__p_wxMetaFile, _swigt__p_wxNativeFontInfo, diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index dd18159de4..d233be32fd 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -5,7 +5,6 @@ import _misc_ import _core wx = _core -__docfilter__ = wx.__docfilter__ #--------------------------------------------------------------------------- SYS_OEM_FIXED_FONT = _misc_.SYS_OEM_FIXED_FONT @@ -104,32 +103,32 @@ class SystemSettings(object): def __repr__(self): return "<%s.%s; proxy of C++ wxSystemSettings instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def GetColour(*args, **kwargs): - """SystemSettings.GetColour(int index) -> Colour""" + """GetColour(int index) -> Colour""" return _misc_.SystemSettings_GetColour(*args, **kwargs) GetColour = staticmethod(GetColour) def GetFont(*args, **kwargs): - """SystemSettings.GetFont(int index) -> Font""" + """GetFont(int index) -> Font""" return _misc_.SystemSettings_GetFont(*args, **kwargs) GetFont = staticmethod(GetFont) def GetMetric(*args, **kwargs): - """SystemSettings.GetMetric(int index) -> int""" + """GetMetric(int index) -> int""" return _misc_.SystemSettings_GetMetric(*args, **kwargs) GetMetric = staticmethod(GetMetric) def HasFeature(*args, **kwargs): - """SystemSettings.HasFeature(int index) -> bool""" + """HasFeature(int index) -> bool""" return _misc_.SystemSettings_HasFeature(*args, **kwargs) HasFeature = staticmethod(HasFeature) def GetScreenType(*args, **kwargs): - """SystemSettings.GetScreenType() -> int""" + """GetScreenType() -> int""" return _misc_.SystemSettings_GetScreenType(*args, **kwargs) GetScreenType = staticmethod(GetScreenType) def SetScreenType(*args, **kwargs): - """SystemSettings.SetScreenType(int screen)""" + """SetScreenType(int screen)""" return _misc_.SystemSettings_SetScreenType(*args, **kwargs) SetScreenType = staticmethod(SetScreenType) @@ -175,27 +174,27 @@ class SystemOptions(_core.Object): self.thisown = 1 del newobj.thisown def SetOption(*args, **kwargs): - """SystemOptions.SetOption(String name, String value)""" + """SetOption(String name, String value)""" return _misc_.SystemOptions_SetOption(*args, **kwargs) SetOption = staticmethod(SetOption) def SetOptionInt(*args, **kwargs): - """SystemOptions.SetOptionInt(String name, int value)""" + """SetOptionInt(String name, int value)""" return _misc_.SystemOptions_SetOptionInt(*args, **kwargs) SetOptionInt = staticmethod(SetOptionInt) def GetOption(*args, **kwargs): - """SystemOptions.GetOption(String name) -> String""" + """GetOption(String name) -> String""" return _misc_.SystemOptions_GetOption(*args, **kwargs) GetOption = staticmethod(GetOption) def GetOptionInt(*args, **kwargs): - """SystemOptions.GetOptionInt(String name) -> int""" + """GetOptionInt(String name) -> int""" return _misc_.SystemOptions_GetOptionInt(*args, **kwargs) GetOptionInt = staticmethod(GetOptionInt) def HasOption(*args, **kwargs): - """SystemOptions.HasOption(String name) -> bool""" + """HasOption(String name) -> bool""" return _misc_.SystemOptions_HasOption(*args, **kwargs) HasOption = staticmethod(HasOption) @@ -554,12 +553,12 @@ class ToolTip(_core.Object): return _misc_.ToolTip_GetWindow(*args, **kwargs) def Enable(*args, **kwargs): - """ToolTip.Enable(bool flag)""" + """Enable(bool flag)""" return _misc_.ToolTip_Enable(*args, **kwargs) Enable = staticmethod(Enable) def SetDelay(*args, **kwargs): - """ToolTip.SetDelay(long milliseconds)""" + """SetDelay(long milliseconds)""" return _misc_.ToolTip_SetDelay(*args, **kwargs) SetDelay = staticmethod(SetDelay) @@ -1095,17 +1094,17 @@ class Log(object): self.thisown = 1 del newobj.thisown def IsEnabled(*args, **kwargs): - """Log.IsEnabled() -> bool""" + """IsEnabled() -> bool""" return _misc_.Log_IsEnabled(*args, **kwargs) IsEnabled = staticmethod(IsEnabled) def EnableLogging(*args, **kwargs): - """Log.EnableLogging(bool doIt=True) -> bool""" + """EnableLogging(bool doIt=True) -> bool""" return _misc_.Log_EnableLogging(*args, **kwargs) EnableLogging = staticmethod(EnableLogging) def OnLog(*args, **kwargs): - """Log.OnLog(wxLogLevel level, wxChar szString, time_t t)""" + """OnLog(wxLogLevel level, wxChar szString, time_t t)""" return _misc_.Log_OnLog(*args, **kwargs) OnLog = staticmethod(OnLog) @@ -1114,102 +1113,102 @@ class Log(object): return _misc_.Log_Flush(*args, **kwargs) def FlushActive(*args, **kwargs): - """Log.FlushActive()""" + """FlushActive()""" return _misc_.Log_FlushActive(*args, **kwargs) FlushActive = staticmethod(FlushActive) def GetActiveTarget(*args, **kwargs): - """Log.GetActiveTarget() -> Log""" + """GetActiveTarget() -> Log""" return _misc_.Log_GetActiveTarget(*args, **kwargs) GetActiveTarget = staticmethod(GetActiveTarget) def SetActiveTarget(*args, **kwargs): - """Log.SetActiveTarget(Log pLogger) -> Log""" + """SetActiveTarget(Log pLogger) -> Log""" return _misc_.Log_SetActiveTarget(*args, **kwargs) SetActiveTarget = staticmethod(SetActiveTarget) def Suspend(*args, **kwargs): - """Log.Suspend()""" + """Suspend()""" return _misc_.Log_Suspend(*args, **kwargs) Suspend = staticmethod(Suspend) def Resume(*args, **kwargs): - """Log.Resume()""" + """Resume()""" return _misc_.Log_Resume(*args, **kwargs) Resume = staticmethod(Resume) def SetVerbose(*args, **kwargs): - """Log.SetVerbose(bool bVerbose=True)""" + """SetVerbose(bool bVerbose=True)""" return _misc_.Log_SetVerbose(*args, **kwargs) SetVerbose = staticmethod(SetVerbose) def SetLogLevel(*args, **kwargs): - """Log.SetLogLevel(wxLogLevel logLevel)""" + """SetLogLevel(wxLogLevel logLevel)""" return _misc_.Log_SetLogLevel(*args, **kwargs) SetLogLevel = staticmethod(SetLogLevel) def DontCreateOnDemand(*args, **kwargs): - """Log.DontCreateOnDemand()""" + """DontCreateOnDemand()""" return _misc_.Log_DontCreateOnDemand(*args, **kwargs) DontCreateOnDemand = staticmethod(DontCreateOnDemand) def SetTraceMask(*args, **kwargs): - """Log.SetTraceMask(wxTraceMask ulMask)""" + """SetTraceMask(wxTraceMask ulMask)""" return _misc_.Log_SetTraceMask(*args, **kwargs) SetTraceMask = staticmethod(SetTraceMask) def AddTraceMask(*args, **kwargs): - """Log.AddTraceMask(String str)""" + """AddTraceMask(String str)""" return _misc_.Log_AddTraceMask(*args, **kwargs) AddTraceMask = staticmethod(AddTraceMask) def RemoveTraceMask(*args, **kwargs): - """Log.RemoveTraceMask(String str)""" + """RemoveTraceMask(String str)""" return _misc_.Log_RemoveTraceMask(*args, **kwargs) RemoveTraceMask = staticmethod(RemoveTraceMask) def ClearTraceMasks(*args, **kwargs): - """Log.ClearTraceMasks()""" + """ClearTraceMasks()""" return _misc_.Log_ClearTraceMasks(*args, **kwargs) ClearTraceMasks = staticmethod(ClearTraceMasks) def GetTraceMasks(*args, **kwargs): - """Log.GetTraceMasks() -> wxArrayString""" + """GetTraceMasks() -> wxArrayString""" return _misc_.Log_GetTraceMasks(*args, **kwargs) GetTraceMasks = staticmethod(GetTraceMasks) def SetTimestamp(*args, **kwargs): - """Log.SetTimestamp(wxChar ts)""" + """SetTimestamp(wxChar ts)""" return _misc_.Log_SetTimestamp(*args, **kwargs) SetTimestamp = staticmethod(SetTimestamp) def GetVerbose(*args, **kwargs): - """Log.GetVerbose() -> bool""" + """GetVerbose() -> bool""" return _misc_.Log_GetVerbose(*args, **kwargs) GetVerbose = staticmethod(GetVerbose) def GetTraceMask(*args, **kwargs): - """Log.GetTraceMask() -> wxTraceMask""" + """GetTraceMask() -> wxTraceMask""" return _misc_.Log_GetTraceMask(*args, **kwargs) GetTraceMask = staticmethod(GetTraceMask) def IsAllowedTraceMask(*args, **kwargs): - """Log.IsAllowedTraceMask(wxChar mask) -> bool""" + """IsAllowedTraceMask(wxChar mask) -> bool""" return _misc_.Log_IsAllowedTraceMask(*args, **kwargs) IsAllowedTraceMask = staticmethod(IsAllowedTraceMask) def GetLogLevel(*args, **kwargs): - """Log.GetLogLevel() -> wxLogLevel""" + """GetLogLevel() -> wxLogLevel""" return _misc_.Log_GetLogLevel(*args, **kwargs) GetLogLevel = staticmethod(GetLogLevel) def GetTimestamp(*args, **kwargs): - """Log.GetTimestamp() -> wxChar""" + """GetTimestamp() -> wxChar""" return _misc_.Log_GetTimestamp(*args, **kwargs) GetTimestamp = staticmethod(GetTimestamp) def TimeStamp(*args, **kwargs): - """Log.TimeStamp() -> String""" + """TimeStamp() -> String""" return _misc_.Log_TimeStamp(*args, **kwargs) TimeStamp = staticmethod(TimeStamp) @@ -1577,17 +1576,17 @@ class Process(_core.EvtHandler): def __repr__(self): return "<%s.%s; proxy of C++ wxPyProcess instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def Kill(*args, **kwargs): - """Process.Kill(int pid, int sig=SIGTERM) -> int""" + """Kill(int pid, int sig=SIGTERM) -> int""" return _misc_.Process_Kill(*args, **kwargs) Kill = staticmethod(Kill) def Exists(*args, **kwargs): - """Process.Exists(int pid) -> bool""" + """Exists(int pid) -> bool""" return _misc_.Process_Exists(*args, **kwargs) Exists = staticmethod(Exists) def Open(*args, **kwargs): - """Process.Open(String cmd, int flags=EXEC_ASYNC) -> Process""" + """Open(String cmd, int flags=EXEC_ASYNC) -> Process""" return _misc_.Process_Open(*args, **kwargs) Open = staticmethod(Open) @@ -2051,12 +2050,12 @@ class Sound(object): return _misc_.Sound_Play(*args) def PlaySound(*args): - """Sound.PlaySound(String filename, unsigned int flags=SOUND_ASYNC) -> bool""" + """PlaySound(String filename, unsigned int flags=SOUND_ASYNC) -> bool""" return _misc_.Sound_PlaySound(*args) PlaySound = staticmethod(PlaySound) def Stop(*args, **kwargs): - """Sound.Stop()""" + """Stop()""" return _misc_.Sound_Stop(*args, **kwargs) Stop = staticmethod(Stop) @@ -2225,7 +2224,7 @@ class FileType(object): return _misc_.FileType_Unassociate(*args, **kwargs) def ExpandCommand(*args, **kwargs): - """FileType.ExpandCommand(String command, String filename, String mimetype=EmptyString) -> String""" + """ExpandCommand(String command, String filename, String mimetype=EmptyString) -> String""" return _misc_.FileType_ExpandCommand(*args, **kwargs) ExpandCommand = staticmethod(ExpandCommand) @@ -2245,7 +2244,7 @@ class MimeTypesManager(object): def __repr__(self): return "<%s.%s; proxy of C++ wxMimeTypesManager instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def IsOfType(*args, **kwargs): - """MimeTypesManager.IsOfType(String mimeType, String wildcard) -> bool""" + """IsOfType(String mimeType, String wildcard) -> bool""" return _misc_.MimeTypesManager_IsOfType(*args, **kwargs) IsOfType = staticmethod(IsOfType) @@ -2317,10 +2316,173 @@ def MimeTypesManager_IsOfType(*args, **kwargs): #--------------------------------------------------------------------------- class ArtProvider(object): + """ + The wx.ArtProvider class is used to customize the look of wxWidgets + application. When wxWidgets needs to display an icon or a bitmap (e.g. + in the standard file dialog), it does not use hard-coded resource but + asks wx.ArtProvider for it instead. This way the users can plug in + their own wx.ArtProvider class and easily replace standard art with + his/her own version. It is easy thing to do: all that is needed is + to derive a class from wx.ArtProvider, override it's CreateBitmap + method and register the provider with wx.ArtProvider.PushProvider:: + + class MyArtProvider(wx.ArtProvider): + def __init__(self): + wx.ArtProvider.__init__(self) + + def CreateBitmap(self, artid, client, size): + ... + return bmp + + + Identifying art resources + ------------------------- + + Every bitmap is known to wx.ArtProvider under an unique ID that is + used when requesting a resource from it. The IDs can have one of these + predefined values: + + * wx.ART_ADD_BOOKMARK + * wx.ART_DEL_BOOKMARK + * wx.ART_HELP_SIDE_PANEL + * wx.ART_HELP_SETTINGS + * wx.ART_HELP_BOOK + * wx.ART_HELP_FOLDER + * wx.ART_HELP_PAGE + * wx.ART_GO_BACK + * wx.ART_GO_FORWARD + * wx.ART_GO_UP + * wx.ART_GO_DOWN + * wx.ART_GO_TO_PARENT + * wx.ART_GO_HOME + * wx.ART_FILE_OPEN + * wx.ART_PRINT + * wx.ART_HELP + * wx.ART_TIP + * wx.ART_REPORT_VIEW + * wx.ART_LIST_VIEW + * wx.ART_NEW_DIR + * wx.ART_FOLDER + * wx.ART_GO_DIR_UP + * wx.ART_EXECUTABLE_FILE + * wx.ART_NORMAL_FILE + * wx.ART_TICK_MARK + * wx.ART_CROSS_MARK + * wx.ART_ERROR + * wx.ART_QUESTION + * wx.ART_WARNING + * wx.ART_INFORMATION + * wx.ART_MISSING_IMAGE + + + Clients + ------- + + The Client is the entity that calls wx.ArtProvider's `GetBitmap` or + `GetIcon` function. Client IDs server as a hint to wx.ArtProvider + that is supposed to help it to choose the best looking bitmap. For + example it is often desirable to use slightly different icons in menus + and toolbars even though they represent the same action (e.g. + wx.ART_FILE_OPEN). Remember that this is really only a hint for + wx.ArtProvider -- it is common that `wx.ArtProvider.GetBitmap` returns + identical bitmap for different client values! + + * wx.ART_TOOLBAR + * wx.ART_MENU + * wx.ART_FRAME_ICON + * wx.ART_CMN_DIALOG + * wx.ART_HELP_BROWSER + * wx.ART_MESSAGE_BOX + * wx.ART_OTHER (used for all requests that don't fit into any + of the categories above) + + """ def __repr__(self): return "<%s.%s; proxy of C++ wxPyArtProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(self) -> ArtProvider""" + """ + __init__(self) -> ArtProvider + + The wx.ArtProvider class is used to customize the look of wxWidgets + application. When wxWidgets needs to display an icon or a bitmap (e.g. + in the standard file dialog), it does not use hard-coded resource but + asks wx.ArtProvider for it instead. This way the users can plug in + their own wx.ArtProvider class and easily replace standard art with + his/her own version. It is easy thing to do: all that is needed is + to derive a class from wx.ArtProvider, override it's CreateBitmap + method and register the provider with wx.ArtProvider.PushProvider:: + + class MyArtProvider(wx.ArtProvider): + def __init__(self): + wx.ArtProvider.__init__(self) + + def CreateBitmap(self, artid, client, size): + ... + return bmp + + + Identifying art resources + ------------------------- + + Every bitmap is known to wx.ArtProvider under an unique ID that is + used when requesting a resource from it. The IDs can have one of these + predefined values: + + * wx.ART_ADD_BOOKMARK + * wx.ART_DEL_BOOKMARK + * wx.ART_HELP_SIDE_PANEL + * wx.ART_HELP_SETTINGS + * wx.ART_HELP_BOOK + * wx.ART_HELP_FOLDER + * wx.ART_HELP_PAGE + * wx.ART_GO_BACK + * wx.ART_GO_FORWARD + * wx.ART_GO_UP + * wx.ART_GO_DOWN + * wx.ART_GO_TO_PARENT + * wx.ART_GO_HOME + * wx.ART_FILE_OPEN + * wx.ART_PRINT + * wx.ART_HELP + * wx.ART_TIP + * wx.ART_REPORT_VIEW + * wx.ART_LIST_VIEW + * wx.ART_NEW_DIR + * wx.ART_FOLDER + * wx.ART_GO_DIR_UP + * wx.ART_EXECUTABLE_FILE + * wx.ART_NORMAL_FILE + * wx.ART_TICK_MARK + * wx.ART_CROSS_MARK + * wx.ART_ERROR + * wx.ART_QUESTION + * wx.ART_WARNING + * wx.ART_INFORMATION + * wx.ART_MISSING_IMAGE + + + Clients + ------- + + The Client is the entity that calls wx.ArtProvider's `GetBitmap` or + `GetIcon` function. Client IDs server as a hint to wx.ArtProvider + that is supposed to help it to choose the best looking bitmap. For + example it is often desirable to use slightly different icons in menus + and toolbars even though they represent the same action (e.g. + wx.ART_FILE_OPEN). Remember that this is really only a hint for + wx.ArtProvider -- it is common that `wx.ArtProvider.GetBitmap` returns + identical bitmap for different client values! + + * wx.ART_TOOLBAR + * wx.ART_MENU + * wx.ART_FRAME_ICON + * wx.ART_CMN_DIALOG + * wx.ART_HELP_BROWSER + * wx.ART_MESSAGE_BOX + * wx.ART_OTHER (used for all requests that don't fit into any + of the categories above) + + """ newobj = _misc_.new_ArtProvider(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -2333,7 +2495,7 @@ class ArtProvider(object): def PushProvider(*args, **kwargs): """ - ArtProvider.PushProvider(ArtProvider provider) + PushProvider(ArtProvider provider) Add new provider to the top of providers stack. """ @@ -2342,7 +2504,7 @@ class ArtProvider(object): PushProvider = staticmethod(PushProvider) def PopProvider(*args, **kwargs): """ - ArtProvider.PopProvider() -> bool + PopProvider() -> bool Remove latest added provider and delete it. """ @@ -2351,17 +2513,17 @@ class ArtProvider(object): PopProvider = staticmethod(PopProvider) def RemoveProvider(*args, **kwargs): """ - ArtProvider.RemoveProvider(ArtProvider provider) -> bool + RemoveProvider(ArtProvider provider) -> bool - Remove provider. The provider must have been added previously! - The provider is _not_ deleted. + Remove provider. The provider must have been added previously! The + provider is _not_ deleted. """ return _misc_.ArtProvider_RemoveProvider(*args, **kwargs) RemoveProvider = staticmethod(RemoveProvider) def GetBitmap(*args, **kwargs): """ - ArtProvider.GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap + GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap Query the providers for bitmap with given ID and return it. Return wx.NullBitmap if no provider provides it. @@ -2371,9 +2533,9 @@ class ArtProvider(object): GetBitmap = staticmethod(GetBitmap) def GetIcon(*args, **kwargs): """ - ArtProvider.GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -> Icon + GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -> Icon - Query the providers for icon with given ID and return it. Return + Query the providers for icon with given ID and return it. Return wx.NullIcon if no provider provides it. """ return _misc_.ArtProvider_GetIcon(*args, **kwargs) @@ -2449,8 +2611,8 @@ def ArtProvider_RemoveProvider(*args, **kwargs): """ ArtProvider_RemoveProvider(ArtProvider provider) -> bool - Remove provider. The provider must have been added previously! - The provider is _not_ deleted. + Remove provider. The provider must have been added previously! The + provider is _not_ deleted. """ return _misc_.ArtProvider_RemoveProvider(*args, **kwargs) @@ -2467,7 +2629,7 @@ def ArtProvider_GetIcon(*args, **kwargs): """ ArtProvider_GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -> Icon - Query the providers for icon with given ID and return it. Return + Query the providers for icon with given ID and return it. Return wx.NullIcon if no provider provides it. """ return _misc_.ArtProvider_GetIcon(*args, **kwargs) @@ -2516,7 +2678,7 @@ class ConfigBase(object): Type_Float = _misc_.ConfigBase_Type_Float def Set(*args, **kwargs): """ - ConfigBase.Set(ConfigBase config) -> ConfigBase + Set(ConfigBase config) -> ConfigBase Sets the global config object (the one returned by Get) and returns a reference to the previous global config object. @@ -2526,7 +2688,7 @@ class ConfigBase(object): Set = staticmethod(Set) def Get(*args, **kwargs): """ - ConfigBase.Get(bool createOnDemand=True) -> ConfigBase + Get(bool createOnDemand=True) -> ConfigBase Returns the current global config object, creating one if neccessary. """ @@ -2535,7 +2697,7 @@ class ConfigBase(object): Get = staticmethod(Get) def Create(*args, **kwargs): """ - ConfigBase.Create() -> ConfigBase + Create() -> ConfigBase Create and return a new global config object. This function will create the "best" implementation of wx.Config available for the @@ -2546,7 +2708,7 @@ class ConfigBase(object): Create = staticmethod(Create) def DontCreateOnDemand(*args, **kwargs): """ - ConfigBase.DontCreateOnDemand() + DontCreateOnDemand() Should Get() try to create a new log object if there isn't a current one? """ @@ -2777,7 +2939,7 @@ class ConfigBase(object): DeleteAll(self) -> bool Delete the whole underlying object (disk file, registry key, ...) - primarly intended for use by desinstallation routine. + primarly intended for use by deinstallation routine. """ return _misc_.ConfigBase_DeleteAll(*args, **kwargs) @@ -3157,62 +3319,62 @@ class DateTime(object): Monday_First = _misc_.DateTime_Monday_First Sunday_First = _misc_.DateTime_Sunday_First def SetCountry(*args, **kwargs): - """DateTime.SetCountry(int country)""" + """SetCountry(int country)""" return _misc_.DateTime_SetCountry(*args, **kwargs) SetCountry = staticmethod(SetCountry) def GetCountry(*args, **kwargs): - """DateTime.GetCountry() -> int""" + """GetCountry() -> int""" return _misc_.DateTime_GetCountry(*args, **kwargs) GetCountry = staticmethod(GetCountry) def IsWestEuropeanCountry(*args, **kwargs): - """DateTime.IsWestEuropeanCountry(int country=Country_Default) -> bool""" + """IsWestEuropeanCountry(int country=Country_Default) -> bool""" return _misc_.DateTime_IsWestEuropeanCountry(*args, **kwargs) IsWestEuropeanCountry = staticmethod(IsWestEuropeanCountry) def GetCurrentYear(*args, **kwargs): - """DateTime.GetCurrentYear(int cal=Gregorian) -> int""" + """GetCurrentYear(int cal=Gregorian) -> int""" return _misc_.DateTime_GetCurrentYear(*args, **kwargs) GetCurrentYear = staticmethod(GetCurrentYear) def ConvertYearToBC(*args, **kwargs): - """DateTime.ConvertYearToBC(int year) -> int""" + """ConvertYearToBC(int year) -> int""" return _misc_.DateTime_ConvertYearToBC(*args, **kwargs) ConvertYearToBC = staticmethod(ConvertYearToBC) def GetCurrentMonth(*args, **kwargs): - """DateTime.GetCurrentMonth(int cal=Gregorian) -> int""" + """GetCurrentMonth(int cal=Gregorian) -> int""" return _misc_.DateTime_GetCurrentMonth(*args, **kwargs) GetCurrentMonth = staticmethod(GetCurrentMonth) def IsLeapYear(*args, **kwargs): - """DateTime.IsLeapYear(int year=Inv_Year, int cal=Gregorian) -> bool""" + """IsLeapYear(int year=Inv_Year, int cal=Gregorian) -> bool""" return _misc_.DateTime_IsLeapYear(*args, **kwargs) IsLeapYear = staticmethod(IsLeapYear) def GetCentury(*args, **kwargs): - """DateTime.GetCentury(int year=Inv_Year) -> int""" + """GetCentury(int year=Inv_Year) -> int""" return _misc_.DateTime_GetCentury(*args, **kwargs) GetCentury = staticmethod(GetCentury) def GetNumberOfDaysinYear(*args, **kwargs): - """DateTime.GetNumberOfDaysinYear(int year, int cal=Gregorian) -> int""" + """GetNumberOfDaysinYear(int year, int cal=Gregorian) -> int""" return _misc_.DateTime_GetNumberOfDaysinYear(*args, **kwargs) GetNumberOfDaysinYear = staticmethod(GetNumberOfDaysinYear) def GetNumberOfDaysInMonth(*args, **kwargs): - """DateTime.GetNumberOfDaysInMonth(int month, int year=Inv_Year, int cal=Gregorian) -> int""" + """GetNumberOfDaysInMonth(int month, int year=Inv_Year, int cal=Gregorian) -> int""" return _misc_.DateTime_GetNumberOfDaysInMonth(*args, **kwargs) GetNumberOfDaysInMonth = staticmethod(GetNumberOfDaysInMonth) def GetMonthName(*args, **kwargs): - """DateTime.GetMonthName(int month, int flags=Name_Full) -> String""" + """GetMonthName(int month, int flags=Name_Full) -> String""" return _misc_.DateTime_GetMonthName(*args, **kwargs) GetMonthName = staticmethod(GetMonthName) def GetWeekDayName(*args, **kwargs): - """DateTime.GetWeekDayName(int weekday, int flags=Name_Full) -> String""" + """GetWeekDayName(int weekday, int flags=Name_Full) -> String""" return _misc_.DateTime_GetWeekDayName(*args, **kwargs) GetWeekDayName = staticmethod(GetWeekDayName) @@ -3226,32 +3388,32 @@ class DateTime(object): GetAmPmStrings = staticmethod(GetAmPmStrings) def IsDSTApplicable(*args, **kwargs): - """DateTime.IsDSTApplicable(int year=Inv_Year, int country=Country_Default) -> bool""" + """IsDSTApplicable(int year=Inv_Year, int country=Country_Default) -> bool""" return _misc_.DateTime_IsDSTApplicable(*args, **kwargs) IsDSTApplicable = staticmethod(IsDSTApplicable) def GetBeginDST(*args, **kwargs): - """DateTime.GetBeginDST(int year=Inv_Year, int country=Country_Default) -> DateTime""" + """GetBeginDST(int year=Inv_Year, int country=Country_Default) -> DateTime""" return _misc_.DateTime_GetBeginDST(*args, **kwargs) GetBeginDST = staticmethod(GetBeginDST) def GetEndDST(*args, **kwargs): - """DateTime.GetEndDST(int year=Inv_Year, int country=Country_Default) -> DateTime""" + """GetEndDST(int year=Inv_Year, int country=Country_Default) -> DateTime""" return _misc_.DateTime_GetEndDST(*args, **kwargs) GetEndDST = staticmethod(GetEndDST) def Now(*args, **kwargs): - """DateTime.Now() -> DateTime""" + """Now() -> DateTime""" return _misc_.DateTime_Now(*args, **kwargs) Now = staticmethod(Now) def UNow(*args, **kwargs): - """DateTime.UNow() -> DateTime""" + """UNow() -> DateTime""" return _misc_.DateTime_UNow(*args, **kwargs) UNow = staticmethod(UNow) def Today(*args, **kwargs): - """DateTime.Today() -> DateTime""" + """Today() -> DateTime""" return _misc_.DateTime_Today(*args, **kwargs) Today = staticmethod(Today) @@ -3757,52 +3919,52 @@ class TimeSpan(object): def __repr__(self): return "<%s.%s; proxy of C++ wxTimeSpan instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def Seconds(*args, **kwargs): - """TimeSpan.Seconds(long sec) -> TimeSpan""" + """Seconds(long sec) -> TimeSpan""" return _misc_.TimeSpan_Seconds(*args, **kwargs) Seconds = staticmethod(Seconds) def Second(*args, **kwargs): - """TimeSpan.Second() -> TimeSpan""" + """Second() -> TimeSpan""" return _misc_.TimeSpan_Second(*args, **kwargs) Second = staticmethod(Second) def Minutes(*args, **kwargs): - """TimeSpan.Minutes(long min) -> TimeSpan""" + """Minutes(long min) -> TimeSpan""" return _misc_.TimeSpan_Minutes(*args, **kwargs) Minutes = staticmethod(Minutes) def Minute(*args, **kwargs): - """TimeSpan.Minute() -> TimeSpan""" + """Minute() -> TimeSpan""" return _misc_.TimeSpan_Minute(*args, **kwargs) Minute = staticmethod(Minute) def Hours(*args, **kwargs): - """TimeSpan.Hours(long hours) -> TimeSpan""" + """Hours(long hours) -> TimeSpan""" return _misc_.TimeSpan_Hours(*args, **kwargs) Hours = staticmethod(Hours) def Hour(*args, **kwargs): - """TimeSpan.Hour() -> TimeSpan""" + """Hour() -> TimeSpan""" return _misc_.TimeSpan_Hour(*args, **kwargs) Hour = staticmethod(Hour) def Days(*args, **kwargs): - """TimeSpan.Days(long days) -> TimeSpan""" + """Days(long days) -> TimeSpan""" return _misc_.TimeSpan_Days(*args, **kwargs) Days = staticmethod(Days) def Day(*args, **kwargs): - """TimeSpan.Day() -> TimeSpan""" + """Day() -> TimeSpan""" return _misc_.TimeSpan_Day(*args, **kwargs) Day = staticmethod(Day) def Weeks(*args, **kwargs): - """TimeSpan.Weeks(long days) -> TimeSpan""" + """Weeks(long days) -> TimeSpan""" return _misc_.TimeSpan_Weeks(*args, **kwargs) Weeks = staticmethod(Weeks) def Week(*args, **kwargs): - """TimeSpan.Week() -> TimeSpan""" + """Week() -> TimeSpan""" return _misc_.TimeSpan_Week(*args, **kwargs) Week = staticmethod(Week) @@ -4015,42 +4177,42 @@ class DateSpan(object): except: pass def Days(*args, **kwargs): - """DateSpan.Days(int days) -> DateSpan""" + """Days(int days) -> DateSpan""" return _misc_.DateSpan_Days(*args, **kwargs) Days = staticmethod(Days) def Day(*args, **kwargs): - """DateSpan.Day() -> DateSpan""" + """Day() -> DateSpan""" return _misc_.DateSpan_Day(*args, **kwargs) Day = staticmethod(Day) def Weeks(*args, **kwargs): - """DateSpan.Weeks(int weeks) -> DateSpan""" + """Weeks(int weeks) -> DateSpan""" return _misc_.DateSpan_Weeks(*args, **kwargs) Weeks = staticmethod(Weeks) def Week(*args, **kwargs): - """DateSpan.Week() -> DateSpan""" + """Week() -> DateSpan""" return _misc_.DateSpan_Week(*args, **kwargs) Week = staticmethod(Week) def Months(*args, **kwargs): - """DateSpan.Months(int mon) -> DateSpan""" + """Months(int mon) -> DateSpan""" return _misc_.DateSpan_Months(*args, **kwargs) Months = staticmethod(Months) def Month(*args, **kwargs): - """DateSpan.Month() -> DateSpan""" + """Month() -> DateSpan""" return _misc_.DateSpan_Month(*args, **kwargs) Month = staticmethod(Month) def Years(*args, **kwargs): - """DateSpan.Years(int years) -> DateSpan""" + """Years(int years) -> DateSpan""" return _misc_.DateSpan_Years(*args, **kwargs) Years = staticmethod(Years) def Year(*args, **kwargs): - """DateSpan.Year() -> DateSpan""" + """Year() -> DateSpan""" return _misc_.DateSpan_Year(*args, **kwargs) Year = staticmethod(Year) @@ -4861,15 +5023,19 @@ _misc_.FileDropTarget_swigregister(FileDropTargetPtr) class Clipboard(_core.Object): """ - wx.Clipboard represents the system clipboard and provides methods to copy data - to or paste data from it. Normally, you should only use wx.TheClipboard which - is a reference to a global wx.Clipboard instance. + wx.Clipboard represents the system clipboard and provides methods to + copy data to it or paste data from it. Normally, you should only use + ``wx.TheClipboard`` which is a reference to a global wx.Clipboard + instance. + + Call ``wx.TheClipboard``'s `Open` method to get ownership of the + clipboard. If this operation returns True, you now own the + clipboard. Call `SetData` to put data on the clipboard, or `GetData` + to retrieve data from the clipboard. Call `Close` to close the + clipboard and relinquish ownership. You should keep the clipboard open + only momentarily. - Call wx.TheClipboard.Open to get ownership of the clipboard. If this operation - returns True, you now own the clipboard. Call wx.TheClipboard.SetData to put - data on the clipboard, or wx.TheClipboard.GetData to retrieve data from the - clipboard. Call wx.TheClipboard.Close to close the clipboard and relinquish - ownership. You should keep the clipboard open only momentarily. + :see: `wx.DataObject` """ def __repr__(self): @@ -4890,10 +5056,10 @@ class Clipboard(_core.Object): """ Open(self) -> bool - Call this function to open the clipboard before calling SetData - and GetData. Call Close when you have finished with the clipboard. - You should keep the clipboard open for only a very short time. - Returns true on success. + Call this function to open the clipboard before calling SetData and + GetData. Call Close when you have finished with the clipboard. You + should keep the clipboard open for only a very short time. Returns + True on success. """ return _misc_.Clipboard_Open(*args, **kwargs) @@ -4917,10 +5083,12 @@ class Clipboard(_core.Object): """ AddData(self, DataObject data) -> bool - Call this function to add the data object to the clipboard. You - may call this function repeatedly after having cleared the clipboard. + Call this function to add the data object to the clipboard. You may + call this function repeatedly after having cleared the clipboard. After this function has been called, the clipboard owns the data, so do not delete the data explicitly. + + :see: `wx.DataObject` """ return _misc_.Clipboard_AddData(*args, **kwargs) @@ -4928,7 +5096,10 @@ class Clipboard(_core.Object): """ SetData(self, DataObject data) -> bool - Set the clipboard data, this is the same as Clear followed by AddData. + Set the clipboard data, this is the same as `Clear` followed by + `AddData`. + + :see: `wx.DataObject` """ return _misc_.Clipboard_SetData(*args, **kwargs) @@ -4945,8 +5116,8 @@ class Clipboard(_core.Object): """ GetData(self, DataObject data) -> bool - Call this function to fill data with data on the clipboard, if available - in the required format. Returns true on success. + Call this function to fill data with data on the clipboard, if + available in the required format. Returns true on success. """ return _misc_.Clipboard_GetData(*args, **kwargs) @@ -4954,7 +5125,7 @@ class Clipboard(_core.Object): """ Clear(self) - Clears data from the clipboard object and also the system's clipboard + Clears data from the clipboard object and also the system's clipboard if possible. """ return _misc_.Clipboard_Clear(*args, **kwargs) @@ -4964,9 +5135,9 @@ class Clipboard(_core.Object): Flush(self) -> bool Flushes the clipboard: this means that the data which is currently on - clipboard will stay available even after the application exits (possibly - eating memory), otherwise the clipboard will be emptied on exit. - Returns False if the operation is unsuccesful for any reason. + clipboard will stay available even after the application exits, + possibly eating memory, otherwise the clipboard will be emptied on + exit. Returns False if the operation is unsuccesful for any reason. """ return _misc_.Clipboard_Flush(*args, **kwargs) @@ -4974,9 +5145,9 @@ class Clipboard(_core.Object): """ UsePrimarySelection(self, bool primary=True) - On platforms supporting it (the X11 based platforms), selects the so - called PRIMARY SELECTION as the clipboard as opposed to the normal - clipboard, if primary is True. + On platforms supporting it (the X11 based platforms), selects the + so called PRIMARY SELECTION as the clipboard as opposed to the + normal clipboard, if primary is True. """ return _misc_.Clipboard_UsePrimarySelection(*args, **kwargs) @@ -4990,8 +5161,8 @@ _misc_.Clipboard_swigregister(ClipboardPtr) class ClipboardLocker(object): """ - A helpful class for opening the clipboard and automatically closing it when - the locker is destroyed. + A helpful class for opening the clipboard and automatically + closing it when the locker is destroyed. """ def __repr__(self): return "<%s.%s; proxy of C++ wxClipboardLocker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -4999,8 +5170,8 @@ class ClipboardLocker(object): """ __init__(self, Clipboard clipboard=None) -> ClipboardLocker - A helpful class for opening the clipboard and automatically closing it when - the locker is destroyed. + A helpful class for opening the clipboard and automatically + closing it when the locker is destroyed. """ newobj = _misc_.new_ClipboardLocker(*args, **kwargs) self.this = newobj.this @@ -5142,7 +5313,7 @@ class Display(object): def GetCount(*args, **kwargs): """ - Display.GetCount() -> size_t + GetCount() -> size_t Return the number of available displays. """ @@ -5151,7 +5322,7 @@ class Display(object): GetCount = staticmethod(GetCount) def GetFromPoint(*args, **kwargs): """ - Display.GetFromPoint(Point pt) -> int + GetFromPoint(Point pt) -> int Find the display where the given point lies, return wx.NOT_FOUND if it doesn't belong to any display @@ -5161,7 +5332,7 @@ class Display(object): GetFromPoint = staticmethod(GetFromPoint) def GetFromWindow(*args, **kwargs): """ - Display.GetFromWindow(Window window) -> int + GetFromWindow(Window window) -> int Find the display where the given window lies, return wx.NOT_FOUND if it is not shown at all. diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index ec3c79b95d..3c76329bf6 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -5,7 +5,6 @@ import _windows_ import _core wx = _core -__docfilter__ = wx.__docfilter__ #--------------------------------------------------------------------------- class Panel(_core.Window): @@ -1839,6 +1838,10 @@ class HtmlListBox(VListBox): """SetItemCount(self, size_t count)""" return _windows_.HtmlListBox_SetItemCount(*args, **kwargs) + def GetFileSystem(*args, **kwargs): + """GetFileSystem(self) -> FileSystem""" + return _windows_.HtmlListBox_GetFileSystem(*args, **kwargs) + class HtmlListBoxPtr(HtmlListBox): def __init__(self, this): @@ -1942,7 +1945,11 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK ) #--------------------------------------------------------------------------- class ColourData(_core.Object): - """This class holds a variety of information related to colour dialogs.""" + """ + This class holds a variety of information related to the colour + chooser dialog, used to transfer settings and results to and from the + `wx.ColourDialog`. + """ def __repr__(self): return "<%s.%s; proxy of C++ wxColourData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -1965,9 +1972,9 @@ class ColourData(_core.Object): """ GetChooseFull(self) -> bool - Under Windows, determines whether the Windows colour dialog will display - the full dialog with custom colour selection controls. Has no meaning - under other platforms. The default value is true. + Under Windows, determines whether the Windows colour dialog will + display the full dialog with custom colour selection controls. Has no + meaning under other platforms. The default value is true. """ return _windows_.ColourData_GetChooseFull(*args, **kwargs) @@ -1983,8 +1990,9 @@ class ColourData(_core.Object): """ GetCustomColour(self, int i) -> Colour - Gets the i'th custom colour associated with the colour dialog. i should - be an integer between 0 and 15. The default custom colours are all white. + Gets the i'th custom colour associated with the colour dialog. i + should be an integer between 0 and 15. The default custom colours are + all white. """ return _windows_.ColourData_GetCustomColour(*args, **kwargs) @@ -1992,9 +2000,9 @@ class ColourData(_core.Object): """ SetChooseFull(self, int flag) - Under Windows, tells the Windows colour dialog to display the full dialog - with custom colour selection controls. Under other platforms, has no effect. - The default value is true. + Under Windows, tells the Windows colour dialog to display the full + dialog with custom colour selection controls. Under other platforms, + has no effect. The default value is true. """ return _windows_.ColourData_SetChooseFull(*args, **kwargs) @@ -2002,7 +2010,8 @@ class ColourData(_core.Object): """ SetColour(self, Colour colour) - Sets the default colour for the colour dialog. The default colour is black. + Sets the default colour for the colour dialog. The default colour is + black. """ return _windows_.ColourData_SetColour(*args, **kwargs) @@ -2010,8 +2019,8 @@ class ColourData(_core.Object): """ SetCustomColour(self, int i, Colour colour) - Sets the i'th custom colour for the colour dialog. i should be an integer - between 0 and 15. The default custom colours are all white. + Sets the i'th custom colour for the colour dialog. i should be an + integer between 0 and 15. The default custom colours are all white. """ return _windows_.ColourData_SetCustomColour(*args, **kwargs) @@ -2037,8 +2046,9 @@ class ColourDialog(Dialog): """ __init__(self, Window parent, ColourData data=None) -> ColourDialog - Constructor. Pass a parent window, and optionally a ColourData, which - will be copied to the colour dialog's internal ColourData instance. + Constructor. Pass a parent window, and optionally a `wx.ColourData`, + which will be copied to the colour dialog's internal ColourData + instance. """ newobj = _windows_.new_ColourDialog(*args, **kwargs) self.this = newobj.this @@ -2050,7 +2060,7 @@ class ColourDialog(Dialog): """ GetColourData(self) -> ColourData - Returns a reference to the ColourData used by the dialog. + Returns a reference to the `wx.ColourData` used by the dialog. """ return _windows_.ColourDialog_GetColourData(*args, **kwargs) @@ -2063,7 +2073,21 @@ class ColourDialogPtr(ColourDialog): _windows_.ColourDialog_swigregister(ColourDialogPtr) class DirDialog(Dialog): - """This class represents the directory chooser dialog.""" + """ + wx.DirDialog allows the user to select a directory by browising the + file system. + + + Window Styles + -------------- + ==================== ========================================== + wx.DD_NEW_DIR_BUTTON Add 'Create new directory' button and allow + directory names to be editable. On Windows + the new directory button is only available + with recent versions of the common dialogs. + ==================== ========================================== + + """ def __repr__(self): return "<%s.%s; proxy of C++ wxDirDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2130,7 +2154,49 @@ class DirDialogPtr(DirDialog): _windows_.DirDialog_swigregister(DirDialogPtr) class FileDialog(Dialog): - """This class represents the file chooser dialog.""" + """ + wx.FileDialog allows the user to select one or more files from the + filesystem. + + In Windows, this is the common file selector dialog. On X based + platforms a generic alternative is used. The path and filename are + distinct elements of a full file pathname. If path is "", the + current directory will be used. If filename is "", no default + filename will be supplied. The wildcard determines what files are + displayed in the file selector, and file extension supplies a type + extension for the required filename. + + Both the X and Windows versions implement a wildcard filter. Typing a + filename containing wildcards (*, ?) in the filename text item, and + clicking on Ok, will result in only those files matching the pattern + being displayed. The wildcard may be a specification for multiple + types of file with a description for each, such as:: + + "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif" + + + Window Styles + -------------- + ================== ========================================== + wx.OPEN This is an open dialog. + + wx.SAVE This is a save dialog. + + wx.HIDE_READONLY For open dialog only: hide the checkbox + allowing to open the file in read-only mode. + + wx.OVERWRITE_PROMPT For save dialog only: prompt for a confirmation + if a file will be overwritten. + + wx.MULTIPLE For open dialog only: allows selecting multiple + files. + + wx.CHANGE_DIR Change the current working directory to the + directory where the file(s) chosen by the user + are. + ================== ========================================== + + """ def __repr__(self): return "<%s.%s; proxy of C++ wxFileDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2160,8 +2226,8 @@ class FileDialog(Dialog): """ SetPath(self, String path) - Sets the path (the combined directory and filename that will - be returned when the dialog is dismissed). + Sets the path (the combined directory and filename that will be + returned when the dialog is dismissed). """ return _windows_.FileDialog_SetPath(*args, **kwargs) @@ -2185,8 +2251,11 @@ class FileDialog(Dialog): """ SetWildcard(self, String wildCard) - Sets the wildcard, which can contain multiple file types, for example: + Sets the wildcard, which can contain multiple file types, for + example:: + "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif" + """ return _windows_.FileDialog_SetWildcard(*args, **kwargs) @@ -2260,8 +2329,8 @@ class FileDialog(Dialog): Returns the index into the list of filters supplied, optionally, in the wildcard parameter. Before the dialog is shown, this is the index - which will be used when the dialog is first displayed. After the dialog - is shown, this is the index selected by the user. + which will be used when the dialog is first displayed. After the + dialog is shown, this is the index selected by the user. """ return _windows_.FileDialog_GetFilterIndex(*args, **kwargs) @@ -2269,8 +2338,8 @@ class FileDialog(Dialog): """ GetFilenames(self) -> PyObject - Returns a list of filenames chosen in the dialog. This function should - only be used with the dialogs which have wx.MULTIPLE style, use + Returns a list of filenames chosen in the dialog. This function + should only be used with the dialogs which have wx.MULTIPLE style, use GetFilename for the others. """ return _windows_.FileDialog_GetFilenames(*args, **kwargs) @@ -2280,8 +2349,8 @@ class FileDialog(Dialog): GetPaths(self) -> PyObject Fills the array paths with the full paths of the files chosen. This - function should only be used with the dialogs which have wx.MULTIPLE style, - use GetPath for the others. + function should only be used with the dialogs which have wx.MULTIPLE + style, use GetPath for the others. """ return _windows_.FileDialog_GetPaths(*args, **kwargs) @@ -2316,7 +2385,8 @@ class MultiChoiceDialog(Dialog): """ SetSelections(List selections) - Specify the items in the list that shoudl be selected, using a list of integers. + Specify the items in the list that should be selected, using a list of + integers. """ return _windows_.MultiChoiceDialog_SetSelections(*args, **kwargs) @@ -2430,14 +2500,18 @@ class TextEntryDialogPtr(TextEntryDialog): _windows_.TextEntryDialog_swigregister(TextEntryDialogPtr) class FontData(_core.Object): - """This class holds a variety of information related to font dialogs.""" + """ + This class holds a variety of information related to font dialogs and + is used to transfer settings to and results from a `wx.FontDialog`. + """ def __repr__(self): return "<%s.%s; proxy of C++ wxFontData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ __init__(self) -> FontData - This class holds a variety of information related to font dialogs. + This class holds a variety of information related to font dialogs and + is used to transfer settings to and results from a `wx.FontDialog`. """ newobj = _windows_.new_FontData(*args, **kwargs) self.this = newobj.this @@ -2453,8 +2527,8 @@ class FontData(_core.Object): """ EnableEffects(self, bool enable) - Enables or disables 'effects' under MS Windows only. This refers - to the controls for manipulating colour, strikeout and underline + Enables or disables 'effects' under MS Windows only. This refers to + the controls for manipulating colour, strikeout and underline properties. The default value is true. """ return _windows_.FontData_EnableEffects(*args, **kwargs) @@ -2463,8 +2537,9 @@ class FontData(_core.Object): """ GetAllowSymbols(self) -> bool - Under MS Windows, returns a flag determining whether symbol fonts can be - selected. Has no effect on other platforms. The default value is true. + Under MS Windows, returns a flag determining whether symbol fonts can + be selected. Has no effect on other platforms. The default value is + true. """ return _windows_.FontData_GetAllowSymbols(*args, **kwargs) @@ -2472,7 +2547,8 @@ class FontData(_core.Object): """ GetColour(self) -> Colour - Gets the colour associated with the font dialog. The default value is black. + Gets the colour associated with the font dialog. The default value is + black. """ return _windows_.FontData_GetColour(*args, **kwargs) @@ -2496,8 +2572,8 @@ class FontData(_core.Object): """ GetInitialFont(self) -> Font - Gets the font that will be initially used by the font dialog. This should have - previously been set by the application. + Gets the font that will be initially used by the font dialog. This + should have previously been set by the application. """ return _windows_.FontData_GetInitialFont(*args, **kwargs) @@ -2505,8 +2581,8 @@ class FontData(_core.Object): """ GetShowHelp(self) -> bool - Returns true if the Help button will be shown (Windows only). The default - value is false. + Returns true if the Help button will be shown (Windows only). The + default value is false. """ return _windows_.FontData_GetShowHelp(*args, **kwargs) @@ -2514,8 +2590,8 @@ class FontData(_core.Object): """ SetAllowSymbols(self, bool allowSymbols) - Under MS Windows, determines whether symbol fonts can be selected. Has no - effect on other platforms. The default value is true. + Under MS Windows, determines whether symbol fonts can be selected. Has + no effect on other platforms. The default value is true. """ return _windows_.FontData_SetAllowSymbols(*args, **kwargs) @@ -2523,7 +2599,8 @@ class FontData(_core.Object): """ SetChosenFont(self, Font font) - Sets the font that will be returned to the user (for internal use only). + Sets the font that will be returned to the user (normally for internal + use only). """ return _windows_.FontData_SetChosenFont(*args, **kwargs) @@ -2531,8 +2608,8 @@ class FontData(_core.Object): """ SetColour(self, Colour colour) - Sets the colour that will be used for the font foreground colour. The default - colour is black. + Sets the colour that will be used for the font foreground colour. The + default colour is black. """ return _windows_.FontData_SetColour(*args, **kwargs) @@ -2548,8 +2625,8 @@ class FontData(_core.Object): """ SetRange(self, int min, int max) - Sets the valid range for the font point size (Windows only). The default is - 0, 0 (unrestricted range). + Sets the valid range for the font point size (Windows only). The + default is 0, 0 (unrestricted range). """ return _windows_.FontData_SetRange(*args, **kwargs) @@ -2557,8 +2634,8 @@ class FontData(_core.Object): """ SetShowHelp(self, bool showHelp) - Determines whether the Help button will be displayed in the font dialog - (Windows only). The default value is false. + Determines whether the Help button will be displayed in the font + dialog (Windows only). The default value is false. """ return _windows_.FontData_SetShowHelp(*args, **kwargs) @@ -2571,15 +2648,22 @@ class FontDataPtr(FontData): _windows_.FontData_swigregister(FontDataPtr) class FontDialog(Dialog): - """This class represents the font chooser dialog.""" + """ + wx.FontDialog allows the user to select a system font and its attributes. + + :see: `wx.FontData` + + """ def __repr__(self): return "<%s.%s; proxy of C++ wxFontDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ __init__(self, Window parent, FontData data) -> FontDialog - Constructor. Pass a parent window and the FontData object to be - used to initialize the dialog controls. + Constructor. Pass a parent window and the `wx.FontData` object to be + used to initialize the dialog controls. Call `ShowModal` to display + the dialog. If ShowModal returns ``wx.ID_OK`` then you can fetch the + results with via the `wx.FontData` returned by `GetFontData`. """ newobj = _windows_.new_FontDialog(*args, **kwargs) self.this = newobj.this @@ -2591,7 +2675,8 @@ class FontDialog(Dialog): """ GetFontData(self) -> FontData - Returns a reference to the internal FontData used by the FontDialog. + Returns a reference to the internal `wx.FontData` used by the + wx.FontDialog. """ return _windows_.FontDialog_GetFontData(*args, **kwargs) @@ -2605,8 +2690,29 @@ _windows_.FontDialog_swigregister(FontDialogPtr) class MessageDialog(Dialog): """ - This class provides a dialog that shows a single or multi-line message, with - a choice of OK, Yes, No and Cancel buttons. + This class provides a simple dialog that shows a single or multi-line + message, with a choice of OK, Yes, No and/or Cancel buttons. + + + Window Styles + -------------- + ================= ============================================= + wx.OK Show an OK button. + wx.CANCEL Show a Cancel button. + wx.YES_NO Show Yes and No buttons. + wx.YES_DEFAULT Used with wxYES_NO, makes Yes button the + default - which is the default behaviour. + wx.NO_DEFAULT Used with wxYES_NO, makes No button the default. + wx.ICON_EXCLAMATION Shows an exclamation mark icon. + wx.ICON_HAND Shows an error icon. + wx.ICON_ERROR Shows an error icon - the same as wxICON_HAND. + wx.ICON_QUESTION Shows a question mark icon. + wx.ICON_INFORMATION Shows an information (i) icon. + wx.STAY_ON_TOP The message box stays on top of all other + window, even those of the other applications + (Windows only). + ================= ============================================= + """ def __repr__(self): return "<%s.%s; proxy of C++ wxMessageDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -2616,8 +2722,7 @@ class MessageDialog(Dialog): long style=wxOK|wxCANCEL|wxCENTRE, Point pos=DefaultPosition) -> MessageDialog - This class provides a dialog that shows a single or multi-line message, with - a choice of OK, Yes, No and Cancel buttons. + Constructor, use `ShowModal` to display the dialog. """ newobj = _windows_.new_MessageDialog(*args, **kwargs) self.this = newobj.this @@ -2635,8 +2740,36 @@ _windows_.MessageDialog_swigregister(MessageDialogPtr) class ProgressDialog(Frame): """ - A dialog that shows a short message and a progress bar. Optionally, it can - display an ABORT button. + A dialog that shows a short message and a progress bar. Optionally, it + can display an ABORT button. + + Window Styles + -------------- + ================= ============================================= + wx.PD_APP_MODAL Make the progress dialog modal. If this flag is + not given, it is only "locally" modal - + that is the input to the parent window is + disabled, but not to the other ones. + + wx.PD_AUTO_HIDE Causes the progress dialog to disappear from + screen as soon as the maximum value of the + progress meter has been reached. + + wx.PD_CAN_ABORT This flag tells the dialog that it should have + a "Cancel" button which the user may press. If + this happens, the next call to Update() will + return false. + + wx.PD_ELAPSED_TIME This flag tells the dialog that it should show + elapsed time (since creating the dialog). + + wx.PD_ESTIMATED_TIME This flag tells the dialog that it should show + estimated time. + + wx.PD_REMAINING_TIME This flag tells the dialog that it should show + remaining time. + ================= ============================================= + """ def __repr__(self): return "<%s.%s; proxy of C++ wxProgressDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -2645,8 +2778,9 @@ class ProgressDialog(Frame): __init__(self, String title, String message, int maximum=100, Window parent=None, int style=wxPD_AUTO_HIDE|wxPD_APP_MODAL) -> ProgressDialog - Constructor. Creates the dialog, displays it and disables user input for other - windows, or, if wxPD_APP_MODAL flag is not given, for its parent window only. + Constructor. Creates the dialog, displays it and disables user input + for other windows, or, if wx.PD_APP_MODAL flag is not given, for its + parent window only. """ newobj = _windows_.new_ProgressDialog(*args, **kwargs) self.this = newobj.this @@ -2658,13 +2792,13 @@ class ProgressDialog(Frame): """ Update(self, int value, String newmsg=EmptyString) -> bool - Updates the dialog, setting the progress bar to the new value and, if given - changes the message above it. Returns true unless the Cancel button has been - pressed. + Updates the dialog, setting the progress bar to the new value and, if + given changes the message above it. Returns true unless the Cancel + button has been pressed. - If false is returned, the application can either immediately destroy the - dialog or ask the user for the confirmation and if the abort is not confirmed - the dialog may be resumed with Resume function. + If false is returned, the application can either immediately destroy + the dialog or ask the user for the confirmation and if the abort is + not confirmed the dialog may be resumed with Resume function. """ return _windows_.ProgressDialog_Update(*args, **kwargs) @@ -2672,7 +2806,8 @@ class ProgressDialog(Frame): """ Resume(self) - Can be used to continue with the dialog, after the user had chosen to abort. + Can be used to continue with the dialog, after the user had chosen to + abort. """ return _windows_.ProgressDialog_Resume(*args, **kwargs) @@ -2744,8 +2879,8 @@ class FindDialogEvent(_core.CommandEvent): """ GetReplaceString(self) -> String - Return the string to replace the search string with (only - for replace and replace all events). + Return the string to replace the search string with (only for replace + and replace all events). """ return _windows_.FindDialogEvent_GetReplaceString(*args, **kwargs) @@ -2779,22 +2914,26 @@ _windows_.FindDialogEvent_swigregister(FindDialogEventPtr) class FindReplaceData(_core.Object): """ - FindReplaceData holds the data for FindReplaceDialog. It is used to initialize - the dialog with the default values and will keep the last values from the - dialog when it is closed. It is also updated each time a wxFindDialogEvent is - generated so instead of using the wxFindDialogEvent methods you can also - directly query this object. + wx.FindReplaceData holds the data for wx.FindReplaceDialog. It is used + to initialize the dialog with the default values and will keep the + last values from the dialog when it is closed. It is also updated each + time a `wx.FindDialogEvent` is generated so instead of using the + `wx.FindDialogEvent` methods you can also directly query this object. - Note that all SetXXX() methods may only be called before showing the dialog - and calling them has no effect later. + Note that all SetXXX() methods may only be called before showing the + dialog and calling them has no effect later. - Flags - wxFR_DOWN: downward search/replace selected (otherwise, upwards) + Flags + ----- + ================ =============================================== + wx.FR_DOWN Downward search/replace selected (otherwise, + upwards) - wxFR_WHOLEWORD: whole word search/replace selected + wx.FR_WHOLEWORD Whole word search/replace selected - wxFR_MATCHCASE: case sensitive search/replace selected (otherwise, - case insensitive) + wx.FR_MATCHCASE Case sensitive search/replace selected + (otherwise, case insensitive) + ================ =============================================== """ def __repr__(self): @@ -2873,13 +3012,28 @@ _windows_.FindReplaceData_swigregister(FindReplaceDataPtr) class FindReplaceDialog(Dialog): """ - FindReplaceDialog is a standard modeless dialog which is used to allow the - user to search for some text (and possibly replace it with something - else). The actual searching is supposed to be done in the owner window which - is the parent of this dialog. Note that it means that unlike for the other - standard dialogs this one must have a parent window. Also note that there is - no way to use this dialog in a modal way; it is always, by design and - implementation, modeless. + wx.FindReplaceDialog is a standard modeless dialog which is used to + allow the user to search for some text (and possibly replace it with + something else). The actual searching is supposed to be done in the + owner window which is the parent of this dialog. Note that it means + that unlike for the other standard dialogs this one must have a parent + window. Also note that there is no way to use this dialog in a modal + way; it is always, by design and implementation, modeless. + + + Window Styles + ------------- + + ===================== ========================================= + wx.FR_REPLACEDIALOG replace dialog (otherwise find dialog) + + wx.FR_NOUPDOWN don't allow changing the search direction + + wx.FR_NOMATCHCASE don't allow case sensitive searching + + wx.FR_NOWHOLEWORD don't allow whole word searching + ===================== ========================================= + """ def __repr__(self): return "<%s.%s; proxy of C++ wxFindReplaceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -4048,7 +4202,7 @@ class Printer(_core.Object): return _windows_.Printer_GetAbort(*args, **kwargs) def GetLastError(*args, **kwargs): - """Printer.GetLastError() -> int""" + """GetLastError() -> int""" return _windows_.Printer_GetLastError(*args, **kwargs) GetLastError = staticmethod(GetLastError) diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp index bc8570e583..668547e3d1 100644 --- a/wxPython/src/msw/_windows_wrap.cpp +++ b/wxPython/src/msw/_windows_wrap.cpp @@ -283,15 +283,16 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxPanel swig_types[74] #define SWIGTYPE_p_wxPageSetupDialog swig_types[75] #define SWIGTYPE_p_wxPrintDialog swig_types[76] -#define SWIGTYPE_p_wxBitmap swig_types[77] -#define SWIGTYPE_p_wxCommandEvent swig_types[78] -#define SWIGTYPE_p_wxPreviewControlBar swig_types[79] -#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[80] -#define SWIGTYPE_p_wxColour swig_types[81] -#define SWIGTYPE_p_wxToolBar swig_types[82] -#define SWIGTYPE_p_wxPageSetupDialogData swig_types[83] -#define SWIGTYPE_p_wxPrintDialogData swig_types[84] -static swig_type_info *swig_types[86]; +#define SWIGTYPE_p_wxFileSystem swig_types[77] +#define SWIGTYPE_p_wxBitmap swig_types[78] +#define SWIGTYPE_p_wxCommandEvent swig_types[79] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[80] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[81] +#define SWIGTYPE_p_wxColour swig_types[82] +#define SWIGTYPE_p_wxToolBar swig_types[83] +#define SWIGTYPE_p_wxPageSetupDialogData swig_types[84] +#define SWIGTYPE_p_wxPrintDialogData swig_types[85] +static swig_type_info *swig_types[87]; /* -------- TYPES TABLE (END) -------- */ @@ -10570,6 +10571,35 @@ static PyObject *_wrap_HtmlListBox_SetItemCount(PyObject *self, PyObject *args, } +static PyObject *_wrap_HtmlListBox_GetFileSystem(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyHtmlListBox *arg1 = (wxPyHtmlListBox *) 0 ; + wxFileSystem *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlListBox_GetFileSystem",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlListBox, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxFileSystem &_result_ref = (arg1)->GetFileSystem(); + result = (wxFileSystem *) &_result_ref; + } + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFileSystem, 0); + return resultobj; + fail: + return NULL; +} + + static PyObject * HtmlListBox_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -24655,6 +24685,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlListBox_Create", (PyCFunction) _wrap_HtmlListBox_Create, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlListBox_RefreshAll", (PyCFunction) _wrap_HtmlListBox_RefreshAll, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlListBox_SetItemCount", (PyCFunction) _wrap_HtmlListBox_SetItemCount, METH_VARARGS | METH_KEYWORDS }, + { (char *)"HtmlListBox_GetFileSystem", (PyCFunction) _wrap_HtmlListBox_GetFileSystem, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS }, { (char *)"new_TaskBarIcon", (PyCFunction) _wrap_new_TaskBarIcon, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_TaskBarIcon", (PyCFunction) _wrap_delete_TaskBarIcon, METH_VARARGS | METH_KEYWORDS }, @@ -26182,6 +26213,7 @@ static swig_type_info _swigt__p_wxDialog[] = {{"_p_wxDialog", 0, "wxDialog *", 0 static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0, 0, 0, 0},{"_p_wxPanel", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPageSetupDialog[] = {{"_p_wxPageSetupDialog", 0, "wxPageSetupDialog *", 0, 0, 0, 0},{"_p_wxPageSetupDialog", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrintDialog[] = {{"_p_wxPrintDialog", 0, "wxPrintDialog *", 0, 0, 0, 0},{"_p_wxPrintDialog", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxFileSystem[] = {{"_p_wxFileSystem", 0, "wxFileSystem *", 0, 0, 0, 0},{"_p_wxFileSystem", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0, 0, 0, 0},{"_p_wxBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", 0, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPreviewControlBar[] = {{"_p_wxPreviewControlBar", 0, "wxPreviewControlBar *", 0, 0, 0, 0},{"_p_wxPreviewControlBar", 0, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPreviewControlBar, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -26269,6 +26301,7 @@ _swigt__p_wxDialog, _swigt__p_wxPanel, _swigt__p_wxPageSetupDialog, _swigt__p_wxPrintDialog, +_swigt__p_wxFileSystem, _swigt__p_wxBitmap, _swigt__p_wxCommandEvent, _swigt__p_wxPreviewControlBar, diff --git a/wxPython/src/msw/calendar.py b/wxPython/src/msw/calendar.py index ec9e4a42a5..374019eafa 100644 --- a/wxPython/src/msw/calendar.py +++ b/wxPython/src/msw/calendar.py @@ -6,7 +6,7 @@ import _calendar import _misc import _core wx = _core -__docfilter__ = wx.__docfilter__ +__docfilter__ = wx.__DocFilter(globals()) CAL_SUNDAY_FIRST = _calendar.CAL_SUNDAY_FIRST CAL_MONDAY_FIRST = _calendar.CAL_MONDAY_FIRST CAL_SHOW_HOLIDAYS = _calendar.CAL_SHOW_HOLIDAYS @@ -25,8 +25,8 @@ CAL_BORDER_SQUARE = _calendar.CAL_BORDER_SQUARE CAL_BORDER_ROUND = _calendar.CAL_BORDER_ROUND class CalendarDateAttr(object): """ - A set of customization attributes for a calendar date, which can be used to - control the look of the Calendar object. + A set of customization attributes for a calendar date, which can be + used to control the look of the Calendar object. """ def __repr__(self): return "<%s.%s; proxy of C++ wxCalendarDateAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -165,7 +165,70 @@ EVT_CALENDAR_YEAR = wx.PyEventBinder( wxEVT_CALENDAR_YEAR_CHANGED, 1) EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED, 1) class CalendarCtrl(_core.Control): - """The calendar control allows the user to pick a date interactively.""" + """ + The calendar control allows the user to pick a date interactively. + + The CalendarCtrl displays a window containing several parts: the + control to pick the month and the year at the top (either or both of + them may be disabled) and a month area below them which shows all the + days in the month. The user can move the current selection using the + keyboard and select the date (generating EVT_CALENDAR event) by + pressing or double clicking it. + + It has advanced possibilities for the customization of its + display. All global settings (such as colours and fonts used) can, of + course, be changed. But also, the display style for each day in the + month can be set independently using CalendarDateAttr class. + + An item without custom attributes is drawn with the default colours + and font and without border, but setting custom attributes with + SetAttr allows to modify its appearance. Just create a custom + attribute object and set it for the day you want to be displayed + specially A day may be marked as being a holiday, (even if it is not + recognized as one by wx.DateTime) by using the SetHoliday method. + + As the attributes are specified for each day, they may change when the + month is changed, so you will often want to update them in an + EVT_CALENDAR_MONTH event handler. + + Window Styles + ------------- + ============================== ============================ + CAL_SUNDAY_FIRST Show Sunday as the first day + in the week + CAL_MONDAY_FIRST Show Monday as the first day + in the week + CAL_SHOW_HOLIDAYS Highlight holidays in the + calendar + CAL_NO_YEAR_CHANGE Disable the year changing + CAL_NO_MONTH_CHANGE Disable the month (and, + implicitly, the year) changing + CAL_SHOW_SURROUNDING_WEEKS Show the neighbouring weeks in + the previous and next months + CAL_SEQUENTIAL_MONTH_SELECTION Use alternative, more compact, + style for the month and year + selection controls. + + The default calendar style is CAL_SHOW_HOLIDAYS. + + Events + ------- + =========================== ============================== + EVT_CALENDAR A day was double clicked in the + calendar. + EVT_CALENDAR_SEL_CHANGED The selected date changed. + EVT_CALENDAR_DAY The selected day changed. + EVT_CALENDAR_MONTH The selected month changed. + EVT_CALENDAR_YEAR The selected year changed. + EVT_CALENDAR_WEEKDAY_CLICKED User clicked on the week day + header + + Note that changing the selected date will result in one of + EVT_CALENDAR_DAY, MONTH or YEAR events and an EVT_CALENDAR_SEL_CHANGED + event. + + + """ def __repr__(self): return "<%s.%s; proxy of C++ wxCalendarCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -190,7 +253,8 @@ class CalendarCtrl(_core.Control): long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, String name=CalendarNameStr) -> bool - Acutally create the GUI portion of the CalendarCtrl for 2-phase creation. + Acutally create the GUI portion of the CalendarCtrl for 2-phase + creation. """ return _calendar.CalendarCtrl_Create(*args, **kwargs) @@ -264,9 +328,10 @@ class CalendarCtrl(_core.Control): """ EnableMonthChange(self, bool enable=True) - This function should be used instead of changing CAL_NO_MONTH_CHANGE style - bit. It allows or disallows the user to change the month interactively. Note - that if the month can not be changed, the year can not be changed either. + This function should be used instead of changing CAL_NO_MONTH_CHANGE + style bit. It allows or disallows the user to change the month + interactively. Note that if the month can not be changed, the year can + not be changed either. """ return _calendar.CalendarCtrl_EnableMonthChange(*args, **kwargs) @@ -274,8 +339,9 @@ class CalendarCtrl(_core.Control): """ EnableHolidayDisplay(self, bool display=True) - This function should be used instead of changing CAL_SHOW_HOLIDAYS style - bit directly. It enables or disables the special highlighting of the holidays. + This function should be used instead of changing CAL_SHOW_HOLIDAYS + style bit directly. It enables or disables the special highlighting of + the holidays. """ return _calendar.CalendarCtrl_EnableHolidayDisplay(*args, **kwargs) @@ -283,7 +349,7 @@ class CalendarCtrl(_core.Control): """ SetHeaderColours(self, Colour colFg, Colour colBg) - header colours are used for painting the weekdays at the top + Header colours are used for painting the weekdays at the top. """ return _calendar.CalendarCtrl_SetHeaderColours(*args, **kwargs) @@ -291,7 +357,7 @@ class CalendarCtrl(_core.Control): """ GetHeaderColourFg(self) -> Colour - header colours are used for painting the weekdays at the top + Header colours are used for painting the weekdays at the top. """ return _calendar.CalendarCtrl_GetHeaderColourFg(*args, **kwargs) @@ -299,7 +365,7 @@ class CalendarCtrl(_core.Control): """ GetHeaderColourBg(self) -> Colour - header colours are used for painting the weekdays at the top + Header colours are used for painting the weekdays at the top. """ return _calendar.CalendarCtrl_GetHeaderColourBg(*args, **kwargs) @@ -307,7 +373,7 @@ class CalendarCtrl(_core.Control): """ SetHighlightColours(self, Colour colFg, Colour colBg) - highlight colour is used for the currently selected date + Highlight colour is used for the currently selected date. """ return _calendar.CalendarCtrl_SetHighlightColours(*args, **kwargs) @@ -315,7 +381,7 @@ class CalendarCtrl(_core.Control): """ GetHighlightColourFg(self) -> Colour - highlight colour is used for the currently selected date + Highlight colour is used for the currently selected date. """ return _calendar.CalendarCtrl_GetHighlightColourFg(*args, **kwargs) @@ -323,7 +389,7 @@ class CalendarCtrl(_core.Control): """ GetHighlightColourBg(self) -> Colour - highlight colour is used for the currently selected date + Highlight colour is used for the currently selected date. """ return _calendar.CalendarCtrl_GetHighlightColourBg(*args, **kwargs) @@ -331,7 +397,8 @@ class CalendarCtrl(_core.Control): """ SetHolidayColours(self, Colour colFg, Colour colBg) - holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is used) + Holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is + used). """ return _calendar.CalendarCtrl_SetHolidayColours(*args, **kwargs) @@ -339,7 +406,8 @@ class CalendarCtrl(_core.Control): """ GetHolidayColourFg(self) -> Colour - holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is used) + Holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is + used). """ return _calendar.CalendarCtrl_GetHolidayColourFg(*args, **kwargs) @@ -347,7 +415,8 @@ class CalendarCtrl(_core.Control): """ GetHolidayColourBg(self) -> Colour - holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is used) + Holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is + used). """ return _calendar.CalendarCtrl_GetHolidayColourBg(*args, **kwargs) @@ -355,8 +424,8 @@ class CalendarCtrl(_core.Control): """ GetAttr(self, size_t day) -> CalendarDateAttr - Returns the attribute for the given date (should be in the range 1...31). - The returned value may be None + Returns the attribute for the given date (should be in the range + 1...31). The returned value may be None """ return _calendar.CalendarCtrl_GetAttr(*args, **kwargs) @@ -364,8 +433,9 @@ class CalendarCtrl(_core.Control): """ SetAttr(self, size_t day, CalendarDateAttr attr) - Associates the attribute with the specified date (in the range 1...31). - If the attribute passed is None, the items attribute is cleared. + Associates the attribute with the specified date (in the range + 1...31). If the attribute passed is None, the items attribute is + cleared. """ return _calendar.CalendarCtrl_SetAttr(*args, **kwargs) @@ -381,7 +451,8 @@ class CalendarCtrl(_core.Control): """ ResetAttr(self, size_t day) - Clears any attributes associated with the given day (in the range 1...31). + Clears any attributes associated with the given day (in the range + 1...31). """ return _calendar.CalendarCtrl_ResetAttr(*args, **kwargs) @@ -389,13 +460,16 @@ class CalendarCtrl(_core.Control): """ HitTest(Point pos) -> (result, date, weekday) - Returns 3-tuple with information about the given position on the calendar - control. The first value of the tuple is a result code and determines the - validity of the remaining two values. The result codes are: + Returns 3-tuple with information about the given position on the + calendar control. The first value of the tuple is a result code and + determines the validity of the remaining two values. The result codes + are: - CAL_HITTEST_NOWHERE: hit outside of anything - CAL_HITTEST_HEADER: hit on the header, weekday is valid - CAL_HITTEST_DAY: hit on a day in the calendar, date is set. + =================== ============================================ + CAL_HITTEST_NOWHERE hit outside of anything + CAL_HITTEST_HEADER hit on the header, weekday is valid + CAL_HITTEST_DAY hit on a day in the calendar, date is set. + =================== ============================================ """ return _calendar.CalendarCtrl_HitTest(*args, **kwargs) @@ -404,7 +478,7 @@ class CalendarCtrl(_core.Control): """ GetMonthControl(self) -> Control - get the currently shown control for month + Get the currently shown control for month. """ return _calendar.CalendarCtrl_GetMonthControl(*args, **kwargs) @@ -412,7 +486,7 @@ class CalendarCtrl(_core.Control): """ GetYearControl(self) -> Control - get the currently shown control for year + Get the currently shown control for year. """ return _calendar.CalendarCtrl_GetYearControl(*args, **kwargs) diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py index 21b76802ad..2d93562942 100644 --- a/wxPython/src/msw/grid.py +++ b/wxPython/src/msw/grid.py @@ -6,7 +6,7 @@ import _grid import _windows import _core wx = _core -__docfilter__ = wx.__docfilter__ +__docfilter__ = wx.__DocFilter(globals()) GRID_VALUE_STRING = _grid.GRID_VALUE_STRING GRID_VALUE_BOOL = _grid.GRID_VALUE_BOOL GRID_VALUE_NUMBER = _grid.GRID_VALUE_NUMBER diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py index 6a2475f236..08e7c3b0cc 100644 --- a/wxPython/src/msw/html.py +++ b/wxPython/src/msw/html.py @@ -6,7 +6,7 @@ import _html import _windows import _core wx = _core -__docfilter__ = wx.__docfilter__ +__docfilter__ = wx.__DocFilter(globals()) #--------------------------------------------------------------------------- HTML_ALIGN_LEFT = _html.HTML_ALIGN_LEFT @@ -1057,7 +1057,7 @@ class HtmlWindow(_windows.ScrolledWindow): return _html.HtmlWindow_HasAnchor(*args, **kwargs) def AddFilter(*args, **kwargs): - """HtmlWindow.AddFilter(HtmlFilter filter)""" + """AddFilter(HtmlFilter filter)""" return _html.HtmlWindow_AddFilter(*args, **kwargs) AddFilter = staticmethod(AddFilter) @@ -1199,12 +1199,12 @@ class HtmlPrintout(_windows.Printout): return _html.HtmlPrintout_SetMargins(*args, **kwargs) def AddFilter(*args, **kwargs): - """HtmlPrintout.AddFilter(wxHtmlFilter filter)""" + """AddFilter(wxHtmlFilter filter)""" return _html.HtmlPrintout_AddFilter(*args, **kwargs) AddFilter = staticmethod(AddFilter) def CleanUpStatics(*args, **kwargs): - """HtmlPrintout.CleanUpStatics()""" + """CleanUpStatics()""" return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs) CleanUpStatics = staticmethod(CleanUpStatics) diff --git a/wxPython/src/msw/wizard.py b/wxPython/src/msw/wizard.py index e4fa1a1dd7..e90f8fe88f 100644 --- a/wxPython/src/msw/wizard.py +++ b/wxPython/src/msw/wizard.py @@ -6,6 +6,7 @@ import _wizard import _windows import _core wx = _core +__docfilter__ = wx.__DocFilter(globals()) WIZARD_EX_HELPBUTTON = _wizard.WIZARD_EX_HELPBUTTON wxEVT_WIZARD_PAGE_CHANGED = _wizard.wxEVT_WIZARD_PAGE_CHANGED wxEVT_WIZARD_PAGE_CHANGING = _wizard.wxEVT_WIZARD_PAGE_CHANGING @@ -209,7 +210,7 @@ class WizardPageSimple(WizardPage): return _wizard.WizardPageSimple_SetNext(*args, **kwargs) def Chain(*args, **kwargs): - """WizardPageSimple.Chain(WizardPageSimple first, WizardPageSimple second)""" + """Chain(WizardPageSimple first, WizardPageSimple second)""" return _wizard.WizardPageSimple_Chain(*args, **kwargs) Chain = staticmethod(Chain) -- 2.45.2