Updated to SWIG 1.3.24 (plus a patch that corrects a bug and adds back
some things that were changed/removed from my patch I submitted to them.) Since it is now possible easily and simply share the SWIG type tables across modules I reverted to always using the stock SWIG runtime instead of my slightly hacked up version of it exported via the wxPython C API. The %name directive is now deprecated so replaced most uses of it with a custom %Rename macro that uses %rename internally. These will evetually need to be replaced with a DocDecl macro when docstrings are added. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -26,22 +26,23 @@
|
||||
|
||||
MustHaveApp(wxGenericDragImage);
|
||||
|
||||
%name (DragImage) class wxGenericDragImage : public wxObject
|
||||
%rename (DragImage) wxGenericDragImage;
|
||||
class wxGenericDragImage : public wxObject
|
||||
{
|
||||
public:
|
||||
|
||||
wxGenericDragImage(const wxBitmap& image,
|
||||
const wxCursor& cursor = wxNullCursor);
|
||||
|
||||
%name(DragIcon)wxGenericDragImage(const wxIcon& image,
|
||||
const wxCursor& cursor = wxNullCursor);
|
||||
%RenameCtor(DragIcon, wxGenericDragImage(const wxIcon& image,
|
||||
const wxCursor& cursor = wxNullCursor));
|
||||
|
||||
%name(DragString)wxGenericDragImage(const wxString& str,
|
||||
const wxCursor& cursor = wxNullCursor);
|
||||
%RenameCtor(DragString, wxGenericDragImage(const wxString& str,
|
||||
const wxCursor& cursor = wxNullCursor));
|
||||
|
||||
%name(DragTreeItem)wxGenericDragImage(const wxPyTreeCtrl& treeCtrl, wxTreeItemId& id);
|
||||
%RenameCtor(DragTreeItem, wxGenericDragImage(const wxPyTreeCtrl& treeCtrl, wxTreeItemId& id));
|
||||
|
||||
%name(DragListItem)wxGenericDragImage(const wxPyListCtrl& listCtrl, long id);
|
||||
%RenameCtor(DragListItem, wxGenericDragImage(const wxPyListCtrl& listCtrl, long id));
|
||||
|
||||
~wxGenericDragImage();
|
||||
|
||||
@@ -57,8 +58,8 @@ public:
|
||||
// Begin drag. hotspot is the location of the drag position relative to the upper-left
|
||||
// corner of the image. This is full screen only. fullScreenRect gives the
|
||||
// position of the window on the screen, to restrict the drag to.
|
||||
%name(BeginDragBounded) bool BeginDrag(const wxPoint& hotspot, wxWindow* window,
|
||||
wxWindow* boundingWindow);
|
||||
%Rename(BeginDragBounded, bool, BeginDrag(const wxPoint& hotspot, wxWindow* window,
|
||||
wxWindow* boundingWindow));
|
||||
|
||||
|
||||
// End drag
|
||||
|
Reference in New Issue
Block a user