Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes needed to solve wxPython's OOR problem for the wxOGL shapes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-11-27 02:56:59 +00:00
parent 220f2d5c4d
commit 2f4e928794
33 changed files with 504 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wxPython/src/_defs.i
View File

@@ -264,16 +264,19 @@ enum {
wxPROCESS_ENTER,
wxPASSWORD,
wxTE_PROCESS_ENTER,
wxTE_PROCESS_TAB,
wxTE_PASSWORD,
wxTE_READONLY,
wxTE_RICH,
wxTE_MULTILINE,
wxTE_AUTO_SCROLL,
wxTE_PROCESS_TAB,
wxTE_RICH,
wxTE_NO_VSCROLL,
wxTE_AUTO_SCROLL,
wxTE_PROCESS_ENTER,
wxTE_PASSWORD,
wxTE_AUTO_URL,
wxTE_NOHIDESEL,
wxTE_DONTWRAP,
wxTE_LINEWRAP,
wxTE_WORDWRAP,
wxCB_SIMPLE,
wxCB_DROPDOWN,

14
wxPython/src/controls.i
View File

@@ -622,6 +622,13 @@ public:
// returns false if we have any attributes set, true otherwise
bool IsDefault();
// return the attribute having the valid font and colours: it uses the
// attributes set in attr and falls back first to attrDefault and then to
// the text control font/colours for those attributes which are not set
static wxTextAttr Combine(const wxTextAttr& attr,
const wxTextAttr& attrDef,
const wxTextCtrl *text);
};
@@ -727,6 +734,13 @@ public:
self->AppendText(text);
}
}
// TODO: replace this when the method is really added to wxTextCtrl
%addmethods {
wxString GetString(long from, long to) {
return self->GetValue().Mid(from, to-from);
}
}
};
//----------------------------------------------------------------------

4
wxPython/src/export.h
View File

@@ -60,7 +60,9 @@ static void wxPyCoreAPI_IMPORT() {
#define wxPyCBH_delete(a) (wxPyCoreAPIPtr->p_wxPyCBH_delete(a))
#define wxPyClassExists(a) (wxPyCoreAPIPtr->p_wxPyClassExists(a))
#define wxPyMake_wxObject(a) (wxPyCoreAPIPtr->p_wxPyMake_wxObject(a))
#define wxPyMake_wxObject(a) (wxPyCoreAPIPtr->p_wxPyMake_wxObject(a,TRUE))
#define wxPyMake_wxObject2(a,b) (wxPyCoreAPIPtr->p_wxPyMake_wxObject(a,b))
#define wxPyMake_wxSizer(a) (wxPyCoreAPIPtr->p_wxPyMake_wxSizer(a))
#define wxPyPtrTypeMap_Add(a, b) (wxPyCoreAPIPtr->p_wxPyPtrTypeMap_Add(a, b))

6
wxPython/src/gdi.i
View File

@@ -543,6 +543,8 @@ public:
bool underline = FALSE, const char* facename = NULL,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
void RemoveFont(wxFont *font);
int GetCount();
};
@@ -677,6 +679,8 @@ public:
void AddPen(wxPen* pen);
wxPen* FindOrCreatePen(const wxColour& colour, int width, int style);
void RemovePen(wxPen* pen);
int GetCount();
};
@@ -704,6 +708,8 @@ public:
void AddBrush(wxBrush *brush);
wxBrush * FindOrCreateBrush(const wxColour& colour, int style);
void RemoveBrush(wxBrush *brush);
int GetCount();
};
//----------------------------------------------------------------------

41
wxPython/src/helpers.cpp
View File

@@ -287,14 +287,16 @@ PyObject* wxPyClassExists(const char* className) {
}
PyObject* wxPyMake_wxObject(wxObject* source) {
PyObject* wxPyMake_wxObject(wxObject* source, bool checkEvtHandler) {
PyObject* target = NULL;
bool isEvtHandler = FALSE;
if (source) {
// If it's derived from wxEvtHandler then there may
// already be a pointer to a Python objec that we can use.
if (wxIsKindOf(source, wxEvtHandler)) {
// already be a pointer to a Python object that we can use
// in the OOR data.
if (checkEvtHandler && wxIsKindOf(source, wxEvtHandler)) {
isEvtHandler = TRUE;
wxEvtHandler* eh = (wxEvtHandler*)source;
wxPyClientData* data = (wxPyClientData*)eh->GetClientObject();
if (data) {
@@ -302,15 +304,6 @@ PyObject* wxPyMake_wxObject(wxObject* source) {
Py_INCREF(target);
}
}
else if (wxIsKindOf(source, wxSizer)) {
// wxSizers also track the original object
wxSizer* sz = (wxSizer*)source;
wxPyClientData* data = (wxPyClientData*)sz->GetClientObject();
if (data) {
target = data->m_obj;
Py_INCREF(target);
}
}
if (! target) {
// Otherwise make it the old fashioned way by making a
@@ -341,6 +334,30 @@ PyObject* wxPyMake_wxObject(wxObject* source) {
}
PyObject* wxPyMake_wxSizer(wxSizer* source) {
PyObject* target = NULL;
if (source && wxIsKindOf(source, wxSizer)) {
// If it's derived from wxSizer then there may
// already be a pointer to a Python object that we can use
// in the OOR data.
wxSizer* sz = (wxSizer*)source;
wxPyClientData* data = (wxPyClientData*)sz->GetClientObject();
if (data) {
target = data->m_obj;
Py_INCREF(target);
}
}
if (! target) {
target = wxPyMake_wxObject(source, FALSE);
if (target != Py_None)
((wxSizer*)source)->SetClientObject(new wxPyClientData(target));
}
return target;
}
//---------------------------------------------------------------------------
PyObject* wxPyConstructObject(void* ptr,

6
wxPython/src/helpers.h
View File

@@ -65,7 +65,8 @@ PyObject* wxPyConstructObject(void* ptr,
PyObject* klass,
int setThisOwn=0);
PyObject* wxPyClassExists(const char* className);
PyObject* wxPyMake_wxObject(wxObject* source);
PyObject* wxPyMake_wxObject(wxObject* source, bool checkEvtHandler=TRUE);
PyObject* wxPyMake_wxSizer(wxSizer* source);
void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName);
PyObject* wxPy_ConvertList(wxListBase* list, const char* className);
@@ -284,7 +285,8 @@ struct wxPyCoreAPI {
void (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh);
PyObject* (*p_wxPyClassExists)(const char* className);
PyObject* (*p_wxPyMake_wxObject)(wxObject* source);
PyObject* (*p_wxPyMake_wxObject)(wxObject* source, bool checkEvtHandler);
PyObject* (*p_wxPyMake_wxSizer)(wxSizer* source);
void (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName);
};

86
wxPython/src/msw/controls.cpp
View File

@@ -5991,6 +5991,53 @@ static PyObject *_wrap_wxTextAttr_IsDefault(PyObject *self, PyObject *args, PyOb
return _resultobj;
}
static PyObject *_wrap_wxTextAttr_Combine(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxTextAttr * _result;
wxTextAttr * _arg0;
wxTextAttr * _arg1;
wxTextCtrl * _arg2;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
PyObject * _argo2 = 0;
char *_kwnames[] = { "attr","attrDef","text", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxTextAttr_Combine",_kwnames,&_argo0,&_argo1,&_argo2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_Combine. Expected _wxTextAttr_p.");
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTextAttr_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTextAttr_Combine. Expected _wxTextAttr_p.");
return NULL;
}
}
if (_argo2) {
if (_argo2 == Py_None) { _arg2 = NULL; }
else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxTextCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxTextAttr_Combine. Expected _wxTextCtrl_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxTextAttr (wxTextAttr::Combine(*_arg0,*_arg1,_arg2));
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxTextAttr_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static void *SwigwxTextCtrlTowxControl(void *ptr) {
wxTextCtrl *src;
wxControl *dest;
@@ -7630,6 +7677,43 @@ static PyObject *_wrap_wxTextCtrl_write(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
static wxString wxTextCtrl_GetString(wxTextCtrl *self,long from,long to) {
return self->GetValue().Mid(from, to-from);
}
static PyObject *_wrap_wxTextCtrl_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
wxTextCtrl * _arg0;
long _arg1;
long _arg2;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","from","to", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxTextCtrl_GetString",_kwnames,&_argo0,&_arg1,&_arg2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetString. Expected _wxTextCtrl_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxString (wxTextCtrl_GetString(_arg0,_arg1,_arg2));
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
}{
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
{
delete _result;
}
return _resultobj;
}
static void *SwigwxScrollBarTowxControl(void *ptr) {
wxScrollBar *src;
wxControl *dest;
@@ -11212,6 +11296,7 @@ static PyMethodDef controlscMethods[] = {
{ "wxScrollBar_Create", (PyCFunction) _wrap_wxScrollBar_Create, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPreScrollBar", (PyCFunction) _wrap_new_wxPreScrollBar, METH_VARARGS | METH_KEYWORDS },
{ "new_wxScrollBar", (PyCFunction) _wrap_new_wxScrollBar, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_GetString", (PyCFunction) _wrap_wxTextCtrl_GetString, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_write", (PyCFunction) _wrap_wxTextCtrl_write, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_SetEditable", (PyCFunction) _wrap_wxTextCtrl_SetEditable, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_SelectAll", (PyCFunction) _wrap_wxTextCtrl_SelectAll, METH_VARARGS | METH_KEYWORDS },
@@ -11257,6 +11342,7 @@ static PyMethodDef controlscMethods[] = {
{ "wxTextCtrl_Create", (PyCFunction) _wrap_wxTextCtrl_Create, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPreTextCtrl", (PyCFunction) _wrap_new_wxPreTextCtrl, METH_VARARGS | METH_KEYWORDS },
{ "new_wxTextCtrl", (PyCFunction) _wrap_new_wxTextCtrl, METH_VARARGS | METH_KEYWORDS },
{ "wxTextAttr_Combine", (PyCFunction) _wrap_wxTextAttr_Combine, METH_VARARGS | METH_KEYWORDS },
{ "wxTextAttr_IsDefault", (PyCFunction) _wrap_wxTextAttr_IsDefault, METH_VARARGS | METH_KEYWORDS },
{ "wxTextAttr_GetFont", (PyCFunction) _wrap_wxTextAttr_GetFont, METH_VARARGS | METH_KEYWORDS },
{ "wxTextAttr_GetBackgroundColour", (PyCFunction) _wrap_wxTextAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },

8
wxPython/src/msw/controls.py
View File

@@ -738,6 +738,9 @@ class wxTextCtrlPtr(wxControlPtr):
def write(self, *_args, **_kwargs):
val = apply(controlsc.wxTextCtrl_write,(self,) + _args, _kwargs)
return val
def GetString(self, *_args, **_kwargs):
val = apply(controlsc.wxTextCtrl_GetString,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxTextCtrl instance at %s>" % (self.this,)
class wxTextCtrl(wxTextCtrlPtr):
@@ -1139,6 +1142,11 @@ def wxButton_GetDefaultSize(*_args, **_kwargs):
if val: val = wxSizePtr(val); val.thisown = 1
return val
def wxTextAttr_Combine(*_args, **_kwargs):
val = apply(controlsc.wxTextAttr_Combine,_args,_kwargs)
if val: val = wxTextAttrPtr(val); val.thisown = 1
return val
#-------------- VARIABLE WRAPPERS ------------------

4
wxPython/src/msw/frames.cpp
View File

@@ -1804,7 +1804,7 @@ static PyObject *_wrap_wxDialog_CreateTextSizer(PyObject *self, PyObject *args,
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxSizer(_result); }
{
if (_obj1)
delete _arg1;
@@ -1837,7 +1837,7 @@ static PyObject *_wrap_wxDialog_CreateButtonSizer(PyObject *self, PyObject *args
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxSizer(_result); }
return _resultobj;
}

87
wxPython/src/msw/gdi.cpp
View File

@@ -4689,6 +4689,34 @@ static PyObject *_wrap_wxFontList_RemoveFont(PyObject *self, PyObject *args, PyO
return _resultobj;
}
#define wxFontList_GetCount(_swigobj) (_swigobj->GetCount())
static PyObject *_wrap_wxFontList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxFontList * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontList_GetCount",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontList_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontList_GetCount. Expected _wxFontList_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (int )wxFontList_GetCount(_arg0);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static void *SwigwxColourTowxObject(void *ptr) {
wxColour *src;
wxObject *dest;
@@ -5878,6 +5906,34 @@ static PyObject *_wrap_wxPenList_RemovePen(PyObject *self, PyObject *args, PyObj
return _resultobj;
}
#define wxPenList_GetCount(_swigobj) (_swigobj->GetCount())
static PyObject *_wrap_wxPenList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxPenList * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPenList_GetCount",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPenList_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPenList_GetCount. Expected _wxPenList_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (int )wxPenList_GetCount(_arg0);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static void *SwigwxBrushTowxGDIObject(void *ptr) {
wxBrush *src;
wxGDIObject *dest;
@@ -6306,6 +6362,34 @@ static PyObject *_wrap_wxBrushList_RemoveBrush(PyObject *self, PyObject *args, P
return _resultobj;
}
#define wxBrushList_GetCount(_swigobj) (_swigobj->GetCount())
static PyObject *_wrap_wxBrushList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxBrushList * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBrushList_GetCount",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrushList_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrushList_GetCount. Expected _wxBrushList_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (int )wxBrushList_GetCount(_arg0);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static void *SwigwxDCTowxObject(void *ptr) {
wxDC *src;
wxObject *dest;
@@ -12311,6 +12395,7 @@ static PyMethodDef gdicMethods[] = {
{ "wxDC_Blit", (PyCFunction) _wrap_wxDC_Blit, METH_VARARGS | METH_KEYWORDS },
{ "wxDC_BeginDrawing", (PyCFunction) _wrap_wxDC_BeginDrawing, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxDC", (PyCFunction) _wrap_delete_wxDC, METH_VARARGS | METH_KEYWORDS },
{ "wxBrushList_GetCount", (PyCFunction) _wrap_wxBrushList_GetCount, METH_VARARGS | METH_KEYWORDS },
{ "wxBrushList_RemoveBrush", (PyCFunction) _wrap_wxBrushList_RemoveBrush, METH_VARARGS | METH_KEYWORDS },
{ "wxBrushList_FindOrCreateBrush", (PyCFunction) _wrap_wxBrushList_FindOrCreateBrush, METH_VARARGS | METH_KEYWORDS },
{ "wxBrushList_AddBrush", (PyCFunction) _wrap_wxBrushList_AddBrush, METH_VARARGS | METH_KEYWORDS },
@@ -12323,6 +12408,7 @@ static PyMethodDef gdicMethods[] = {
{ "wxBrush_GetColour", (PyCFunction) _wrap_wxBrush_GetColour, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxBrush", (PyCFunction) _wrap_delete_wxBrush, METH_VARARGS | METH_KEYWORDS },
{ "new_wxBrush", (PyCFunction) _wrap_new_wxBrush, METH_VARARGS | METH_KEYWORDS },
{ "wxPenList_GetCount", (PyCFunction) _wrap_wxPenList_GetCount, METH_VARARGS | METH_KEYWORDS },
{ "wxPenList_RemovePen", (PyCFunction) _wrap_wxPenList_RemovePen, METH_VARARGS | METH_KEYWORDS },
{ "wxPenList_FindOrCreatePen", (PyCFunction) _wrap_wxPenList_FindOrCreatePen, METH_VARARGS | METH_KEYWORDS },
{ "wxPenList_AddPen", (PyCFunction) _wrap_wxPenList_AddPen, METH_VARARGS | METH_KEYWORDS },
@@ -12356,6 +12442,7 @@ static PyMethodDef gdicMethods[] = {
{ "wxColour_Red", (PyCFunction) _wrap_wxColour_Red, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxColour", (PyCFunction) _wrap_delete_wxColour, METH_VARARGS | METH_KEYWORDS },
{ "new_wxColour", (PyCFunction) _wrap_new_wxColour, METH_VARARGS | METH_KEYWORDS },
{ "wxFontList_GetCount", (PyCFunction) _wrap_wxFontList_GetCount, METH_VARARGS | METH_KEYWORDS },
{ "wxFontList_RemoveFont", (PyCFunction) _wrap_wxFontList_RemoveFont, METH_VARARGS | METH_KEYWORDS },
{ "wxFontList_FindOrCreateFont", (PyCFunction) _wrap_wxFontList_FindOrCreateFont, METH_VARARGS | METH_KEYWORDS },
{ "wxFontList_AddFont", (PyCFunction) _wrap_wxFontList_AddFont, METH_VARARGS | METH_KEYWORDS },

9
wxPython/src/msw/gdi.py
View File

@@ -401,6 +401,9 @@ class wxFontListPtr(wxObjectPtr):
def RemoveFont(self, *_args, **_kwargs):
val = apply(gdic.wxFontList_RemoveFont,(self,) + _args, _kwargs)
return val
def GetCount(self, *_args, **_kwargs):
val = apply(gdic.wxFontList_GetCount,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxFontList instance at %s>" % (self.this,)
class wxFontList(wxFontListPtr):
@@ -566,6 +569,9 @@ class wxPenListPtr(wxObjectPtr):
def RemovePen(self, *_args, **_kwargs):
val = apply(gdic.wxPenList_RemovePen,(self,) + _args, _kwargs)
return val
def GetCount(self, *_args, **_kwargs):
val = apply(gdic.wxPenList_GetCount,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxPenList instance at %s>" % (self.this,)
class wxPenList(wxPenListPtr):
@@ -629,6 +635,9 @@ class wxBrushListPtr(wxObjectPtr):
def RemoveBrush(self, *_args, **_kwargs):
val = apply(gdic.wxBrushList_RemoveBrush,(self,) + _args, _kwargs)
return val
def GetCount(self, *_args, **_kwargs):
val = apply(gdic.wxBrushList_GetCount,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxBrushList instance at %s>" % (self.this,)
class wxBrushList(wxBrushListPtr):

2
wxPython/src/msw/sizers.cpp
View File

@@ -576,7 +576,7 @@ static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *self, PyObject *args, PyOb
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxSizer(_result); }
return _resultobj;
}

2
wxPython/src/msw/windows.cpp
View File

@@ -5065,7 +5065,7 @@ static PyObject *_wrap_wxWindow_GetSizer(PyObject *self, PyObject *args, PyObjec
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxSizer(_result); }
return _resultobj;
}

14
wxPython/src/msw/wx.cpp
View File

@@ -672,6 +672,7 @@ static wxPyCoreAPI API = {
wxPyClassExists,
wxPyMake_wxObject,
wxPyMake_wxSizer,
wxPyPtrTypeMap_Add,
};
@@ -1980,16 +1981,19 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxLB_HSCROLL", PyInt_FromLong((long) wxLB_HSCROLL));
PyDict_SetItemString(d,"wxPROCESS_ENTER", PyInt_FromLong((long) wxPROCESS_ENTER));
PyDict_SetItemString(d,"wxPASSWORD", PyInt_FromLong((long) wxPASSWORD));
PyDict_SetItemString(d,"wxTE_PROCESS_ENTER", PyInt_FromLong((long) wxTE_PROCESS_ENTER));
PyDict_SetItemString(d,"wxTE_PROCESS_TAB", PyInt_FromLong((long) wxTE_PROCESS_TAB));
PyDict_SetItemString(d,"wxTE_PASSWORD", PyInt_FromLong((long) wxTE_PASSWORD));
PyDict_SetItemString(d,"wxTE_READONLY", PyInt_FromLong((long) wxTE_READONLY));
PyDict_SetItemString(d,"wxTE_RICH", PyInt_FromLong((long) wxTE_RICH));
PyDict_SetItemString(d,"wxTE_MULTILINE", PyInt_FromLong((long) wxTE_MULTILINE));
PyDict_SetItemString(d,"wxTE_AUTO_SCROLL", PyInt_FromLong((long) wxTE_AUTO_SCROLL));
PyDict_SetItemString(d,"wxTE_PROCESS_TAB", PyInt_FromLong((long) wxTE_PROCESS_TAB));
PyDict_SetItemString(d,"wxTE_RICH", PyInt_FromLong((long) wxTE_RICH));
PyDict_SetItemString(d,"wxTE_NO_VSCROLL", PyInt_FromLong((long) wxTE_NO_VSCROLL));
PyDict_SetItemString(d,"wxTE_AUTO_SCROLL", PyInt_FromLong((long) wxTE_AUTO_SCROLL));
PyDict_SetItemString(d,"wxTE_PROCESS_ENTER", PyInt_FromLong((long) wxTE_PROCESS_ENTER));
PyDict_SetItemString(d,"wxTE_PASSWORD", PyInt_FromLong((long) wxTE_PASSWORD));
PyDict_SetItemString(d,"wxTE_AUTO_URL", PyInt_FromLong((long) wxTE_AUTO_URL));
PyDict_SetItemString(d,"wxTE_NOHIDESEL", PyInt_FromLong((long) wxTE_NOHIDESEL));
PyDict_SetItemString(d,"wxTE_DONTWRAP", PyInt_FromLong((long) wxTE_DONTWRAP));
PyDict_SetItemString(d,"wxTE_LINEWRAP", PyInt_FromLong((long) wxTE_LINEWRAP));
PyDict_SetItemString(d,"wxTE_WORDWRAP", PyInt_FromLong((long) wxTE_WORDWRAP));
PyDict_SetItemString(d,"wxCB_SIMPLE", PyInt_FromLong((long) wxCB_SIMPLE));
PyDict_SetItemString(d,"wxCB_DROPDOWN", PyInt_FromLong((long) wxCB_DROPDOWN));
PyDict_SetItemString(d,"wxCB_SORT", PyInt_FromLong((long) wxCB_SORT));

13
wxPython/src/msw/wx.py
View File

@@ -245,16 +245,19 @@ wxLB_OWNERDRAW = wxc.wxLB_OWNERDRAW
wxLB_HSCROLL = wxc.wxLB_HSCROLL
wxPROCESS_ENTER = wxc.wxPROCESS_ENTER
wxPASSWORD = wxc.wxPASSWORD
wxTE_PROCESS_ENTER = wxc.wxTE_PROCESS_ENTER
wxTE_PROCESS_TAB = wxc.wxTE_PROCESS_TAB
wxTE_PASSWORD = wxc.wxTE_PASSWORD
wxTE_READONLY = wxc.wxTE_READONLY
wxTE_RICH = wxc.wxTE_RICH
wxTE_MULTILINE = wxc.wxTE_MULTILINE
wxTE_AUTO_SCROLL = wxc.wxTE_AUTO_SCROLL
wxTE_PROCESS_TAB = wxc.wxTE_PROCESS_TAB
wxTE_RICH = wxc.wxTE_RICH
wxTE_NO_VSCROLL = wxc.wxTE_NO_VSCROLL
wxTE_AUTO_SCROLL = wxc.wxTE_AUTO_SCROLL
wxTE_PROCESS_ENTER = wxc.wxTE_PROCESS_ENTER
wxTE_PASSWORD = wxc.wxTE_PASSWORD
wxTE_AUTO_URL = wxc.wxTE_AUTO_URL
wxTE_NOHIDESEL = wxc.wxTE_NOHIDESEL
wxTE_DONTWRAP = wxc.wxTE_DONTWRAP
wxTE_LINEWRAP = wxc.wxTE_LINEWRAP
wxTE_WORDWRAP = wxc.wxTE_WORDWRAP
wxCB_SIMPLE = wxc.wxCB_SIMPLE
wxCB_DROPDOWN = wxc.wxCB_DROPDOWN
wxCB_SORT = wxc.wxCB_SORT

3
wxPython/src/my_typemaps.i
View File

@@ -331,7 +331,6 @@
%typemap(python, out) wxMouseEvent* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxObject* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxPyPrintout* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxSizer* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxToolBarToolBase* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxToolTip* { $target = wxPyMake_wxObject($source); }
@@ -351,6 +350,8 @@
%typemap(python, out) wxToolBarBase* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxWindow* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxSizer* { $target = wxPyMake_wxSizer($source); }
//%typemap(python, out) wxHtmlCell* { $target = wxPyMake_wxObject($source); }
//%typemap(python, out) wxHtmlContainerCell* { $target = wxPyMake_wxObject($source); }

1
wxPython/src/wx.i
View File

@@ -190,6 +190,7 @@ static wxPyCoreAPI API = {
wxPyClassExists,
wxPyMake_wxObject,
wxPyMake_wxSizer,
wxPyPtrTypeMap_Add,
};