Changes to how overridable C++ methods are virtualized for Python.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -84,7 +84,8 @@ public:
|
||||
|
||||
wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
|
||||
|
||||
bool base_GiveFeedback(wxDragResult effect);
|
||||
bool GiveFeedback(wxDragResult effect);
|
||||
%MAKE_BASE_FUNC(DropSource, GiveFeedback);
|
||||
};
|
||||
|
||||
|
||||
@@ -151,11 +152,17 @@ public:
|
||||
|
||||
%cleardisown( wxDataObject *dataObject );
|
||||
|
||||
wxDragResult base_OnEnter(wxCoord x, wxCoord y, wxDragResult def);
|
||||
wxDragResult base_OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
|
||||
void base_OnLeave();
|
||||
bool base_OnDrop(wxCoord x, wxCoord y);
|
||||
wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def);
|
||||
wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
|
||||
void OnLeave();
|
||||
bool OnDrop(wxCoord x, wxCoord y);
|
||||
|
||||
%MAKE_BASE_FUNC(DropTarget, OnEnter);
|
||||
%MAKE_BASE_FUNC(DropTarget, OnDragOver);
|
||||
%MAKE_BASE_FUNC(DropTarget, OnLeave);
|
||||
%MAKE_BASE_FUNC(DropTarget, OnDrop);
|
||||
|
||||
|
||||
// may be called *only* from inside OnData() and will fill m_dataObject
|
||||
// with the data from the drop source if it returns True
|
||||
bool GetData();
|
||||
@@ -213,12 +220,19 @@ public:
|
||||
wxPyTextDropTarget();
|
||||
void _setCallbackInfo(PyObject* self, PyObject* _class);
|
||||
|
||||
//bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0;
|
||||
wxDragResult base_OnEnter(wxCoord x, wxCoord y, wxDragResult def);
|
||||
wxDragResult base_OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
|
||||
void base_OnLeave();
|
||||
bool base_OnDrop(wxCoord x, wxCoord y);
|
||||
wxDragResult base_OnData(wxCoord x, wxCoord y, wxDragResult def);
|
||||
bool OnDropText(wxCoord x, wxCoord y, const wxString& text);
|
||||
wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def);
|
||||
wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
|
||||
void OnLeave();
|
||||
bool OnDrop(wxCoord x, wxCoord y);
|
||||
wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
|
||||
|
||||
%MAKE_BASE_FUNC(TextDropTarget, OnDropText);
|
||||
%MAKE_BASE_FUNC(TextDropTarget, OnEnter);
|
||||
%MAKE_BASE_FUNC(TextDropTarget, OnDragOver);
|
||||
%MAKE_BASE_FUNC(TextDropTarget, OnLeave);
|
||||
%MAKE_BASE_FUNC(TextDropTarget, OnDrop);
|
||||
%MAKE_BASE_FUNC(TextDropTarget, OnData);
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
@@ -275,12 +289,19 @@ public:
|
||||
wxPyFileDropTarget();
|
||||
void _setCallbackInfo(PyObject* self, PyObject* _class);
|
||||
|
||||
// bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) = 0;
|
||||
wxDragResult base_OnEnter(wxCoord x, wxCoord y, wxDragResult def);
|
||||
wxDragResult base_OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
|
||||
void base_OnLeave();
|
||||
bool base_OnDrop(wxCoord x, wxCoord y);
|
||||
wxDragResult base_OnData(wxCoord x, wxCoord y, wxDragResult def);
|
||||
bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames);
|
||||
wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def);
|
||||
wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
|
||||
void OnLeave();
|
||||
bool OnDrop(wxCoord x, wxCoord y);
|
||||
wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
|
||||
|
||||
%MAKE_BASE_FUNC(FileDropTarget, OnDropFiles);
|
||||
%MAKE_BASE_FUNC(FileDropTarget, OnEnter);
|
||||
%MAKE_BASE_FUNC(FileDropTarget, OnDragOver);
|
||||
%MAKE_BASE_FUNC(FileDropTarget, OnLeave);
|
||||
%MAKE_BASE_FUNC(FileDropTarget, OnDrop);
|
||||
%MAKE_BASE_FUNC(FileDropTarget, OnData);
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user