Adding code to load Config objects from a file, and move to modifying environment...

[wxWidgets.git] / wxPython / src / gtk / _gdi_wrap.cpp

diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp
index 7d8af2b8afc0b77accaff77662b6d3ed728df499..8c8a718873b26b784ba8d657e2471f1f98c490b7 100644 (file)
--- a/wxPython/src/gtk/_gdi_wrap.cpp
+++ b/wxPython/src/gtk/_gdi_wrap.cpp
@@ -1624,7 +1624,7 @@ SWIG_AsVal_long(PyObject* obj, long* val)
         return 1;
     }
     else {
         return 1;
     }
     else {

-        SWIG_type_error("number", obj);
+        SWIG_Python_TypeError("number", obj);

     }
     return 0;
 }
     }
     return 0;
 }


@@ -1711,7 +1711,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
 {
     long v = 0;
     if (SWIG_AsVal_long(obj, &v) && v < 0) {
 {
     long v = 0;
     if (SWIG_AsVal_long(obj, &v) && v < 0) {

-        SWIG_type_error("unsigned number", obj);
+        SWIG_Python_TypeError("unsigned number", obj);

     }
     else if (val)
         *val = (unsigned long)v;
     }
     else if (val)
         *val = (unsigned long)v;


@@ -1863,31 +1863,30 @@ SWIG_Check_int(PyObject* obj)
 /*@@*/
 
 
 /*@@*/
 
 

-  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
-    PyObject*   o2;
-    PyObject*   o3;
-    
-    if (!target) {                   
-        target = o;
-    } else if (target == Py_None) {  
-        Py_DECREF(Py_None);
-        target = o;
-    } else {
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }            
-        o3 = PyTuple_New(1);            
-        PyTuple_SetItem(o3, 0, o);      
-
-        o2 = target;
-        target = PySequence_Concat(o2, o3); 
-        Py_DECREF(o2);                      
-        Py_DECREF(o3);
-    }
-    return target;
-  }
+    static PyObject* t_output_helper(PyObject* result, PyObject* obj)
+    {
+        PyObject*   o2;
+        PyObject*   o3;
+        if (!result) {
+            result = obj;
+        } else if (result == Py_None) {
+            Py_DECREF(result);
+            result = obj;
+        } else {
+            if (!PyTuple_Check(result)) {
+                o2 = result;
+                result = PyTuple_New(1);
+                PyTuple_SET_ITEM(result, 0, o2);
+            }
+            o3 = PyTuple_New(1);            
+            PyTuple_SetItem(o3, 0, obj);      
+            o2 = result;
+            result = PySequence_Concat(o2, o3); 
+            Py_DECREF(o2);                      
+            Py_DECREF(o3);
+        }
+        return result;
+    }

 
 
 static PyObject *wxPen_GetDashes(wxPen *self){
 
 
 static PyObject *wxPen_GetDashes(wxPen *self){


@@ -2192,7 +2191,7 @@ SWIG_AsVal_double(PyObject *obj, double* val)
         return 1;
     }
     else {
         return 1;
     }
     else {

-        SWIG_type_error("number", obj);
+        SWIG_Python_TypeError("number", obj);

     }
     return 0;
 }
     }
     return 0;
 }


@@ -12480,155 +12479,212 @@ static PyObject *_wrap_delete_DC(PyObject *, PyObject *args, PyObject *kwargs) {
 }
 
 
 }
 
 

-static PyObject *_wrap_DC_BeginDrawing(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_FloodFill(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj = NULL;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *resultobj = NULL;
     wxDC *arg1 = (wxDC *) 0 ;

+    int arg2 ;
+    int arg3 ;
+    wxColour *arg4 = 0 ;
+    int arg5 = (int) wxFLOOD_SURFACE ;
+    bool result;
+    wxColour temp4 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self", NULL 
+        (char *) "self",(char *) "x",(char *) "y",(char *) "col",(char *) "style", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_BeginDrawing",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;

     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;

+    {
+        arg2 = static_cast<int >(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    {
+        arg3 = static_cast<int >(SWIG_As_int(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
+    }
+    {
+        arg4 = &temp4;
+        if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = static_cast<int >(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
+        }
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->BeginDrawing();
+        result = (bool)(arg1)->FloodFill(arg2,arg3,(wxColour const &)*arg4,arg5);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_DC_EndDrawing(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_FloodFillPoint(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj = NULL;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *resultobj = NULL;
     wxDC *arg1 = (wxDC *) 0 ;

+    wxPoint *arg2 = 0 ;
+    wxColour *arg3 = 0 ;
+    int arg4 = (int) wxFLOOD_SURFACE ;
+    bool result;
+    wxPoint temp2 ;
+    wxColour temp3 ;

     PyObject * obj0 = 0 ;
     PyObject * obj0 = 0 ;

+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self", NULL 
+        (char *) "self",(char *) "pt",(char *) "col",(char *) "style", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_EndDrawing",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_FloodFillPoint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;

     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;

+    {
+        arg2 = &temp2;
+        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+    }
+    {
+        arg3 = &temp3;
+        if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = static_cast<int >(SWIG_As_int(obj3)); 
+            if (SWIG_arg_fail(4)) SWIG_fail;
+        }
+    }

     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->EndDrawing();
+        result = (bool)(arg1)->FloodFill((wxPoint const &)*arg2,(wxColour const &)*arg3,arg4);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_DC_FloodFill(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GradientFillConcentric(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj = NULL;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *resultobj = NULL;
     wxDC *arg1 = (wxDC *) 0 ;

-    int arg2 ;
-    int arg3 ;
+    wxRect *arg2 = 0 ;
+    wxColour *arg3 = 0 ;

     wxColour *arg4 = 0 ;
     wxColour *arg4 = 0 ;

-    int arg5 = (int) wxFLOOD_SURFACE ;
-    bool result;
+    wxPoint *arg5 = 0 ;
+    wxRect temp2 ;
+    wxColour temp3 ;

     wxColour temp4 ;
     wxColour temp4 ;

+    wxPoint temp5 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
     PyObject * obj4 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
     PyObject * obj4 = 0 ;
     char *kwnames[] = {

-        (char *) "self",(char *) "x",(char *) "y",(char *) "col",(char *) "style", NULL 
+        (char *) "self",(char *) "rect",(char *) "initialColour",(char *) "destColour",(char *) "circleCenter", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_GradientFillConcentric",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;

     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {

-        arg2 = static_cast<int >(SWIG_As_int(obj1)); 
-        if (SWIG_arg_fail(2)) SWIG_fail;
+        arg2 = &temp2;
+        if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;

     }
     {
     }
     {

-        arg3 = static_cast<int >(SWIG_As_int(obj2)); 
-        if (SWIG_arg_fail(3)) SWIG_fail;
+        arg3 = &temp3;
+        if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;

     }
     {
         arg4 = &temp4;
         if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail;
     }
     }
     {
         arg4 = &temp4;
         if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail;
     }

-    if (obj4) {
-        {
-            arg5 = static_cast<int >(SWIG_As_int(obj4)); 
-            if (SWIG_arg_fail(5)) SWIG_fail;
-        }
+    {
+        arg5 = &temp5;
+        if ( ! wxPoint_helper(obj4, &arg5)) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)(arg1)->FloodFill(arg2,arg3,(wxColour const &)*arg4,arg5);
+        (arg1)->GradientFillConcentric((wxRect const &)*arg2,(wxColour const &)*arg3,(wxColour const &)*arg4,(wxPoint const &)*arg5);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    {
-        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-    }
+    Py_INCREF(Py_None); resultobj = Py_None;

     return resultobj;
     fail:
     return NULL;
 }
 
 
     return resultobj;
     fail:
     return NULL;
 }
 
 

-static PyObject *_wrap_DC_FloodFillPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GradientFillLinear(PyObject *, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj = NULL;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *resultobj = NULL;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxPoint *arg2 = 0 ;
+    wxRect *arg2 = 0 ;

     wxColour *arg3 = 0 ;
     wxColour *arg3 = 0 ;

-    int arg4 = (int) wxFLOOD_SURFACE ;
-    bool result;
-    wxPoint temp2 ;
+    wxColour *arg4 = 0 ;
+    wxDirection arg5 = (wxDirection) wxEAST ;
+    wxRect temp2 ;

     wxColour temp3 ;
     wxColour temp3 ;

+    wxColour temp4 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;

+    PyObject * obj4 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self",(char *) "pt",(char *) "col",(char *) "style", NULL 
+        (char *) "self",(char *) "rect",(char *) "initialColour",(char *) "destColour",(char *) "nDirection", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_FloodFillPoint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_GradientFillLinear",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;

     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;

-        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+        if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;

     }
     {
         arg3 = &temp3;
         if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
     }
     }
     {
         arg3 = &temp3;
         if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
     }

-    if (obj3) {
+    {
+        arg4 = &temp4;
+        if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail;
+    }
+    if (obj4) {

         {
         {

-            arg4 = static_cast<int >(SWIG_As_int(obj3)); 
-            if (SWIG_arg_fail(4)) SWIG_fail;
+            arg5 = static_cast<wxDirection >(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;

         }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        result = (bool)(arg1)->FloodFill((wxPoint const &)*arg2,(wxColour const &)*arg3,arg4);
+        (arg1)->GradientFillLinear((wxRect const &)*arg2,(wxColour const &)*arg3,(wxColour const &)*arg4,arg5);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    {
-        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-    }
+    Py_INCREF(Py_None); resultobj = Py_None;

     return resultobj;
     fail:
     return NULL;
     return resultobj;
     fail:
     return NULL;


@@ -17483,27 +17539,32 @@ static PyObject * MemoryDC_swigregister(PyObject *, PyObject *args) {
 static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj = NULL;
     wxDC *arg1 = (wxDC *) 0 ;
 static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj = NULL;
     wxDC *arg1 = (wxDC *) 0 ;

-    wxBitmap *arg2 = 0 ;
-    int arg3 ;
+    wxBitmap const &arg2_defvalue = wxNullBitmap ;
+    wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
+    int arg3 = (int) wxBUFFER_CLIENT_AREA ;

     wxBufferedDC *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     
     wxBufferedDC *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     

-    if(!PyArg_ParseTuple(args,(char *)"OOO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"O|OO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;

     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;

-    {
-        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        if (arg2 == NULL) {
-            SWIG_null_ref("wxBitmap");
+    if (obj1) {
+        {
+            SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
+            if (SWIG_arg_fail(2)) SWIG_fail;
+            if (arg2 == NULL) {
+                SWIG_null_ref("wxBitmap");
+            }
+            if (SWIG_arg_fail(2)) SWIG_fail;

         }
         }

-        if (SWIG_arg_fail(2)) SWIG_fail;

     }
     }

-    {
-        arg3 = static_cast<int >(SWIG_As_int(obj2)); 
-        if (SWIG_arg_fail(3)) SWIG_fail;
+    if (obj2) {
+        {
+            arg3 = static_cast<int >(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
+        }

     }
     {
         if (!wxPyCheckForApp()) SWIG_fail;
     }
     {
         if (!wxPyCheckForApp()) SWIG_fail;


@@ -17521,84 +17582,28 @@ static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) {
 
 
 static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *, PyObject *args) {
 
 
 static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *, PyObject *args) {

-    PyObject *resultobj = NULL;
-    wxDC *arg1 = (wxDC *) 0 ;
-    wxBitmap *arg2 = 0 ;
-    wxBufferedDC *result;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    
-    if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail;
-    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
-    if (SWIG_arg_fail(1)) SWIG_fail;
-    {
-        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        if (arg2 == NULL) {
-            SWIG_null_ref("wxBitmap");
-        }
-        if (SWIG_arg_fail(2)) SWIG_fail;
-    }
-    {
-        if (!wxPyCheckForApp()) SWIG_fail;
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedDC, 1);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_new_BufferedDC__SWIG_2(PyObject *, PyObject *args) {
-    PyObject *resultobj = NULL;
-    wxDC *arg1 = (wxDC *) 0 ;
-    wxBufferedDC *result;
-    PyObject * obj0 = 0 ;
-    
-    if(!PyArg_ParseTuple(args,(char *)"O:new_BufferedDC",&obj0)) goto fail;
-    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
-    if (SWIG_arg_fail(1)) SWIG_fail;
-    {
-        if (!wxPyCheckForApp()) SWIG_fail;
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxBufferedDC *)new wxBufferedDC(arg1);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedDC, 1);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_new_BufferedDC__SWIG_3(PyObject *, PyObject *args) {

     PyObject *resultobj = NULL;
     wxDC *arg1 = (wxDC *) 0 ;
     wxSize *arg2 = 0 ;
     PyObject *resultobj = NULL;
     wxDC *arg1 = (wxDC *) 0 ;
     wxSize *arg2 = 0 ;

-    int arg3 ;
+    int arg3 = (int) wxBUFFER_CLIENT_AREA ;

     wxBufferedDC *result;
     wxSize temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     
     wxBufferedDC *result;
     wxSize temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     

-    if(!PyArg_ParseTuple(args,(char *)"OOO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;

     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
     }
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
     }

-    {
-        arg3 = static_cast<int >(SWIG_As_int(obj2)); 
-        if (SWIG_arg_fail(3)) SWIG_fail;
+    if (obj2) {
+        {
+            arg3 = static_cast<int >(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
+        }

     }
     {
         if (!wxPyCheckForApp()) SWIG_fail;
     }
     {
         if (!wxPyCheckForApp()) SWIG_fail;


@@ -17615,37 +17620,6 @@ static PyObject *_wrap_new_BufferedDC__SWIG_3(PyObject *, PyObject *args) {
 }
 
 
 }
 
 

-static PyObject *_wrap_new_BufferedDC__SWIG_4(PyObject *, PyObject *args) {
-    PyObject *resultobj = NULL;
-    wxDC *arg1 = (wxDC *) 0 ;
-    wxSize *arg2 = 0 ;
-    wxBufferedDC *result;
-    wxSize temp2 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    
-    if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail;
-    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
-    if (SWIG_arg_fail(1)) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
-    }
-    {
-        if (!wxPyCheckForApp()) SWIG_fail;
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedDC, 1);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-

 static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
     int argc;
     PyObject *argv[4];
 static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
     int argc;
     PyObject *argv[4];


@@ -17655,7 +17629,7 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
     for (ii = 0; (ii < argc) && (ii < 3); ii++) {
         argv[ii] = PyTuple_GetItem(args,ii);
     }
     for (ii = 0; (ii < argc) && (ii < 3); ii++) {
         argv[ii] = PyTuple_GetItem(args,ii);
     }

-    if (argc == 1) {
+    if ((argc >= 1) && (argc <= 3)) {

         int _v;
         {
             void *ptr;
         int _v;
         {
             void *ptr;


@@ -17667,21 +17641,9 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
             }
         }
         if (_v) {
             }
         }
         if (_v) {

-            return _wrap_new_BufferedDC__SWIG_2(self,args);
-        }
-    }
-    if (argc == 2) {
-        int _v;
-        {
-            void *ptr;
-            if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxDC, 0) == -1) {
-                _v = 0;
-                PyErr_Clear();
-            } else {
-                _v = 1;
+            if (argc <= 1) {
+                return _wrap_new_BufferedDC__SWIG_0(self,args);

             }
             }

-        }
-        if (_v) {

             {
                 void *ptr = 0;
                 if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) {
             {
                 void *ptr = 0;
                 if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) {


@@ -17692,54 +17654,17 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
                 }
             }
             if (_v) {
                 }
             }
             if (_v) {

-                return _wrap_new_BufferedDC__SWIG_1(self,args);
-            }
-        }
-    }
-    if (argc == 2) {
-        int _v;
-        {
-            void *ptr;
-            if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxDC, 0) == -1) {
-                _v = 0;
-                PyErr_Clear();
-            } else {
-                _v = 1;
-            }
-        }
-        if (_v) {
-            {
-                _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2);
-            }
-            if (_v) {
-                return _wrap_new_BufferedDC__SWIG_4(self,args);
-            }
-        }
-    }
-    if (argc == 3) {
-        int _v;
-        {
-            void *ptr;
-            if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxDC, 0) == -1) {
-                _v = 0;
-                PyErr_Clear();
-            } else {
-                _v = 1;
-            }
-        }
-        if (_v) {
-            {
-                _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2);
-            }
-            if (_v) {
+                if (argc <= 2) {
+                    return _wrap_new_BufferedDC__SWIG_0(self,args);
+                }

                 _v = SWIG_Check_int(argv[2]);
                 if (_v) {
                 _v = SWIG_Check_int(argv[2]);
                 if (_v) {

-                    return _wrap_new_BufferedDC__SWIG_3(self,args);
+                    return _wrap_new_BufferedDC__SWIG_0(self,args);

                 }
             }
         }
     }
                 }
             }
         }
     }

-    if (argc == 3) {
+    if ((argc >= 2) && (argc <= 3)) {

         int _v;
         {
             void *ptr;
         int _v;
         {
             void *ptr;


@@ -17752,18 +17677,15 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
         }
         if (_v) {
             {
         }
         if (_v) {
             {

-                void *ptr = 0;
-                if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) {
-                    _v = 0;
-                    PyErr_Clear();
-                } else {
-                    _v = (ptr != 0);
-                }
+                _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2);

             }
             if (_v) {
             }
             if (_v) {

+                if (argc <= 2) {
+                    return _wrap_new_BufferedDC__SWIG_1(self,args);
+                }

                 _v = SWIG_Check_int(argv[2]);
                 if (_v) {
                 _v = SWIG_Check_int(argv[2]);
                 if (_v) {

-                    return _wrap_new_BufferedDC__SWIG_0(self,args);
+                    return _wrap_new_BufferedDC__SWIG_1(self,args);

                 }
             }
         }
                 }
             }
         }


@@ -18531,7 +18453,7 @@ static PyObject *_wrap_new_ImageList(PyObject *, PyObject *args, PyObject *kwarg
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {

-        resultobj = wxPyMake_wxObject(result, 1); 
+        resultobj = wxPyMake_wxObject(result, (bool)1); 

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -21982,10 +21904,10 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"EncodingConverter_CanConvert", (PyCFunction) _wrap_EncodingConverter_CanConvert, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"EncodingConverter_swigregister", EncodingConverter_swigregister, METH_VARARGS, NULL},
         { (char *)"delete_DC", (PyCFunction) _wrap_delete_DC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"EncodingConverter_CanConvert", (PyCFunction) _wrap_EncodingConverter_CanConvert, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"EncodingConverter_swigregister", EncodingConverter_swigregister, METH_VARARGS, NULL},
         { (char *)"delete_DC", (PyCFunction) _wrap_delete_DC, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"DC_BeginDrawing", (PyCFunction) _wrap_DC_BeginDrawing, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"DC_EndDrawing", (PyCFunction) _wrap_DC_EndDrawing, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"DC_FloodFill", (PyCFunction) _wrap_DC_FloodFill, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_FloodFillPoint", (PyCFunction) _wrap_DC_FloodFillPoint, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_FloodFill", (PyCFunction) _wrap_DC_FloodFill, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_FloodFillPoint", (PyCFunction) _wrap_DC_FloodFillPoint, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"DC_GradientFillConcentric", (PyCFunction) _wrap_DC_GradientFillConcentric, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"DC_GradientFillLinear", (PyCFunction) _wrap_DC_GradientFillLinear, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"DC_GetPixel", (PyCFunction) _wrap_DC_GetPixel, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_GetPixelPoint", (PyCFunction) _wrap_DC_GetPixelPoint, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_DrawLine", (PyCFunction) _wrap_DC_DrawLine, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_GetPixel", (PyCFunction) _wrap_DC_GetPixel, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_GetPixelPoint", (PyCFunction) _wrap_DC_GetPixelPoint, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_DrawLine", (PyCFunction) _wrap_DC_DrawLine, METH_VARARGS | METH_KEYWORDS, NULL},