AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some little tweaks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2000-11-04 07:41:29 +00:00
parent abbe77c16b
commit 3351077305
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
wxPython/src/helpers.cpp
View File

@ -246,8 +246,16 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
PyObject* wxPyConstructObject(void* ptr, PyObject* wxPyConstructObject(void* ptr,
const char* className, const char* className,
int setThisOwn) { int setThisOwn) {
PyObject* obj;
PyObject* arg;
if (!ptr) {
Py_INCREF(Py_None);
return Py_None;
}
char buff[64]; // should always be big enough... char buff[64]; // should always be big enough...
char swigptr[64]; char swigptr[64];
@ -257,12 +265,18 @@ PyObject* wxPyConstructObject(void* ptr,
sprintf(buff, "%sPtr", className); sprintf(buff, "%sPtr", className);
PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff); PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff);
if (! classobj) { if (! classobj) {
Py_INCREF(Py_None); //Py_INCREF(Py_None);
return Py_None; //return Py_None;
char temp[128];
sprintf(temp,
"*** Unknown class name %s, tell Robin about it please ***",
buff);
obj = PyString_FromString(temp);
return obj;
} }
PyObject* arg = Py_BuildValue("(s)", swigptr); arg = Py_BuildValue("(s)", swigptr);
PyObject* obj = PyInstance_New(classobj, arg, NULL); obj = PyInstance_New(classobj, arg, NULL);
Py_DECREF(arg); Py_DECREF(arg);
if (setThisOwn) { if (setThisOwn) {
@ -399,9 +413,9 @@ wxPyCallbackHelper::wxPyCallbackHelper(const wxPyCallbackHelper& other) {
} }
void wxPyCallbackHelper::setSelf(PyObject* self, PyObject* _class, int incref) { void wxPyCallbackHelper::setSelf(PyObject* self, PyObject* klass, int incref) {
m_self = self; m_self = self;
m_class = _class; m_class = klass;
m_incRef = incref; m_incRef = incref;
if (incref) { if (incref) {
Py_INCREF(m_self); Py_INCREF(m_self);

2
wxPython/src/helpers.h
View File

@ -214,7 +214,7 @@ public:
wxPyCallbackHelper(const wxPyCallbackHelper& other); wxPyCallbackHelper(const wxPyCallbackHelper& other);
void setSelf(PyObject* self, PyObject* _class, int incref=TRUE); void setSelf(PyObject* self, PyObject* klass, int incref=TRUE);
bool findCallback(const wxString& name) const; bool findCallback(const wxString& name) const;
int callCallback(PyObject* argTuple) const; int callCallback(PyObject* argTuple) const;

4
wxPython/src/windows.i
View File

@ -331,6 +331,10 @@ public:
void SetPosition(const wxPoint& pos) { void SetPosition(const wxPoint& pos) {
self->Move(pos); self->Move(pos);
} }
void SetRect(const wxRect& rect, int sizeFlags=wxSIZE_AUTO) {
self->SetSize(rect, sizeFlags);
}
} }
void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1); void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);