reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2006-12-11 07:33:10 +00:00
parent ece5ecd8fb
commit bda4b4c684
8 changed files with 297 additions and 293 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -3378,9 +3378,6 @@ SWIGINTERN wxDateTime wxDatePickerCtrl_GetUpperLimit(wxDatePickerCtrl *self){
static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr);
static const wxString wxPyFontPickerCtrlNameStr(wxFontPickerCtrlNameStr);
static const wxString wxPyCollapsiblePaneNameStr(wxCollapsiblePaneNameStr);
#include <wx/srchctrl.h>
static const wxString wxPySearchCtrlNameStr(wxSearchCtrlNameStr);
#ifdef __cplusplus
extern "C" {

View File

@ -3377,9 +3377,6 @@ SWIGINTERN wxDateTime wxDatePickerCtrl_GetUpperLimit(wxDatePickerCtrl *self){
static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr);
static const wxString wxPyFontPickerCtrlNameStr(wxFontPickerCtrlNameStr);
static const wxString wxPyCollapsiblePaneNameStr(wxCollapsiblePaneNameStr);
#include <wx/srchctrl.h>
static const wxString wxPySearchCtrlNameStr(wxSearchCtrlNameStr);
SWIGINTERN void wxSearchCtrl_SetSearchBitmap(wxSearchCtrl *self,wxBitmap const &){}
SWIGINTERN void wxSearchCtrl_SetSearchMenuBitmap(wxSearchCtrl *self,wxBitmap const &){}

View File

@ -80,15 +80,15 @@ class AnimationBase(_core.Object):
return _animate.AnimationBase_IsOk(*args, **kwargs)
def GetDelay(*args, **kwargs):
"""GetDelay(self, size_t i) -> int"""
"""GetDelay(self, int i) -> int"""
return _animate.AnimationBase_GetDelay(*args, **kwargs)
def GetFrameCount(*args, **kwargs):
"""GetFrameCount(self) -> size_t"""
"""GetFrameCount(self) -> int"""
return _animate.AnimationBase_GetFrameCount(*args, **kwargs)
def GetFrame(*args, **kwargs):
"""GetFrame(self, size_t i) -> Image"""
"""GetFrame(self, int i) -> Image"""
return _animate.AnimationBase_GetFrame(*args, **kwargs)
def GetSize(*args, **kwargs):
@ -120,19 +120,19 @@ class Animation(AnimationBase):
__swig_destroy__ = _animate.delete_Animation
__del__ = lambda self : None;
def GetFramePosition(*args, **kwargs):
"""GetFramePosition(self, size_t frame) -> Point"""
"""GetFramePosition(self, int frame) -> Point"""
return _animate.Animation_GetFramePosition(*args, **kwargs)
def GetFrameSize(*args, **kwargs):
"""GetFrameSize(self, size_t frame) -> Size"""
"""GetFrameSize(self, int frame) -> Size"""
return _animate.Animation_GetFrameSize(*args, **kwargs)
def GetDisposalMethod(*args, **kwargs):
"""GetDisposalMethod(self, size_t frame) -> int"""
"""GetDisposalMethod(self, int frame) -> int"""
return _animate.Animation_GetDisposalMethod(*args, **kwargs)
def GetTransparentColour(*args, **kwargs):
"""GetTransparentColour(self, size_t frame) -> Colour"""
"""GetTransparentColour(self, int frame) -> Colour"""
return _animate.Animation_GetTransparentColour(*args, **kwargs)
def GetBackgroundColour(*args, **kwargs):

View File

@ -2678,55 +2678,6 @@ SWIG_From_int (int value)
}
SWIGINTERN int
SWIG_AsVal_long (PyObject* obj, long* val)
{
if (PyNumber_Check(obj)) {
if (val) *val = PyInt_AsLong(obj);
return SWIG_OK;
}
return SWIG_TypeError;
}
SWIGINTERN int
SWIG_AsVal_unsigned_SS_long (PyObject* obj, unsigned long* val)
{
long v = 0;
if (SWIG_AsVal_long(obj, &v) && v < 0) {
return SWIG_TypeError;
}
else if (val)
*val = (unsigned long)v;
return SWIG_OK;
}
SWIGINTERNINLINE int
SWIG_AsVal_size_t (PyObject * obj, size_t *val)
{
unsigned long v;
int res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0);
if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v);
return res;
}
SWIGINTERNINLINE PyObject*
SWIG_From_unsigned_SS_long (unsigned long value)
{
return (value > LONG_MAX) ?
PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value));
}
SWIGINTERNINLINE PyObject *
SWIG_From_size_t (size_t value)
{
return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value));
}
#include <limits.h>
#ifndef LLONG_MIN
# define LLONG_MIN LONG_LONG_MIN
@ -2739,6 +2690,17 @@ SWIG_From_size_t (size_t value)
#endif
SWIGINTERN int
SWIG_AsVal_long (PyObject* obj, long* val)
{
if (PyNumber_Check(obj)) {
if (val) *val = PyInt_AsLong(obj);
return SWIG_OK;
}
return SWIG_TypeError;
}
SWIGINTERN int
SWIG_AsVal_int (PyObject * obj, int *val)
{
@ -2866,11 +2828,11 @@ fail:
SWIGINTERN PyObject *_wrap_AnimationBase_GetDelay(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAnimationBase *arg1 = (wxAnimationBase *) 0 ;
size_t arg2 ;
int arg2 ;
int result;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -2884,11 +2846,11 @@ SWIGINTERN PyObject *_wrap_AnimationBase_GetDelay(PyObject *SWIGUNUSEDPARM(self)
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AnimationBase_GetDelay" "', expected argument " "1"" of type '" "wxAnimationBase const *""'");
}
arg1 = reinterpret_cast< wxAnimationBase * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AnimationBase_GetDelay" "', expected argument " "2"" of type '" "size_t""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AnimationBase_GetDelay" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< size_t >(val2);
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)((wxAnimationBase const *)arg1)->GetDelay(arg2);
@ -2905,7 +2867,7 @@ fail:
SWIGINTERN PyObject *_wrap_AnimationBase_GetFrameCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxAnimationBase *arg1 = (wxAnimationBase *) 0 ;
size_t result;
int result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@ -2919,11 +2881,11 @@ SWIGINTERN PyObject *_wrap_AnimationBase_GetFrameCount(PyObject *SWIGUNUSEDPARM(
arg1 = reinterpret_cast< wxAnimationBase * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (size_t)((wxAnimationBase const *)arg1)->GetFrameCount();
result = (int)((wxAnimationBase const *)arg1)->GetFrameCount();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_size_t(static_cast< size_t >(result));
resultobj = SWIG_From_int(static_cast< int >(result));
return resultobj;
fail:
return NULL;
@ -2933,11 +2895,11 @@ fail:
SWIGINTERN PyObject *_wrap_AnimationBase_GetFrame(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAnimationBase *arg1 = (wxAnimationBase *) 0 ;
size_t arg2 ;
int arg2 ;
SwigValueWrapper<wxImage > result;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -2951,11 +2913,11 @@ SWIGINTERN PyObject *_wrap_AnimationBase_GetFrame(PyObject *SWIGUNUSEDPARM(self)
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AnimationBase_GetFrame" "', expected argument " "1"" of type '" "wxAnimationBase const *""'");
}
arg1 = reinterpret_cast< wxAnimationBase * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AnimationBase_GetFrame" "', expected argument " "2"" of type '" "size_t""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AnimationBase_GetFrame" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< size_t >(val2);
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxAnimationBase const *)arg1)->GetFrame(arg2);
@ -3241,11 +3203,11 @@ fail:
SWIGINTERN PyObject *_wrap_Animation_GetFramePosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAnimation *arg1 = (wxAnimation *) 0 ;
size_t arg2 ;
int arg2 ;
wxPoint result;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -3259,11 +3221,11 @@ SWIGINTERN PyObject *_wrap_Animation_GetFramePosition(PyObject *SWIGUNUSEDPARM(s
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetFramePosition" "', expected argument " "1"" of type '" "wxAnimation const *""'");
}
arg1 = reinterpret_cast< wxAnimation * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetFramePosition" "', expected argument " "2"" of type '" "size_t""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetFramePosition" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< size_t >(val2);
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxAnimation const *)arg1)->GetFramePosition(arg2);
@ -3280,11 +3242,11 @@ fail:
SWIGINTERN PyObject *_wrap_Animation_GetFrameSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAnimation *arg1 = (wxAnimation *) 0 ;
size_t arg2 ;
int arg2 ;
wxSize result;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -3298,11 +3260,11 @@ SWIGINTERN PyObject *_wrap_Animation_GetFrameSize(PyObject *SWIGUNUSEDPARM(self)
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetFrameSize" "', expected argument " "1"" of type '" "wxAnimation const *""'");
}
arg1 = reinterpret_cast< wxAnimation * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetFrameSize" "', expected argument " "2"" of type '" "size_t""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetFrameSize" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< size_t >(val2);
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxAnimation const *)arg1)->GetFrameSize(arg2);
@ -3319,11 +3281,11 @@ fail:
SWIGINTERN PyObject *_wrap_Animation_GetDisposalMethod(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAnimation *arg1 = (wxAnimation *) 0 ;
size_t arg2 ;
int arg2 ;
wxAnimationDisposal result;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -3337,11 +3299,11 @@ SWIGINTERN PyObject *_wrap_Animation_GetDisposalMethod(PyObject *SWIGUNUSEDPARM(
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetDisposalMethod" "', expected argument " "1"" of type '" "wxAnimation const *""'");
}
arg1 = reinterpret_cast< wxAnimation * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetDisposalMethod" "', expected argument " "2"" of type '" "size_t""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetDisposalMethod" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< size_t >(val2);
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAnimationDisposal)((wxAnimation const *)arg1)->GetDisposalMethod(arg2);
@ -3358,11 +3320,11 @@ fail:
SWIGINTERN PyObject *_wrap_Animation_GetTransparentColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAnimation *arg1 = (wxAnimation *) 0 ;
size_t arg2 ;
int arg2 ;
wxColour result;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -3376,11 +3338,11 @@ SWIGINTERN PyObject *_wrap_Animation_GetTransparentColour(PyObject *SWIGUNUSEDPA
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetTransparentColour" "', expected argument " "1"" of type '" "wxAnimation const *""'");
}
arg1 = reinterpret_cast< wxAnimation * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetTransparentColour" "', expected argument " "2"" of type '" "size_t""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetTransparentColour" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< size_t >(val2);
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxAnimation const *)arg1)->GetTransparentColour(arg2);

View File

@ -3378,9 +3378,6 @@ SWIGINTERN wxDateTime wxDatePickerCtrl_GetUpperLimit(wxDatePickerCtrl *self){
static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr);
static const wxString wxPyFontPickerCtrlNameStr(wxFontPickerCtrlNameStr);
static const wxString wxPyCollapsiblePaneNameStr(wxCollapsiblePaneNameStr);
#include <wx/srchctrl.h>
static const wxString wxPySearchCtrlNameStr(wxSearchCtrlNameStr);
#ifdef __cplusplus
extern "C" {