fixes for GetReturnCode/SetReturnCode

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 1999-05-15 00:56:11 +00:00
parent 089e55d6e8
commit 4cd9591aab
7 changed files with 78 additions and 104 deletions

View File

@ -1033,31 +1033,6 @@ static PyObject *_wrap_wxWindow_GetRect(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_GetReturnCode(_swigobj) (_swigobj->GetReturnCode())
static PyObject *_wrap_wxWindow_GetReturnCode(PyObject *self, PyObject *args) {
PyObject * _resultobj;
int _result;
wxWindow * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxWindow_GetReturnCode",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetReturnCode. Expected _wxWindow_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (int )wxWindow_GetReturnCode(_arg0);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxWindow_GetScrollThumb(_swigobj,_swigarg0) (_swigobj->GetScrollThumb(_swigarg0))
static PyObject *_wrap_wxWindow_GetScrollThumb(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@ -2031,34 +2006,6 @@ static PyObject *_wrap_wxWindow_SetConstraints(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_SetDoubleClick(_swigobj,_swigarg0) (_swigobj->SetDoubleClick(_swigarg0))
static PyObject *_wrap_wxWindow_SetDoubleClick(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxWindow * _arg0;
bool _arg1;
char * _argc0 = 0;
int tempbool1;
self = self;
if(!PyArg_ParseTuple(args,"si:wxWindow_SetDoubleClick",&_argc0,&tempbool1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetDoubleClick. Expected _wxWindow_p.");
return NULL;
}
}
_arg1 = (bool ) tempbool1;
{
wxPy_BEGIN_ALLOW_THREADS;
wxWindow_SetDoubleClick(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxWindow_SetFocus(_swigobj) (_swigobj->SetFocus())
static PyObject *_wrap_wxWindow_SetFocus(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@ -2214,32 +2161,6 @@ static PyObject *_wrap_wxWindow_SetName(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_SetReturnCode(_swigobj,_swigarg0) (_swigobj->SetReturnCode(_swigarg0))
static PyObject *_wrap_wxWindow_SetReturnCode(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxWindow * _arg0;
int _arg1;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"si:wxWindow_SetReturnCode",&_argc0,&_arg1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetReturnCode. Expected _wxWindow_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxWindow_SetReturnCode(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxWindow_SetScrollbar(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->SetScrollbar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@ -3381,6 +3302,57 @@ static PyObject *_wrap_wxDialog_ShowModal(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxDialog_GetReturnCode(_swigobj) (_swigobj->GetReturnCode())
static PyObject *_wrap_wxDialog_GetReturnCode(PyObject *self, PyObject *args) {
PyObject * _resultobj;
int _result;
wxDialog * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxDialog_GetReturnCode",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_GetReturnCode. Expected _wxDialog_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (int )wxDialog_GetReturnCode(_arg0);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxDialog_SetReturnCode(_swigobj,_swigarg0) (_swigobj->SetReturnCode(_swigarg0))
static PyObject *_wrap_wxDialog_SetReturnCode(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxDialog * _arg0;
int _arg1;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"si:wxDialog_SetReturnCode",&_argc0,&_arg1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetReturnCode. Expected _wxDialog_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxDialog_SetReturnCode(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static void *SwigwxScrolledWindowTowxWindow(void *ptr) {
wxScrolledWindow *src;
wxWindow *dest;
@ -5125,6 +5097,8 @@ static PyMethodDef windowscMethods[] = {
{ "wxScrolledWindow_GetScrollPixelsPerUnit", _wrap_wxScrolledWindow_GetScrollPixelsPerUnit, 1 },
{ "wxScrolledWindow_EnableScrolling", _wrap_wxScrolledWindow_EnableScrolling, 1 },
{ "new_wxScrolledWindow", _wrap_new_wxScrolledWindow, 1 },
{ "wxDialog_SetReturnCode", _wrap_wxDialog_SetReturnCode, 1 },
{ "wxDialog_GetReturnCode", _wrap_wxDialog_GetReturnCode, 1 },
{ "wxDialog_ShowModal", _wrap_wxDialog_ShowModal, 1 },
{ "wxDialog_Show", _wrap_wxDialog_Show, 1 },
{ "wxDialog_SetTitle", _wrap_wxDialog_SetTitle, 1 },
@ -5162,13 +5136,11 @@ static PyMethodDef windowscMethods[] = {
{ "wxWindow_SetDimensions", _wrap_wxWindow_SetDimensions, 1 },
{ "wxWindow_SetScrollPos", _wrap_wxWindow_SetScrollPos, 1 },
{ "wxWindow_SetScrollbar", _wrap_wxWindow_SetScrollbar, 1 },
{ "wxWindow_SetReturnCode", _wrap_wxWindow_SetReturnCode, 1 },
{ "wxWindow_SetName", _wrap_wxWindow_SetName, 1 },
{ "wxWindow_SetId", _wrap_wxWindow_SetId, 1 },
{ "wxWindow_SetForegroundColour", _wrap_wxWindow_SetForegroundColour, 1 },
{ "wxWindow_SetFont", _wrap_wxWindow_SetFont, 1 },
{ "wxWindow_SetFocus", _wrap_wxWindow_SetFocus, 1 },
{ "wxWindow_SetDoubleClick", _wrap_wxWindow_SetDoubleClick, 1 },
{ "wxWindow_SetConstraints", _wrap_wxWindow_SetConstraints, 1 },
{ "wxWindow_SetBackgroundColour", _wrap_wxWindow_SetBackgroundColour, 1 },
{ "wxWindow_SetAutoLayout", _wrap_wxWindow_SetAutoLayout, 1 },
@ -5198,7 +5170,6 @@ static PyMethodDef windowscMethods[] = {
{ "wxWindow_GetScrollRange", _wrap_wxWindow_GetScrollRange, 1 },
{ "wxWindow_GetScrollPos", _wrap_wxWindow_GetScrollPos, 1 },
{ "wxWindow_GetScrollThumb", _wrap_wxWindow_GetScrollThumb, 1 },
{ "wxWindow_GetReturnCode", _wrap_wxWindow_GetReturnCode, 1 },
{ "wxWindow_GetRect", _wrap_wxWindow_GetRect, 1 },
{ "wxWindow_GetPosition", _wrap_wxWindow_GetPosition, 1 },
{ "wxWindow_GetPositionTuple", _wrap_wxWindow_GetPositionTuple, 1 },

View File

@ -132,9 +132,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
val = wxRectPtr(val)
val.thisown = 1
return val
def GetReturnCode(self):
val = windowsc.wxWindow_GetReturnCode(self.this)
return val
def GetScrollThumb(self,arg0):
val = windowsc.wxWindow_GetScrollThumb(self.this,arg0)
return val
@ -236,9 +233,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
def SetConstraints(self,arg0):
val = windowsc.wxWindow_SetConstraints(self.this,arg0.this)
return val
def SetDoubleClick(self,arg0):
val = windowsc.wxWindow_SetDoubleClick(self.this,arg0)
return val
def SetFocus(self):
val = windowsc.wxWindow_SetFocus(self.this)
return val
@ -254,9 +248,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
def SetName(self,arg0):
val = windowsc.wxWindow_SetName(self.this,arg0)
return val
def SetReturnCode(self,arg0):
val = windowsc.wxWindow_SetReturnCode(self.this,arg0)
return val
def SetScrollbar(self,arg0,arg1,arg2,arg3,*args):
val = apply(windowsc.wxWindow_SetScrollbar,(self.this,arg0,arg1,arg2,arg3,)+args)
return val
@ -417,6 +408,12 @@ class wxDialogPtr(wxPanelPtr):
def ShowModal(self):
val = windowsc.wxDialog_ShowModal(self.this)
return val
def GetReturnCode(self):
val = windowsc.wxDialog_GetReturnCode(self.this)
return val
def SetReturnCode(self,arg0):
val = windowsc.wxDialog_SetReturnCode(self.this,arg0)
return val
def __repr__(self):
return "<C wxDialog instance>"
class wxDialog(wxDialogPtr):

View File

@ -3459,7 +3459,7 @@ static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args) {
static void wxNotebook_ResizeChildren(wxNotebook *self) {
wxSizeEvent evt(self->GetClientSize());
self->OnSize(evt);
self->GetEventHandler()->ProcessEvent(evt);
}
static PyObject *_wrap_wxNotebook_ResizeChildren(PyObject *self, PyObject *args) {
PyObject * _resultobj;

View File

@ -33,10 +33,8 @@
* and things like that.
*
* $Log$
* Revision 1.11 1999/05/04 00:25:56 RD
* Some slight cleanup and reorganization
*
* Added support for making RPM distribution
* Revision 1.12 1999/05/15 00:56:11 RD
* fixes for GetReturnCode/SetReturnCode
*
************************************************************************/

View File

@ -1318,10 +1318,8 @@ class wxApp(wxPyApp):
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.10 1999/05/04 00:25:56 RD
# Some slight cleanup and reorganization
#
# Added support for making RPM distribution
# Revision 1.11 1999/05/15 00:56:11 RD
# fixes for GetReturnCode/SetReturnCode
#
# Revision 1.12 1999/04/30 03:29:18 RD
#

View File

@ -100,7 +100,6 @@ public:
%name(GetPositionTuple) void GetPosition(int *OUTPUT, int *OUTPUT);
wxPoint GetPosition();
wxRect GetRect();
int GetReturnCode();
int GetScrollThumb(int orientation);
int GetScrollPos(int orientation);
int GetScrollRange(int orientation);
@ -140,13 +139,12 @@ public:
void SetAutoLayout(bool autoLayout);
void SetBackgroundColour(const wxColour& colour);
void SetConstraints(wxLayoutConstraints *constraints);
void SetDoubleClick(bool allowDoubleClick);
// void SetDoubleClick(bool allowDoubleClick);
void SetFocus();
void SetFont(const wxFont& font);
void SetForegroundColour(const wxColour& colour);
void SetId(int id);
void SetName(const wxString& name);
void SetReturnCode(int retCode);
void SetScrollbar(int orientation, int position, int thumbSize, int range, bool refresh = TRUE);
void SetScrollPos(int orientation, int pos, bool refresh = TRUE);
@ -229,6 +227,7 @@ public:
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
void InitDialog();
};
//---------------------------------------------------------------------------
@ -255,6 +254,9 @@ public:
void SetTitle(const wxString& title);
bool Show(bool show);
int ShowModal();
int GetReturnCode();
void SetReturnCode(int retCode);
};
//---------------------------------------------------------------------------
@ -399,7 +401,11 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.16 1999/05/15 00:56:04 RD
// fixes for GetReturnCode/SetReturnCode
//
// Revision 1.15 1999/04/30 03:29:19 RD
//
// wxPython 2.0b9, first phase (win32)
// Added gobs of stuff, see wxPython/README.txt for details
//

View File

@ -256,7 +256,7 @@ public:
%addmethods {
void ResizeChildren() {
wxSizeEvent evt(self->GetClientSize());
self->OnSize(evt);
self->GetEventHandler()->ProcessEvent(evt);
}
}
@ -341,7 +341,11 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.11 1999/05/15 00:56:05 RD
// fixes for GetReturnCode/SetReturnCode
//
// Revision 1.10 1999/04/30 03:29:19 RD
//
// wxPython 2.0b9, first phase (win32)
// Added gobs of stuff, see wxPython/README.txt for details
//