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:
@@ -35,7 +35,7 @@ public:
|
||||
%pythonAppend wxPopupWindow() ""
|
||||
|
||||
wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE);
|
||||
%name(PrePopupWindow)wxPopupWindow();
|
||||
%RenameCtor(PrePopupWindow, wxPopupWindow());
|
||||
|
||||
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
|
||||
|
||||
@@ -81,14 +81,15 @@ MustHaveApp(wxPyPopupTransientWindow);
|
||||
// wxPopupTransientWindow: a wxPopupWindow which disappears automatically
|
||||
// when the user clicks mouse outside it or if it loses focus in any other way
|
||||
|
||||
%name(PopupTransientWindow) class wxPyPopupTransientWindow : public wxPopupWindow
|
||||
%rename(PopupTransientWindow) wxPyPopupTransientWindow;
|
||||
class wxPyPopupTransientWindow : public wxPopupWindow
|
||||
{
|
||||
public:
|
||||
%pythonAppend wxPyPopupTransientWindow "self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow)"
|
||||
%pythonAppend wxPyPopupTransientWindow() ""
|
||||
|
||||
wxPyPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE);
|
||||
%name(PrePopupTransientWindow)wxPyPopupTransientWindow();
|
||||
%RenameCtor(PrePopupTransientWindow, wxPyPopupTransientWindow());
|
||||
|
||||
void _setCallbackInfo(PyObject* self, PyObject* _class);
|
||||
|
||||
@@ -124,14 +125,15 @@ public:
|
||||
class wxPopupWindow : public wxWindow {
|
||||
public:
|
||||
wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE);
|
||||
%name(PrePopupWindow)wxPopupWindow();
|
||||
%RenameCtor(PrePopupWindow, wxPopupWindow());
|
||||
};
|
||||
|
||||
%name(PopupTransientWindow) class wxPyPopupTransientWindow : public wxPopupWindow
|
||||
%rename(PopupTransientWindow) wxPyPopupTransientWindow;
|
||||
class wxPyPopupTransientWindow : public wxPopupWindow
|
||||
{
|
||||
public:
|
||||
wxPyPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE);
|
||||
%name(PrePopupTransientWindow)wxPyPopupTransientWindow();
|
||||
%RenameCtor(PrePopupTransientWindow, wxPyPopupTransientWindow());
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user