Second phase of OOR completed. (Original python object return for
wxEvtHandler and derived classes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -73,6 +73,11 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
%addmethods {
|
||||
void _setOORInfo(PyObject* _self) {
|
||||
self->SetClientObject(new wxPyClientData(_self));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -83,6 +88,8 @@ public:
|
||||
wxValidator();
|
||||
//~wxValidator();
|
||||
|
||||
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
|
||||
|
||||
wxValidator* Clone();
|
||||
wxWindow* GetWindow();
|
||||
void SetWindow(wxWindow* window);
|
||||
@@ -147,9 +154,10 @@ class wxPyValidator : public wxValidator {
|
||||
public:
|
||||
wxPyValidator();
|
||||
|
||||
void _setSelf(PyObject* self, PyObject* _class, int incref=TRUE);
|
||||
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyValidator, 1)"
|
||||
void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=TRUE);
|
||||
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyValidator, 1)"
|
||||
|
||||
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
@@ -171,6 +179,10 @@ public:
|
||||
long style = 0,
|
||||
char* name = "panel");
|
||||
|
||||
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
|
||||
%pragma(python) addtomethod = "wxPreWindow:val._setOORInfo(self)"
|
||||
|
||||
|
||||
void CaptureMouse();
|
||||
void Center(int direction = wxBOTH);
|
||||
void Centre(int direction = wxBOTH);
|
||||
@@ -429,6 +441,9 @@ public:
|
||||
long style = wxTAB_TRAVERSAL,
|
||||
const char* name = "panel");
|
||||
|
||||
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
|
||||
%pragma(python) addtomethod = "XXX:val._setOORInfo(self)"
|
||||
|
||||
void InitDialog();
|
||||
wxButton* GetDefaultItem();
|
||||
void SetDefaultItem(wxButton *btn);
|
||||
@@ -459,6 +474,9 @@ public:
|
||||
long style = wxHSCROLL | wxVSCROLL,
|
||||
char* name = "scrolledWindow");
|
||||
|
||||
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
|
||||
%pragma(python) addtomethod = "wxPreScrolledWindow:val._setOORInfo(self)"
|
||||
|
||||
void EnableScrolling(bool xScrolling, bool yScrolling);
|
||||
int GetScrollPageSize(int orient);
|
||||
void GetScrollPixelsPerUnit(int* OUTPUT, int* OUTPUT);
|
||||
@@ -492,6 +510,8 @@ class wxMenu : public wxEvtHandler {
|
||||
public:
|
||||
wxMenu(const wxString& title = wxPyEmptyStr, long style = 0);
|
||||
|
||||
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
|
||||
|
||||
void Append(int id, const wxString& item,
|
||||
const wxString& helpString = wxPyEmptyStr,
|
||||
int checkable = FALSE);
|
||||
@@ -561,6 +581,8 @@ class wxMenuBar : public wxWindow {
|
||||
public:
|
||||
wxMenuBar(long style = 0);
|
||||
|
||||
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
|
||||
|
||||
bool Append(wxMenu *menu, const wxString& title);
|
||||
bool Insert(size_t pos, wxMenu *menu, const wxString& title);
|
||||
size_t GetMenuCount();
|
||||
|
Reference in New Issue
Block a user