wxDataObject documented

[wxWidgets.git] / utils / wxPython / src / msw / gdi.cpp

diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp
index 3dac23f5fce6425036d19edc44ef5799286580fa..0d9db6b569b40e262fd68c39ba3e632eff7325f6 100644 (file)
--- a/utils/wxPython/src/msw/gdi.cpp
+++ b/utils/wxPython/src/msw/gdi.cpp
@@ -55,6 +55,9 @@ extern PyObject *SWIG_newvarlink(void);
 
 #include "helpers.h"
 #include <wx/metafile.h>
 
 #include "helpers.h"
 #include <wx/metafile.h>

+#ifndef __WXMSW__
+#include <wx/postscrp.h>
+#endif

 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;


@@ -103,15 +106,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
 }
 
 

+extern byte* byte_LIST_helper(PyObject* source);

 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
 extern wxPoint* wxPoint_LIST_helper(PyObject* source);
 extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
 extern wxString* wxString_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
 extern wxPoint* wxPoint_LIST_helper(PyObject* source);
 extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
 extern wxString* wxString_LIST_helper(PyObject* source);

-#ifdef __WXMSW__

 extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);

-#endif

 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";


@@ -1319,7 +1321,7 @@ static PyObject *_wrap_wxBitmap_SetPalette(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxBitmap_SetPalette(_arg0,_arg1);
+    wxBitmap_SetPalette(_arg0,*_arg1);

     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;


@@ -2290,58 +2292,6 @@ static PyObject *_wrap_wxPen_GetColour(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxPen_GetDashes(_swigobj,_swigarg0)  (_swigobj->GetDashes(_swigarg0))
-static PyObject *_wrap_wxPen_GetDashes(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    int  _result;
-    wxPen * _arg0;
-    wxDash ** _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxPen_GetDashes",&_argc0,&_argc1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetDashes. Expected _wxPen_p.");
-        return NULL;
-        }
-    }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxDash_pp")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_GetDashes. Expected _wxDash_pp.");
-        return NULL;
-        }
-    }
-    _result = (int )wxPen_GetDashes(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxPen_GetStipple(_swigobj)  (_swigobj->GetStipple())
-static PyObject *_wrap_wxPen_GetStipple(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxBitmap * _result;
-    wxPen * _arg0;
-    char * _argc0 = 0;
-    char _ptemp[128];
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxPen_GetStipple",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetStipple. Expected _wxPen_p.");
-        return NULL;
-        }
-    }
-    _result = (wxBitmap *)wxPen_GetStipple(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
-    return _resultobj;
-}
-

 #define wxPen_GetJoin(_swigobj)  (_swigobj->GetJoin())
 static PyObject *_wrap_wxPen_GetJoin(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxPen_GetJoin(_swigobj)  (_swigobj->GetJoin())
 static PyObject *_wrap_wxPen_GetJoin(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -2477,133 +2427,185 @@ static PyObject *_wrap_wxPen_SetColour(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxPen_SetDashes(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetDashes(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args) {
+#define wxPen_SetJoin(_swigobj,_swigarg0)  (_swigobj->SetJoin(_swigarg0))
+static PyObject *_wrap_wxPen_SetJoin(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;

-    wxDash * _arg2;

     char * _argc0 = 0;
     char * _argc0 = 0;

-    PyObject * _obj2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sO:wxPen_SetDashes",&_argc0,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"si:wxPen_SetJoin",&_argc0,&_arg1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetDashes. Expected _wxPen_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetJoin. Expected _wxPen_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    if (_obj2)
-{
-    _arg2 = (unsigned long*)long_LIST_helper(_obj2);
-    if (_arg2 == NULL) {
+    wxPen_SetJoin(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxPen_SetStyle(_swigobj,_swigarg0)  (_swigobj->SetStyle(_swigarg0))
+static PyObject *_wrap_wxPen_SetStyle(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxPen * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxPen_SetStyle",&_argc0,&_arg1)) 

         return NULL;
         return NULL;

+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStyle. Expected _wxPen_p.");
+        return NULL;
+        }

     }
     }

-}
-{
-    _arg1 = PyList_Size(_obj2);
-}
-    wxPen_SetDashes(_arg0,_arg1,_arg2);
+    wxPen_SetStyle(_arg0,_arg1);

     Py_INCREF(Py_None);
     _resultobj = Py_None;
     Py_INCREF(Py_None);
     _resultobj = Py_None;

-{
-    delete [] _arg2;
+    return _resultobj;

 }
 }

+
+#define wxPen_SetWidth(_swigobj,_swigarg0)  (_swigobj->SetWidth(_swigarg0))
+static PyObject *_wrap_wxPen_SetWidth(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxPen * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxPen_SetWidth",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetWidth. Expected _wxPen_p.");
+        return NULL;
+        }
+    }
+    wxPen_SetWidth(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxPen_SetStipple(_swigobj,_swigarg0)  (_swigobj->SetStipple(_swigarg0))
-static PyObject *_wrap_wxPen_SetStipple(PyObject *self, PyObject *args) {
+#define wxPen_GetDashes(_swigobj,_swigarg0)  (_swigobj->GetDashes(_swigarg0))
+static PyObject *_wrap_wxPen_GetDashes(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

+    int  _result;

     wxPen * _arg0;
     wxPen * _arg0;

-    wxBitmap * _arg1;
+    wxDash ** _arg1;

     char * _argc0 = 0;
     char * _argc1 = 0;
 
     self = self;
     char * _argc0 = 0;
     char * _argc1 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxPen_SetStipple",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"ss:wxPen_GetDashes",&_argc0,&_argc1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStipple. Expected _wxPen_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetDashes. Expected _wxPen_p.");

         return NULL;
         }
     }
     if (_argc1) {
         return NULL;
         }
     }
     if (_argc1) {

-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_SetStipple. Expected _wxBitmap_p.");
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxDash_pp")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_GetDashes. Expected _wxDash_pp.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxPen_SetStipple(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
+    _result = (int )wxPen_GetDashes(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxPen_SetJoin(_swigobj,_swigarg0)  (_swigobj->SetJoin(_swigarg0))
-static PyObject *_wrap_wxPen_SetJoin(PyObject *self, PyObject *args) {
+#define wxPen_GetStipple(_swigobj)  (_swigobj->GetStipple())
+static PyObject *_wrap_wxPen_GetStipple(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

+    wxBitmap * _result;

     wxPen * _arg0;
     wxPen * _arg0;

-    int  _arg1;

     char * _argc0 = 0;
     char * _argc0 = 0;

+    char _ptemp[128];

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPen_SetJoin",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"s:wxPen_GetStipple",&_argc0)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetJoin. Expected _wxPen_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetStipple. Expected _wxPen_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxPen_SetJoin(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
+    _result = (wxBitmap *)wxPen_GetStipple(_arg0);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+    _resultobj = Py_BuildValue("s",_ptemp);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxPen_SetStyle(_swigobj,_swigarg0)  (_swigobj->SetStyle(_swigarg0))
-static PyObject *_wrap_wxPen_SetStyle(PyObject *self, PyObject *args) {
+#define wxPen_SetDashes(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetDashes(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxPen * _arg0;
     int  _arg1;

+    wxDash * _arg2;

     char * _argc0 = 0;
     char * _argc0 = 0;

+    PyObject * _obj2 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPen_SetStyle",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"sO:wxPen_SetDashes",&_argc0,&_obj2)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStyle. Expected _wxPen_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetDashes. Expected _wxPen_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxPen_SetStyle(_arg0,_arg1);
+    if (_obj2)
+{
+    _arg2 = (unsigned long*)long_LIST_helper(_obj2);
+    if (_arg2 == NULL) {
+        return NULL;
+    }
+}
+{
+    _arg1 = PyList_Size(_obj2);
+}
+    wxPen_SetDashes(_arg0,_arg1,_arg2);

     Py_INCREF(Py_None);
     _resultobj = Py_None;
     Py_INCREF(Py_None);
     _resultobj = Py_None;

+{
+    delete [] _arg2;
+}

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxPen_SetWidth(_swigobj,_swigarg0)  (_swigobj->SetWidth(_swigarg0))
-static PyObject *_wrap_wxPen_SetWidth(PyObject *self, PyObject *args) {
+#define wxPen_SetStipple(_swigobj,_swigarg0)  (_swigobj->SetStipple(_swigarg0))
+static PyObject *_wrap_wxPen_SetStipple(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxPen * _arg0;
     PyObject * _resultobj;
     wxPen * _arg0;

-    int  _arg1;
+    wxBitmap * _arg1;

     char * _argc0 = 0;
     char * _argc0 = 0;

+    char * _argc1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxPen_SetWidth",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"ss:wxPen_SetStipple",&_argc0,&_argc1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetWidth. Expected _wxPen_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStipple. Expected _wxPen_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxPen_SetWidth(_arg0,_arg1);
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_SetStipple. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+    wxPen_SetStipple(_arg0,*_arg1);

     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;


@@ -2777,7 +2779,7 @@ static PyObject *_wrap_wxBrush_SetStipple(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxBrush_SetStipple(_arg0,_arg1);
+    wxBrush_SetStipple(_arg0,*_arg1);

     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;


@@ -3460,6 +3462,38 @@ static PyObject *_wrap_wxDC_EndPage(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxDC_FloodFill(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->FloodFill(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
+static PyObject *_wrap_wxDC_FloodFill(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxDC * _arg0;
+    long  _arg1;
+    long  _arg2;
+    wxColour * _arg3;
+    int  _arg4 = (wxFLOOD_SURFACE);
+    char * _argc0 = 0;
+    char * _argc3 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"slls|i:wxDC_FloodFill",&_argc0,&_arg1,&_arg2,&_argc3,&_arg4)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_FloodFill. Expected _wxDC_p.");
+        return NULL;
+        }
+    }
+    if (_argc3) {
+        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxColour_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxDC_FloodFill. Expected _wxColour_p.");
+        return NULL;
+        }
+    }
+    wxDC_FloodFill(_arg0,_arg1,_arg2,*_arg3,_arg4);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+

 #define wxDC_GetBackground(_swigobj)  (_swigobj->GetBackground())
 static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxDC_GetBackground(_swigobj)  (_swigobj->GetBackground())
 static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -3477,7 +3511,8 @@ static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxBrush *)wxDC_GetBackground(_arg0);
+    wxBrush & _result_ref = wxDC_GetBackground(_arg0);
+    _result = (wxBrush *) &_result_ref;

     SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
     SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;


@@ -3500,7 +3535,8 @@ static PyObject *_wrap_wxDC_GetBrush(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxBrush *)wxDC_GetBrush(_arg0);
+    wxBrush & _result_ref = wxDC_GetBrush(_arg0);
+    _result = (wxBrush *) &_result_ref;

     SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
     SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;


@@ -3626,7 +3662,8 @@ static PyObject *_wrap_wxDC_GetFont(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxFont *)wxDC_GetFont(_arg0);
+    wxFont & _result_ref = wxDC_GetFont(_arg0);
+    _result = (wxFont *) &_result_ref;

     SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
     SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;


@@ -3712,7 +3749,8 @@ static PyObject *_wrap_wxDC_GetPen(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxPen *)wxDC_GetPen(_arg0);
+    wxPen & _result_ref = wxDC_GetPen(_arg0);
+    _result = (wxPen *) &_result_ref;

     SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
     SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;


@@ -4522,12 +4560,12 @@ static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-static void  wxDC_DrawBitmap(wxDC *self,wxBitmap * bitmap,long  x,long  y,bool  swapPalette) {
+static void  wxDC_DrawBitmap(wxDC *self,wxBitmap & bitmap,long  x,long  y,bool  swapPalette) {

             wxMemoryDC* memDC = new wxMemoryDC;
             memDC->SelectObject(bitmap);
             if (swapPalette)
             wxMemoryDC* memDC = new wxMemoryDC;
             memDC->SelectObject(bitmap);
             if (swapPalette)

-                self->SetPalette(bitmap->GetPalette());
-            self->Blit(x, y, bitmap->GetWidth(), bitmap->GetHeight(), memDC,
+                self->SetPalette(*bitmap.GetPalette());
+            self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC,

                     0, 0, self->GetLogicalFunction());
             memDC->SelectObject(wxNullBitmap);
             delete memDC;
                     0, 0, self->GetLogicalFunction());
             memDC->SelectObject(wxNullBitmap);
             delete memDC;


@@ -4559,7 +4597,7 @@ static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args) {
         }
     }
     _arg4 = (bool ) tempbool4;
         }
     }
     _arg4 = (bool ) tempbool4;

-    wxDC_DrawBitmap(_arg0,_arg1,_arg2,_arg3,_arg4);
+    wxDC_DrawBitmap(_arg0,*_arg1,_arg2,_arg3,_arg4);

     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;


@@ -4781,50 +4819,34 @@ static PyObject *_wrap_new_wxPaintDC(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-static void *SwigwxPostScriptDCTowxDC(void *ptr) {
-    wxPostScriptDC *src;
+static void *SwigwxWindowDCTowxDC(void *ptr) {
+    wxWindowDC *src;

     wxDC *dest;
     wxDC *dest;

-    src = (wxPostScriptDC *) ptr;
+    src = (wxWindowDC *) ptr;

     dest = (wxDC *) src;
     return (void *) dest;
 }
 
     dest = (wxDC *) src;
     return (void *) dest;
 }
 

-#define new_wxPostScriptDC(_swigarg0,_swigarg1,_swigarg2) (new wxPostScriptDC(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_new_wxPostScriptDC(PyObject *self, PyObject *args) {
+#define new_wxWindowDC(_swigarg0) (new wxWindowDC(_swigarg0))
+static PyObject *_wrap_new_wxWindowDC(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxPostScriptDC * _result;
-    wxString * _arg0;
-    bool  _arg1 = (1);
-    wxWindow * _arg2 = NULL;
-    PyObject * _obj0 = 0;
-    int tempbool1;
-    char * _argc2 = 0;
+    wxWindowDC * _result;
+    wxWindow * _arg0;
+    char * _argc0 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O|is:new_wxPostScriptDC",&_obj0,&tempbool1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"s:new_wxWindowDC",&_argc0)) 

         return NULL;
         return NULL;

-{
-    if (!PyString_Check(_obj0)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg0 = new wxString(PyString_AsString(_obj0));
-}
-    _arg1 = (bool ) tempbool1;
-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPostScriptDC. Expected _wxWindow_p.");
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxWindowDC. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxPostScriptDC *)new_wxPostScriptDC(*_arg0,_arg1,_arg2);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPostScriptDC_p");
+    _result = (wxWindowDC *)new_wxWindowDC(_arg0);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindowDC_p");

     _resultobj = Py_BuildValue("s",_ptemp);
     _resultobj = Py_BuildValue("s",_ptemp);

-{
-    if (_obj0)
-        delete _arg0;
-}

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -4954,11 +4976,181 @@ static PyObject *_wrap_wxMetaFileDC_Close(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define new_wxPalette(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxPalette(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
+static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxPalette * _result;
+    int  _arg0;
+    byte * _arg1;
+    byte * _arg2;
+    byte * _arg3;
+    PyObject * _obj1 = 0;
+    PyObject * _obj2 = 0;
+    PyObject * _obj3 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"OOO:new_wxPalette",&_obj1,&_obj2,&_obj3)) 
+        return NULL;
+{
+    _arg1 = byte_LIST_helper(_obj1);
+    if (_arg1 == NULL) {
+        return NULL;
+    }
+}
+{
+    _arg2 = byte_LIST_helper(_obj2);
+    if (_arg2 == NULL) {
+        return NULL;
+    }
+}
+    if (_obj3)
+{
+    _arg3 = byte_LIST_helper(_obj3);
+    if (_arg3 == NULL) {
+        return NULL;
+    }
+}
+{
+    _arg0 = PyList_Size(_obj1);
+}
+    _result = (wxPalette *)new_wxPalette(_arg0,_arg1,_arg2,_arg3);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPalette_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    delete [] _arg1;
+}
+{
+    delete [] _arg2;
+}
+{
+    delete [] _arg3;
+}
+    return _resultobj;
+}
+
+#define delete_wxPalette(_swigobj) (delete _swigobj)
+static PyObject *_wrap_delete_wxPalette(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxPalette * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:delete_wxPalette",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPalette. Expected _wxPalette_p.");
+        return NULL;
+        }
+    }
+    delete_wxPalette(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxPalette_GetPixel(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->GetPixel(_swigarg0,_swigarg1,_swigarg2))
+static PyObject *_wrap_wxPalette_GetPixel(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxPalette * _arg0;
+    byte  _arg1;
+    byte  _arg2;
+    byte  _arg3;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sbbb:wxPalette_GetPixel",&_argc0,&_arg1,&_arg2,&_arg3)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetPixel. Expected _wxPalette_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxPalette_GetPixel(_arg0,_arg1,_arg2,_arg3);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxPalette_GetRGB(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->GetRGB(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
+static PyObject *_wrap_wxPalette_GetRGB(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxPalette * _arg0;
+    int  _arg1;
+    byte * _arg2;
+    byte * _arg3;
+    byte * _arg4;
+    char * _argc0 = 0;
+    char * _argc2 = 0;
+    char * _argc3 = 0;
+    char * _argc4 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sisss:wxPalette_GetRGB",&_argc0,&_arg1,&_argc2,&_argc3,&_argc4)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetRGB. Expected _wxPalette_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_byte_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPalette_GetRGB. Expected _byte_p.");
+        return NULL;
+        }
+    }
+    if (_argc3) {
+        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_byte_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxPalette_GetRGB. Expected _byte_p.");
+        return NULL;
+        }
+    }
+    if (_argc4) {
+        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_byte_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxPalette_GetRGB. Expected _byte_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxPalette_GetRGB(_arg0,_arg1,_arg2,_arg3,_arg4);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxPalette_Ok(_swigobj)  (_swigobj->Ok())
+static PyObject *_wrap_wxPalette_Ok(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxPalette * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxPalette_Ok",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_Ok. Expected _wxPalette_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxPalette_Ok(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 static PyMethodDef gdicMethods[] = {
 static PyMethodDef gdicMethods[] = {

+        { "wxPalette_Ok", _wrap_wxPalette_Ok, 1 },
+        { "wxPalette_GetRGB", _wrap_wxPalette_GetRGB, 1 },
+        { "wxPalette_GetPixel", _wrap_wxPalette_GetPixel, 1 },
+        { "delete_wxPalette", _wrap_delete_wxPalette, 1 },
+        { "new_wxPalette", _wrap_new_wxPalette, 1 },

         { "wxMetaFileDC_Close", _wrap_wxMetaFileDC_Close, 1 },
         { "new_wxMetaFileDC", _wrap_new_wxMetaFileDC, 1 },
         { "new_wxPrinterDC", _wrap_new_wxPrinterDC, 1 },
         { "wxMetaFileDC_Close", _wrap_wxMetaFileDC_Close, 1 },
         { "new_wxMetaFileDC", _wrap_new_wxMetaFileDC, 1 },
         { "new_wxPrinterDC", _wrap_new_wxPrinterDC, 1 },

-        { "new_wxPostScriptDC", _wrap_new_wxPostScriptDC, 1 },
+        { "new_wxWindowDC", _wrap_new_wxWindowDC, 1 },

         { "new_wxPaintDC", _wrap_new_wxPaintDC, 1 },
         { "new_wxClientDC", _wrap_new_wxClientDC, 1 },
         { "wxScreenDC_EndDrawingOnTop", _wrap_wxScreenDC_EndDrawingOnTop, 1 },
         { "new_wxPaintDC", _wrap_new_wxPaintDC, 1 },
         { "new_wxClientDC", _wrap_new_wxClientDC, 1 },
         { "wxScreenDC_EndDrawingOnTop", _wrap_wxScreenDC_EndDrawingOnTop, 1 },


@@ -5008,6 +5200,7 @@ static PyMethodDef gdicMethods[] = {
         { "wxDC_GetCharHeight", _wrap_wxDC_GetCharHeight, 1 },
         { "wxDC_GetBrush", _wrap_wxDC_GetBrush, 1 },
         { "wxDC_GetBackground", _wrap_wxDC_GetBackground, 1 },
         { "wxDC_GetCharHeight", _wrap_wxDC_GetCharHeight, 1 },
         { "wxDC_GetBrush", _wrap_wxDC_GetBrush, 1 },
         { "wxDC_GetBackground", _wrap_wxDC_GetBackground, 1 },

+        { "wxDC_FloodFill", _wrap_wxDC_FloodFill, 1 },

         { "wxDC_EndPage", _wrap_wxDC_EndPage, 1 },
         { "wxDC_EndDrawing", _wrap_wxDC_EndDrawing, 1 },
         { "wxDC_EndDoc", _wrap_wxDC_EndDoc, 1 },
         { "wxDC_EndPage", _wrap_wxDC_EndPage, 1 },
         { "wxDC_EndDrawing", _wrap_wxDC_EndDrawing, 1 },
         { "wxDC_EndDoc", _wrap_wxDC_EndDoc, 1 },


@@ -5041,19 +5234,19 @@ static PyMethodDef gdicMethods[] = {
         { "wxBrush_GetStipple", _wrap_wxBrush_GetStipple, 1 },
         { "wxBrush_GetColour", _wrap_wxBrush_GetColour, 1 },
         { "new_wxBrush", _wrap_new_wxBrush, 1 },
         { "wxBrush_GetStipple", _wrap_wxBrush_GetStipple, 1 },
         { "wxBrush_GetColour", _wrap_wxBrush_GetColour, 1 },
         { "new_wxBrush", _wrap_new_wxBrush, 1 },

+        { "wxPen_SetStipple", _wrap_wxPen_SetStipple, 1 },
+        { "wxPen_SetDashes", _wrap_wxPen_SetDashes, 1 },
+        { "wxPen_GetStipple", _wrap_wxPen_GetStipple, 1 },
+        { "wxPen_GetDashes", _wrap_wxPen_GetDashes, 1 },

         { "wxPen_SetWidth", _wrap_wxPen_SetWidth, 1 },
         { "wxPen_SetStyle", _wrap_wxPen_SetStyle, 1 },
         { "wxPen_SetJoin", _wrap_wxPen_SetJoin, 1 },
         { "wxPen_SetWidth", _wrap_wxPen_SetWidth, 1 },
         { "wxPen_SetStyle", _wrap_wxPen_SetStyle, 1 },
         { "wxPen_SetJoin", _wrap_wxPen_SetJoin, 1 },

-        { "wxPen_SetStipple", _wrap_wxPen_SetStipple, 1 },
-        { "wxPen_SetDashes", _wrap_wxPen_SetDashes, 1 },

         { "wxPen_SetColour", _wrap_wxPen_SetColour, 1 },
         { "wxPen_SetCap", _wrap_wxPen_SetCap, 1 },
         { "wxPen_Ok", _wrap_wxPen_Ok, 1 },
         { "wxPen_GetWidth", _wrap_wxPen_GetWidth, 1 },
         { "wxPen_GetStyle", _wrap_wxPen_GetStyle, 1 },
         { "wxPen_GetJoin", _wrap_wxPen_GetJoin, 1 },
         { "wxPen_SetColour", _wrap_wxPen_SetColour, 1 },
         { "wxPen_SetCap", _wrap_wxPen_SetCap, 1 },
         { "wxPen_Ok", _wrap_wxPen_Ok, 1 },
         { "wxPen_GetWidth", _wrap_wxPen_GetWidth, 1 },
         { "wxPen_GetStyle", _wrap_wxPen_GetStyle, 1 },
         { "wxPen_GetJoin", _wrap_wxPen_GetJoin, 1 },

-        { "wxPen_GetStipple", _wrap_wxPen_GetStipple, 1 },
-        { "wxPen_GetDashes", _wrap_wxPen_GetDashes, 1 },

         { "wxPen_GetColour", _wrap_wxPen_GetColour, 1 },
         { "wxPen_GetCap", _wrap_wxPen_GetCap, 1 },
         { "new_wxPen", _wrap_new_wxPen, 1 },
         { "wxPen_GetColour", _wrap_wxPen_GetColour, 1 },
         { "wxPen_GetCap", _wrap_wxPen_GetCap, 1 },
         { "new_wxPen", _wrap_new_wxPen, 1 },


@@ -5176,6 +5369,7 @@ SWIGEXPORT(void,initgdic)() {
  */
         SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
  */
         SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_signed_long","_long",0);

+        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);

         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);


@@ -5189,8 +5383,8 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
         SWIG_RegisterMapping("_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC);
         SWIG_RegisterMapping("_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC);
         SWIG_RegisterMapping("_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
         SWIG_RegisterMapping("_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC);
         SWIG_RegisterMapping("_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC);

-        SWIG_RegisterMapping("_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC);
-        SWIG_RegisterMapping("_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC);
+        SWIG_RegisterMapping("_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC);
+        SWIG_RegisterMapping("_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC);

         SWIG_RegisterMapping("_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC);
         SWIG_RegisterMapping("_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC);
         SWIG_RegisterMapping("_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC);
         SWIG_RegisterMapping("_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC);
         SWIG_RegisterMapping("_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC);
         SWIG_RegisterMapping("_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC);


@@ -5202,7 +5396,6 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
         SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
         SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
         SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
         SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
         SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);

-        SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);

         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
         SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
         SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);


@@ -5217,10 +5410,12 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_wxBitmap","_wxIcon",SwigwxIconTowxBitmap);
         SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
         SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
         SWIG_RegisterMapping("_wxBitmap","_wxIcon",SwigwxIconTowxBitmap);
         SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
         SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);

+        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);

         SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
         SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);

+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);

         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
         SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
         SWIG_RegisterMapping("_unsigned_long","_long",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
         SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
         SWIG_RegisterMapping("_unsigned_long","_long",0);


@@ -5229,8 +5424,8 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_class_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
         SWIG_RegisterMapping("_class_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC);
         SWIG_RegisterMapping("_class_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC);
         SWIG_RegisterMapping("_class_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
         SWIG_RegisterMapping("_class_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC);
         SWIG_RegisterMapping("_class_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC);

-        SWIG_RegisterMapping("_class_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC);
-        SWIG_RegisterMapping("_class_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC);
+        SWIG_RegisterMapping("_class_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC);
+        SWIG_RegisterMapping("_class_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC);

         SWIG_RegisterMapping("_class_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC);
         SWIG_RegisterMapping("_class_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC);
         SWIG_RegisterMapping("_class_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC);
         SWIG_RegisterMapping("_class_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC);
         SWIG_RegisterMapping("_class_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC);
         SWIG_RegisterMapping("_class_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC);


@@ -5262,9 +5457,9 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_signed_short","_short",0);
         SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
         SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
         SWIG_RegisterMapping("_signed_short","_short",0);
         SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
         SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);

+        SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);

         SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
         SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
         SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
         SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);

-        SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);

         SWIG_RegisterMapping("_unsigned_char","_byte",0);
         SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
         SWIG_RegisterMapping("_unsigned_int","_uint",0);
         SWIG_RegisterMapping("_unsigned_char","_byte",0);
         SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
         SWIG_RegisterMapping("_unsigned_int","_uint",0);


@@ -5286,12 +5481,15 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_int","_unsigned_int",0);
         SWIG_RegisterMapping("_int","_signed_int",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
         SWIG_RegisterMapping("_int","_unsigned_int",0);
         SWIG_RegisterMapping("_int","_signed_int",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);

+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);

         SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
         SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
         SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
         SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
         SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
         SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
         SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
         SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);

+        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
+        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);

         SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
         SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
         SWIG_RegisterMapping("_class_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap);
         SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
         SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
         SWIG_RegisterMapping("_class_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap);


@@ -5302,4 +5500,5 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
         SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
         SWIG_RegisterMapping("_wxDash","_long",0);
         SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
         SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
         SWIG_RegisterMapping("_wxDash","_long",0);

+        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);

 }
 }