Minor tweaks to get up to date with wx CVS

[wxWidgets.git] / wxPython / src / msw / animate_wrap.cpp

diff --git a/wxPython/src/msw/animate_wrap.cpp b/wxPython/src/msw/animate_wrap.cpp
index 267cf4a4636bb762f80dc07d042da91164f436b4..1255bf084b8926b67c3c02e4cfc2c80b1fda93fe 100644 (file)
--- a/wxPython/src/msw/animate_wrap.cpp
+++ b/wxPython/src/msw/animate_wrap.cpp
@@ -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
 #include <limits.h>
 #ifndef LLONG_MIN
 # define LLONG_MIN     LONG_LONG_MIN


@@ -2739,6 +2690,17 @@ SWIG_From_size_t  (size_t value)
 #endif
 
 
 #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)
 {
 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 ;
 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 ;
   int result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  size_t val2 ;
+  int val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   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);
     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)) {
   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);
   {
     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 ;
 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] ;
   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();
   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;
   }
     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;
   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 ;
 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 ;
   SwigValueWrapper<wxImage > result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  size_t val2 ;
+  int val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   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);
     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)) {
   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);
   {
     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 ;
 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 ;
   wxPoint result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  size_t val2 ;
+  int val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   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);
     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)) {
   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);
   {
     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 ;
 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 ;
   wxSize result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  size_t val2 ;
+  int val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   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);
     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)) {
   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);
   {
     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 ;
 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 ;
   wxAnimationDisposal result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  size_t val2 ;
+  int val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   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);
     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)) {
   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);
   {
     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 ;
 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 ;
   wxColour result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  size_t val2 ;
+  int val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   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);
     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)) {
   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);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     result = ((wxAnimation const *)arg1)->GetTransparentColour(arg2);