More bakfile changes needed for bmpcbox. Rebaked.

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

diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp
index 189551adc1933cc0edc27824ae6a8db071266bb7..9bfb56981ecf6d60e2bb6d42414e0fc1515ceb98 100644 (file)
--- a/wxPython/src/msw/_gdi_wrap.cpp
+++ b/wxPython/src/msw/_gdi_wrap.cpp
@@ -2463,147 +2463,157 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 
 /* -------- TYPES TABLE (BEGIN) -------- */
 

-#define SWIGTYPE_p_char swig_types[0]
-#define SWIGTYPE_p_double swig_types[1]
-#define SWIGTYPE_p_form_ops_t swig_types[2]
-#define SWIGTYPE_p_int swig_types[3]
-#define SWIGTYPE_p_unsigned_char swig_types[4]
-#define SWIGTYPE_p_unsigned_int swig_types[5]
-#define SWIGTYPE_p_unsigned_long swig_types[6]
-#define SWIGTYPE_p_wxANIHandler swig_types[7]
-#define SWIGTYPE_p_wxAcceleratorTable swig_types[8]
-#define SWIGTYPE_p_wxActivateEvent swig_types[9]
-#define SWIGTYPE_p_wxBMPHandler swig_types[10]
-#define SWIGTYPE_p_wxBitmap swig_types[11]
-#define SWIGTYPE_p_wxBoxSizer swig_types[12]
-#define SWIGTYPE_p_wxBrush swig_types[13]
-#define SWIGTYPE_p_wxBrushList swig_types[14]
-#define SWIGTYPE_p_wxBufferedDC swig_types[15]
-#define SWIGTYPE_p_wxBufferedPaintDC swig_types[16]
-#define SWIGTYPE_p_wxCURHandler swig_types[17]
-#define SWIGTYPE_p_wxChildFocusEvent swig_types[18]
-#define SWIGTYPE_p_wxClientDC swig_types[19]
-#define SWIGTYPE_p_wxClipboardTextEvent swig_types[20]
-#define SWIGTYPE_p_wxCloseEvent swig_types[21]
-#define SWIGTYPE_p_wxColour swig_types[22]
-#define SWIGTYPE_p_wxColourDatabase swig_types[23]
-#define SWIGTYPE_p_wxCommandEvent swig_types[24]
-#define SWIGTYPE_p_wxContextMenuEvent swig_types[25]
-#define SWIGTYPE_p_wxControl swig_types[26]
-#define SWIGTYPE_p_wxControlWithItems swig_types[27]
-#define SWIGTYPE_p_wxCursor swig_types[28]
-#define SWIGTYPE_p_wxDC swig_types[29]
-#define SWIGTYPE_p_wxDash swig_types[30]
-#define SWIGTYPE_p_wxDateEvent swig_types[31]
-#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[32]
-#define SWIGTYPE_p_wxDropFilesEvent swig_types[33]
-#define SWIGTYPE_p_wxDuplexMode swig_types[34]
-#define SWIGTYPE_p_wxEffects swig_types[35]
-#define SWIGTYPE_p_wxEncodingConverter swig_types[36]
-#define SWIGTYPE_p_wxEraseEvent swig_types[37]
-#define SWIGTYPE_p_wxEvent swig_types[38]
-#define SWIGTYPE_p_wxEvtHandler swig_types[39]
-#define SWIGTYPE_p_wxFSFile swig_types[40]
-#define SWIGTYPE_p_wxFileSystem swig_types[41]
-#define SWIGTYPE_p_wxFlexGridSizer swig_types[42]
-#define SWIGTYPE_p_wxFocusEvent swig_types[43]
-#define SWIGTYPE_p_wxFont swig_types[44]
-#define SWIGTYPE_p_wxFontList swig_types[45]
-#define SWIGTYPE_p_wxFontMapper swig_types[46]
-#define SWIGTYPE_p_wxGBSizerItem swig_types[47]
-#define SWIGTYPE_p_wxGDIObjListBase swig_types[48]
-#define SWIGTYPE_p_wxGDIObject swig_types[49]
-#define SWIGTYPE_p_wxGIFHandler swig_types[50]
-#define SWIGTYPE_p_wxGridBagSizer swig_types[51]
-#define SWIGTYPE_p_wxGridSizer swig_types[52]
-#define SWIGTYPE_p_wxICOHandler swig_types[53]
-#define SWIGTYPE_p_wxIcon swig_types[54]
-#define SWIGTYPE_p_wxIconBundle swig_types[55]
-#define SWIGTYPE_p_wxIconLocation swig_types[56]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[57]
-#define SWIGTYPE_p_wxIdleEvent swig_types[58]
-#define SWIGTYPE_p_wxImage swig_types[59]
-#define SWIGTYPE_p_wxImageHandler swig_types[60]
-#define SWIGTYPE_p_wxImageList swig_types[61]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[62]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[63]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[64]
-#define SWIGTYPE_p_wxKeyEvent swig_types[65]
-#define SWIGTYPE_p_wxLanguageInfo swig_types[66]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[67]
-#define SWIGTYPE_p_wxLocale swig_types[68]
-#define SWIGTYPE_p_wxMask swig_types[69]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[70]
-#define SWIGTYPE_p_wxMemoryDC swig_types[71]
-#define SWIGTYPE_p_wxMenu swig_types[72]
-#define SWIGTYPE_p_wxMenuBar swig_types[73]
-#define SWIGTYPE_p_wxMenuEvent swig_types[74]
-#define SWIGTYPE_p_wxMenuItem swig_types[75]
-#define SWIGTYPE_p_wxMetaFile swig_types[76]
-#define SWIGTYPE_p_wxMetaFileDC swig_types[77]
-#define SWIGTYPE_p_wxMirrorDC swig_types[78]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[79]
-#define SWIGTYPE_p_wxMouseEvent swig_types[80]
-#define SWIGTYPE_p_wxMoveEvent swig_types[81]
-#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[82]
-#define SWIGTYPE_p_wxNativeFontInfo swig_types[83]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[84]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[85]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[86]
-#define SWIGTYPE_p_wxObject swig_types[87]
-#define SWIGTYPE_p_wxPCXHandler swig_types[88]
-#define SWIGTYPE_p_wxPNGHandler swig_types[89]
-#define SWIGTYPE_p_wxPNMHandler swig_types[90]
-#define SWIGTYPE_p_wxPaintDC swig_types[91]
-#define SWIGTYPE_p_wxPaintEvent swig_types[92]
-#define SWIGTYPE_p_wxPalette swig_types[93]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[94]
-#define SWIGTYPE_p_wxPaperSize swig_types[95]
-#define SWIGTYPE_p_wxPen swig_types[96]
-#define SWIGTYPE_p_wxPenList swig_types[97]
-#define SWIGTYPE_p_wxPoint swig_types[98]
-#define SWIGTYPE_p_wxPostScriptDC swig_types[99]
-#define SWIGTYPE_p_wxPrintData swig_types[100]
-#define SWIGTYPE_p_wxPrinterDC swig_types[101]
-#define SWIGTYPE_p_wxPseudoDC swig_types[102]
-#define SWIGTYPE_p_wxPyApp swig_types[103]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[104]
-#define SWIGTYPE_p_wxPyEvent swig_types[105]
-#define SWIGTYPE_p_wxPyFontEnumerator swig_types[106]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[107]
-#define SWIGTYPE_p_wxPySizer swig_types[108]
-#define SWIGTYPE_p_wxPyValidator swig_types[109]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[110]
-#define SWIGTYPE_p_wxRect swig_types[111]
-#define SWIGTYPE_p_wxRegion swig_types[112]
-#define SWIGTYPE_p_wxRegionIterator swig_types[113]
-#define SWIGTYPE_p_wxRendererNative swig_types[114]
-#define SWIGTYPE_p_wxRendererVersion swig_types[115]
-#define SWIGTYPE_p_wxScreenDC swig_types[116]
-#define SWIGTYPE_p_wxScrollEvent swig_types[117]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[118]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[119]
-#define SWIGTYPE_p_wxShowEvent swig_types[120]
-#define SWIGTYPE_p_wxSize swig_types[121]
-#define SWIGTYPE_p_wxSizeEvent swig_types[122]
-#define SWIGTYPE_p_wxSizer swig_types[123]
-#define SWIGTYPE_p_wxSizerItem swig_types[124]
-#define SWIGTYPE_p_wxSplitterRenderParams swig_types[125]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[126]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[127]
-#define SWIGTYPE_p_wxStockGDI swig_types[128]
-#define SWIGTYPE_p_wxString swig_types[129]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[130]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[131]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[132]
-#define SWIGTYPE_p_wxValidator swig_types[133]
-#define SWIGTYPE_p_wxWindow swig_types[134]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[135]
-#define SWIGTYPE_p_wxWindowDC swig_types[136]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[137]
-#define SWIGTYPE_p_wxXPMHandler swig_types[138]
-static swig_type_info *swig_types[140];
-static swig_module_info swig_module = {swig_types, 139, 0, 0, 0, 0};
+#define SWIGTYPE_p_buffer swig_types[0]
+#define SWIGTYPE_p_char swig_types[1]
+#define SWIGTYPE_p_double swig_types[2]
+#define SWIGTYPE_p_form_ops_t swig_types[3]
+#define SWIGTYPE_p_int swig_types[4]
+#define SWIGTYPE_p_unsigned_char swig_types[5]
+#define SWIGTYPE_p_unsigned_int swig_types[6]
+#define SWIGTYPE_p_unsigned_long swig_types[7]
+#define SWIGTYPE_p_wxANIHandler swig_types[8]
+#define SWIGTYPE_p_wxAcceleratorTable swig_types[9]
+#define SWIGTYPE_p_wxActivateEvent swig_types[10]
+#define SWIGTYPE_p_wxAlphaPixelData swig_types[11]
+#define SWIGTYPE_p_wxAlphaPixelData_Accessor swig_types[12]
+#define SWIGTYPE_p_wxBMPHandler swig_types[13]
+#define SWIGTYPE_p_wxBitmap swig_types[14]
+#define SWIGTYPE_p_wxBoxSizer swig_types[15]
+#define SWIGTYPE_p_wxBrush swig_types[16]
+#define SWIGTYPE_p_wxBrushList swig_types[17]
+#define SWIGTYPE_p_wxBufferedDC swig_types[18]
+#define SWIGTYPE_p_wxBufferedPaintDC swig_types[19]
+#define SWIGTYPE_p_wxCURHandler swig_types[20]
+#define SWIGTYPE_p_wxChar swig_types[21]
+#define SWIGTYPE_p_wxChildFocusEvent swig_types[22]
+#define SWIGTYPE_p_wxClientDC swig_types[23]
+#define SWIGTYPE_p_wxClipboardTextEvent swig_types[24]
+#define SWIGTYPE_p_wxCloseEvent swig_types[25]
+#define SWIGTYPE_p_wxColour swig_types[26]
+#define SWIGTYPE_p_wxColourDatabase swig_types[27]
+#define SWIGTYPE_p_wxCommandEvent swig_types[28]
+#define SWIGTYPE_p_wxContextMenuEvent swig_types[29]
+#define SWIGTYPE_p_wxControl swig_types[30]
+#define SWIGTYPE_p_wxControlWithItems swig_types[31]
+#define SWIGTYPE_p_wxCursor swig_types[32]
+#define SWIGTYPE_p_wxDC swig_types[33]
+#define SWIGTYPE_p_wxDash swig_types[34]
+#define SWIGTYPE_p_wxDateEvent swig_types[35]
+#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[36]
+#define SWIGTYPE_p_wxDropFilesEvent swig_types[37]
+#define SWIGTYPE_p_wxDuplexMode swig_types[38]
+#define SWIGTYPE_p_wxEffects swig_types[39]
+#define SWIGTYPE_p_wxEncodingConverter swig_types[40]
+#define SWIGTYPE_p_wxEraseEvent swig_types[41]
+#define SWIGTYPE_p_wxEvent swig_types[42]
+#define SWIGTYPE_p_wxEvtHandler swig_types[43]
+#define SWIGTYPE_p_wxFSFile swig_types[44]
+#define SWIGTYPE_p_wxFileSystem swig_types[45]
+#define SWIGTYPE_p_wxFlexGridSizer swig_types[46]
+#define SWIGTYPE_p_wxFocusEvent swig_types[47]
+#define SWIGTYPE_p_wxFont swig_types[48]
+#define SWIGTYPE_p_wxFontList swig_types[49]
+#define SWIGTYPE_p_wxFontMapper swig_types[50]
+#define SWIGTYPE_p_wxGBSizerItem swig_types[51]
+#define SWIGTYPE_p_wxGDIObjListBase swig_types[52]
+#define SWIGTYPE_p_wxGDIObject swig_types[53]
+#define SWIGTYPE_p_wxGIFHandler swig_types[54]
+#define SWIGTYPE_p_wxGridBagSizer swig_types[55]
+#define SWIGTYPE_p_wxGridSizer swig_types[56]
+#define SWIGTYPE_p_wxHeaderButtonParams swig_types[57]
+#define SWIGTYPE_p_wxICOHandler swig_types[58]
+#define SWIGTYPE_p_wxIcon swig_types[59]
+#define SWIGTYPE_p_wxIconBundle swig_types[60]
+#define SWIGTYPE_p_wxIconLocation swig_types[61]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[62]
+#define SWIGTYPE_p_wxIdleEvent swig_types[63]
+#define SWIGTYPE_p_wxImage swig_types[64]
+#define SWIGTYPE_p_wxImageHandler swig_types[65]
+#define SWIGTYPE_p_wxImageList swig_types[66]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[67]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[68]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[69]
+#define SWIGTYPE_p_wxKeyEvent swig_types[70]
+#define SWIGTYPE_p_wxLanguageInfo swig_types[71]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[72]
+#define SWIGTYPE_p_wxLocale swig_types[73]
+#define SWIGTYPE_p_wxMask swig_types[74]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[75]
+#define SWIGTYPE_p_wxMemoryDC swig_types[76]
+#define SWIGTYPE_p_wxMenu swig_types[77]
+#define SWIGTYPE_p_wxMenuBar swig_types[78]
+#define SWIGTYPE_p_wxMenuEvent swig_types[79]
+#define SWIGTYPE_p_wxMenuItem swig_types[80]
+#define SWIGTYPE_p_wxMetaFile swig_types[81]
+#define SWIGTYPE_p_wxMetaFileDC swig_types[82]
+#define SWIGTYPE_p_wxMirrorDC swig_types[83]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[84]
+#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[85]
+#define SWIGTYPE_p_wxMouseEvent swig_types[86]
+#define SWIGTYPE_p_wxMoveEvent swig_types[87]
+#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[88]
+#define SWIGTYPE_p_wxNativeFontInfo swig_types[89]
+#define SWIGTYPE_p_wxNativePixelData swig_types[90]
+#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[91]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[92]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[93]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[94]
+#define SWIGTYPE_p_wxObject swig_types[95]
+#define SWIGTYPE_p_wxPCXHandler swig_types[96]
+#define SWIGTYPE_p_wxPNGHandler swig_types[97]
+#define SWIGTYPE_p_wxPNMHandler swig_types[98]
+#define SWIGTYPE_p_wxPaintDC swig_types[99]
+#define SWIGTYPE_p_wxPaintEvent swig_types[100]
+#define SWIGTYPE_p_wxPalette swig_types[101]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[102]
+#define SWIGTYPE_p_wxPaperSize swig_types[103]
+#define SWIGTYPE_p_wxPen swig_types[104]
+#define SWIGTYPE_p_wxPenList swig_types[105]
+#define SWIGTYPE_p_wxPixelDataBase swig_types[106]
+#define SWIGTYPE_p_wxPoint swig_types[107]
+#define SWIGTYPE_p_wxPostScriptDC swig_types[108]
+#define SWIGTYPE_p_wxPrintData swig_types[109]
+#define SWIGTYPE_p_wxPrinterDC swig_types[110]
+#define SWIGTYPE_p_wxPseudoDC swig_types[111]
+#define SWIGTYPE_p_wxPyApp swig_types[112]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[113]
+#define SWIGTYPE_p_wxPyEvent swig_types[114]
+#define SWIGTYPE_p_wxPyFontEnumerator swig_types[115]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[116]
+#define SWIGTYPE_p_wxPyLocale swig_types[117]
+#define SWIGTYPE_p_wxPySizer swig_types[118]
+#define SWIGTYPE_p_wxPyValidator swig_types[119]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[120]
+#define SWIGTYPE_p_wxRect swig_types[121]
+#define SWIGTYPE_p_wxRegion swig_types[122]
+#define SWIGTYPE_p_wxRegionIterator swig_types[123]
+#define SWIGTYPE_p_wxRendererNative swig_types[124]
+#define SWIGTYPE_p_wxRendererVersion swig_types[125]
+#define SWIGTYPE_p_wxScreenDC swig_types[126]
+#define SWIGTYPE_p_wxScrollEvent swig_types[127]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[128]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[129]
+#define SWIGTYPE_p_wxShowEvent swig_types[130]
+#define SWIGTYPE_p_wxSize swig_types[131]
+#define SWIGTYPE_p_wxSizeEvent swig_types[132]
+#define SWIGTYPE_p_wxSizer swig_types[133]
+#define SWIGTYPE_p_wxSizerItem swig_types[134]
+#define SWIGTYPE_p_wxSplitterRenderParams swig_types[135]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[136]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[137]
+#define SWIGTYPE_p_wxStockGDI swig_types[138]
+#define SWIGTYPE_p_wxString swig_types[139]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[140]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[141]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[142]
+#define SWIGTYPE_p_wxValidator swig_types[143]
+#define SWIGTYPE_p_wxWindow swig_types[144]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[145]
+#define SWIGTYPE_p_wxWindowDC swig_types[146]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[147]
+#define SWIGTYPE_p_wxXPMHandler swig_types[148]
+static swig_type_info *swig_types[150];
+static swig_module_info swig_module = {swig_types, 149, 0, 0, 0, 0};

 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 


@@ -2801,19 +2811,41 @@ SWIGINTERN bool wxColour___ne__(wxColour *self,PyObject *other){
             }
             return self->operator!=(*obj);
         }
             }
             return self->operator!=(*obj);
         }

-SWIGINTERN PyObject *wxColour_Get(wxColour *self){
-            PyObject* rv = PyTuple_New(3);
+
+SWIGINTERN int
+SWIG_AsVal_bool (PyObject *obj, bool *val)
+{
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return SWIG_OK;
+  } else if (obj == Py_False) {
+    if (val) *val = false;
+    return SWIG_OK;
+  } else {
+    long v = 0;
+    int res = SWIG_AddCast(SWIG_AsVal_long (obj, val ? &v : 0));
+    if (SWIG_IsOK(res) && val) *val = v ? true : false;
+    return res;
+  }
+}
+
+SWIGINTERN PyObject *wxColour_Get(wxColour *self,bool includeAlpha=false){
+            PyObject* rv = PyTuple_New(includeAlpha ? 4 : 3);

             int red = -1;
             int green = -1;
             int blue = -1;
             int red = -1;
             int green = -1;
             int blue = -1;

+            int alpha = wxALPHA_OPAQUE;

             if (self->Ok()) {
                 red =   self->Red();
                 green = self->Green();
                 blue =  self->Blue();
             if (self->Ok()) {
                 red =   self->Red();
                 green = self->Green();
                 blue =  self->Blue();

+                alpha = self->Alpha();

             }
             PyTuple_SetItem(rv, 0, PyInt_FromLong(red));
             PyTuple_SetItem(rv, 1, PyInt_FromLong(green));
             PyTuple_SetItem(rv, 2, PyInt_FromLong(blue));
             }
             PyTuple_SetItem(rv, 0, PyInt_FromLong(red));
             PyTuple_SetItem(rv, 1, PyInt_FromLong(green));
             PyTuple_SetItem(rv, 2, PyInt_FromLong(blue));

+            if (includeAlpha)
+                PyTuple_SetItem(rv, 3, PyInt_FromLong(alpha));                

             return rv;
         }
 SWIGINTERN unsigned long wxColour_GetRGB(wxColour *self){
             return rv;
         }
 SWIGINTERN unsigned long wxColour_GetRGB(wxColour *self){


@@ -2870,6 +2902,9 @@ SWIGINTERN void wxPen__SetDashes(wxPen *self,PyObject *_self,PyObject *pyDashes)
 SWIGINTERN bool wxPen___eq__(wxPen *self,wxPen const *other){ return other ? (*self == *other) : false; }
 SWIGINTERN bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*self != *other) : true;  }
 
 SWIGINTERN bool wxPen___eq__(wxPen *self,wxPen const *other){ return other ? (*self == *other) : false; }
 SWIGINTERN bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*self != *other) : true;  }
 

+#include <wx/rawbmp.h>
+
+

 #include <wx/image.h>
     
     static char** ConvertListOfStrings(PyObject* listOfStrings) {
 #include <wx/image.h>
     
     static char** ConvertListOfStrings(PyObject* listOfStrings) {


@@ -2892,22 +2927,22 @@ SWIGINTERN bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*s
 
 
 SWIGINTERN wxBitmap *new_wxBitmap(PyObject *listOfStrings){
 
 
 SWIGINTERN wxBitmap *new_wxBitmap(PyObject *listOfStrings){

-            char**    cArray = NULL;
-            wxBitmap* bmp;
-
-            cArray = ConvertListOfStrings(listOfStrings);
-            if (! cArray)
-                return NULL;
-            bmp = new wxBitmap(cArray);
-            delete [] cArray;
-            return bmp;
-        }
+                char**    cArray = NULL;
+                wxBitmap* bmp;
+
+                cArray = ConvertListOfStrings(listOfStrings);
+                if (! cArray)
+                    return NULL;
+                bmp = new wxBitmap(cArray);
+                delete [] cArray;
+                return bmp;
+            }

 SWIGINTERN wxBitmap *new_wxBitmap(PyObject *bits,int width,int height,int depth=1){
 SWIGINTERN wxBitmap *new_wxBitmap(PyObject *bits,int width,int height,int depth=1){

-            char*      buf;
-            Py_ssize_t length;
-            PyString_AsStringAndSize(bits, &buf, &length);
-            return new wxBitmap(buf, width, height, depth);
-        }
+                char*      buf;
+                Py_ssize_t length;
+                PyString_AsStringAndSize(bits, &buf, &length);
+                return new wxBitmap(buf, width, height, depth);
+            }

 SWIGINTERN void wxBitmap_SetHandle(wxBitmap *self,long handle){ self->SetHandle((WXHANDLE)handle); }
 SWIGINTERN wxSize wxBitmap_GetSize(wxBitmap *self){
             wxSize size(self->GetWidth(), self->GetHeight());
 SWIGINTERN void wxBitmap_SetHandle(wxBitmap *self,long handle){ self->SetHandle((WXHANDLE)handle); }
 SWIGINTERN wxSize wxBitmap_GetSize(wxBitmap *self){
             wxSize size(self->GetWidth(), self->GetHeight());


@@ -2923,6 +2958,167 @@ SWIGINTERN void wxBitmap_SetSize(wxBitmap *self,wxSize const &size){
         }
 SWIGINTERN bool wxBitmap___eq__(wxBitmap *self,wxBitmap const *other){ return other ? (*self == *other) : false; }
 SWIGINTERN bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? (*self != *other) : true;  }
         }
 SWIGINTERN bool wxBitmap___eq__(wxBitmap *self,wxBitmap const *other){ return other ? (*self == *other) : false; }
 SWIGINTERN bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? (*self != *other) : true;  }

+
+// See http://tinyurl.com/e5adr for what premultiplying alpha means.  It
+// appears to me that the other platforms are already doing it, so I'll just
+// automatically do it for wxMSW here.
+#ifdef __WXMSW__
+#define wxPy_premultiply(p, a)   ((p) * (a) / 0xff)
+#define wxPy_unpremultiply(p, a) ((a) ? ((p) * 0xff / (a)) : (p))    
+#else
+#define wxPy_premultiply(p, a)   (p)
+#define wxPy_unpremultiply(p, a) (p)    
+#endif
+
+
+    wxBitmap* _BitmapFromBufferAlpha(int width, int height,
+                                    buffer data, int DATASIZE,
+                                    buffer alpha, int ALPHASIZE)
+    {
+        if (DATASIZE != width*height*3) {
+            wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
+            return NULL;
+        }
+
+        if (ALPHASIZE != width*height) {
+            wxPyErr_SetString(PyExc_ValueError, "Invalid alpha buffer size.");
+            return NULL;
+        }
+
+        wxBitmap* bmp = new wxBitmap(width, height, 32);
+        wxAlphaPixelData pixData(*bmp, wxPoint(0,0), wxSize(width,height));
+        if (! pixData) {
+            // raise an exception...
+            wxPyErr_SetString(PyExc_RuntimeError,
+                              "Failed to gain raw access to bitmap data.");
+            return NULL;
+        }
+                
+        pixData.UseAlpha();
+        wxAlphaPixelData::Iterator p(pixData);
+        for (int y=0; y<height; y++) {
+            wxAlphaPixelData::Iterator rowStart = p;
+            for (int x=0; x<width; x++) {
+                byte a = *(alpha++);
+                p.Red()   = wxPy_premultiply(*(data++), a);
+                p.Green() = wxPy_premultiply(*(data++), a);
+                p.Blue()  = wxPy_premultiply(*(data++), a);
+                p.Alpha() = a;
+                ++p; 
+            }
+            p = rowStart;
+            p.OffsetY(pixData, 1);
+        }
+        return bmp;
+    }        
+        
+    wxBitmap* _BitmapFromBuffer(int width, int height, buffer data, int DATASIZE)
+    {
+        if (DATASIZE != width*height*3) {
+            wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
+            return NULL;
+        }
+
+        wxBitmap* bmp = new wxBitmap(width, height, 24);
+        wxNativePixelData pixData(*bmp, wxPoint(0,0), wxSize(width,height));
+        if (! pixData) {
+            // raise an exception...
+            wxPyErr_SetString(PyExc_RuntimeError,
+                              "Failed to gain raw access to bitmap data.");
+            return NULL;
+        }
+                
+        wxNativePixelData::Iterator p(pixData);
+        for (int y=0; y<height; y++) {
+            wxNativePixelData::Iterator rowStart = p;
+            for (int x=0; x<width; x++) {
+                p.Red()   = *(data++);
+                p.Green() = *(data++);
+                p.Blue()  = *(data++);
+                ++p; 
+            }
+            p = rowStart;
+            p.OffsetY(pixData, 1);
+        }
+        return bmp;
+    }
+
+
+    wxBitmap* _BitmapFromBufferRGBA(int width, int height, buffer data, int DATASIZE)
+    {
+        if (DATASIZE != width*height*4) {
+            wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
+            return NULL;
+        }
+
+        wxBitmap* bmp = new wxBitmap(width, height, 32);
+        wxAlphaPixelData pixData(*bmp, wxPoint(0,0), wxSize(width,height));
+        if (! pixData) {
+            // raise an exception...
+            wxPyErr_SetString(PyExc_RuntimeError,
+                              "Failed to gain raw access to bitmap data.");
+            return NULL;
+        }
+               
+        pixData.UseAlpha();
+        wxAlphaPixelData::Iterator p(pixData);
+        for (int y=0; y<height; y++) {
+            wxAlphaPixelData::Iterator rowStart = p;
+            for (int x=0; x<width; x++) {
+                byte a = data[3];
+                p.Red()   = wxPy_premultiply(*(data++), a);
+                p.Green() = wxPy_premultiply(*(data++), a);
+                p.Blue()  = wxPy_premultiply(*(data++), a);
+                p.Alpha() = a; data++;
+                ++p; 
+            }
+            p = rowStart;
+            p.OffsetY(pixData, 1);
+        }
+        return bmp;
+    }        
+
+
+    typedef wxNativePixelData::Iterator wxNativePixelData_Accessor;
+
+SWIGINTERN bool wxNativePixelData___nonzero__(wxNativePixelData *self){ return self->operator bool(); }
+SWIGINTERN void wxNativePixelData_Accessor_nextPixel(wxNativePixelData_Accessor *self){ ++(*self); }
+SWIGINTERN void wxNativePixelData_Accessor_Set(wxNativePixelData_Accessor *self,byte red,byte green,byte blue){
+        self->Red()   = red;
+        self->Green() = green;
+        self->Blue()  = blue;
+    }
+SWIGINTERN PyObject *wxNativePixelData_Accessor_Get(wxNativePixelData_Accessor *self){
+        PyObject* rv = PyTuple_New(3);
+        PyTuple_SetItem(rv, 0, PyInt_FromLong(self->Red()));
+        PyTuple_SetItem(rv, 1, PyInt_FromLong(self->Green()));
+        PyTuple_SetItem(rv, 2, PyInt_FromLong(self->Blue()));
+        return rv;            
+    }
+
+    typedef wxAlphaPixelData::Iterator wxAlphaPixelData_Accessor;
+
+SWIGINTERN bool wxAlphaPixelData___nonzero__(wxAlphaPixelData *self){ return self->operator bool(); }
+SWIGINTERN void wxAlphaPixelData_Accessor_nextPixel(wxAlphaPixelData_Accessor *self){ ++(*self); }
+SWIGINTERN void wxAlphaPixelData_Accessor_Set(wxAlphaPixelData_Accessor *self,byte red,byte green,byte blue,byte alpha){
+        self->Red()   = wxPy_premultiply(red,   alpha);
+        self->Green() = wxPy_premultiply(green, alpha);
+        self->Blue()  = wxPy_premultiply(blue,  alpha);
+        self->Alpha() = alpha;
+    }
+SWIGINTERN PyObject *wxAlphaPixelData_Accessor_Get(wxAlphaPixelData_Accessor *self){
+        PyObject* rv = PyTuple_New(4);
+        int red   = self->Red();
+        int green = self->Green();
+        int blue  = self->Blue();
+        int alpha = self->Alpha();
+            
+        PyTuple_SetItem(rv, 0, PyInt_FromLong( wxPy_unpremultiply(red,   alpha) ));
+        PyTuple_SetItem(rv, 1, PyInt_FromLong( wxPy_unpremultiply(green, alpha) ));
+        PyTuple_SetItem(rv, 2, PyInt_FromLong( wxPy_unpremultiply(blue,  alpha) ));
+        PyTuple_SetItem(rv, 3, PyInt_FromLong( alpha ));
+        return rv;            
+    }

 SWIGINTERN wxMask *new_wxMask(wxBitmap const &bitmap,wxColour const &colour=wxNullColour){
             if ( !colour.Ok() )
                 return new wxMask(bitmap, *wxBLACK);
 SWIGINTERN wxMask *new_wxMask(wxBitmap const &bitmap,wxColour const &colour=wxNullColour){
             if ( !colour.Ok() )
                 return new wxMask(bitmap, *wxBLACK);


@@ -2994,24 +3190,6 @@ SWIGINTERN bool wxRegionIterator___nonzero__(wxRegionIterator *self){
 #include <wx/fontmap.h>
 #include <wx/fontenum.h>
 
 #include <wx/fontmap.h>
 #include <wx/fontenum.h>
 

-
-SWIGINTERN int
-SWIG_AsVal_bool (PyObject *obj, bool *val)
-{
-  if (obj == Py_True) {
-    if (val) *val = true;
-    return SWIG_OK;
-  } else if (obj == Py_False) {
-    if (val) *val = false;
-    return SWIG_OK;
-  } else {
-    long v = 0;
-    int res = SWIG_AddCast(SWIG_AsVal_long (obj, val ? &v : 0));
-    if (SWIG_IsOK(res) && val) *val = v ? true : false;
-    return res;
-  }
-}
-

 SWIGINTERN wxString wxNativeFontInfo___str__(wxNativeFontInfo *self){
             return self->ToString();
         }
 SWIGINTERN wxString wxNativeFontInfo___str__(wxNativeFontInfo *self){
             return self->ToString();
         }


@@ -3133,6 +3311,137 @@ SWIGINTERN bool wxLocale_Init2(wxLocale *self,int language=wxLANGUAGE_DEFAULT,in
             return rc;
         }
 
             return rc;
         }
 

+class wxPyLocale : public wxLocale
+{
+public:
+    wxPyLocale();
+
+    wxPyLocale(const wxChar *szName,                             // name (for messages)
+             const wxChar *szShort = (const wxChar *) NULL,      // dir prefix (for msg files)
+             const wxChar *szLocale = (const wxChar *) NULL,     // locale (for setlocale)
+             bool bLoadDefault = true,                           // preload wxstd.mo?
+             bool bConvertEncoding = false);                     // convert Win<->Unix if necessary?
+
+    wxPyLocale(int language, // wxLanguage id or custom language
+             int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
+             
+    ~wxPyLocale();
+
+    virtual const wxChar *GetString(const wxChar *szOrigString,
+                                    const wxChar *szDomain = NULL) const;
+    virtual const wxChar *GetString(const wxChar *szOrigString,
+                                    const wxChar *szOrigString2, size_t n,
+                                    const wxChar *szDomain = NULL) const;
+    
+    virtual wxChar *GetSingularString(const wxChar *szOrigString,
+                                      const wxChar *szDomain = NULL) const;
+    virtual wxChar *GetPluralString(const wxChar *szOrigString,
+                                    const wxChar *szOrigString2, size_t n,
+                                    const wxChar *szDomain = NULL) const;
+
+    PYPRIVATE;
+private:
+    DECLARE_NO_COPY_CLASS(wxPyLocale)
+};
+
+wxPyLocale::wxPyLocale() : wxLocale()
+{
+}
+
+wxPyLocale::wxPyLocale(const wxChar *szName,  // name (for messages)
+             const wxChar *szShort,           // dir prefix (for msg files)
+             const wxChar *szLocale,          // locale (for setlocale)
+             bool bLoadDefault,               // preload wxstd.mo?
+             bool bConvertEncoding)           // convert Win<->Unix if necessary?
+             : wxLocale(szName, szShort, szLocale, bLoadDefault, bConvertEncoding)
+{
+}
+
+wxPyLocale::wxPyLocale(int language, // wxLanguage id or custom language
+                       int flags) : wxLocale(language, flags)
+{
+}
+             
+wxPyLocale::~wxPyLocale()
+{
+}
+
+const wxChar *wxPyLocale::GetString(const wxChar *szOrigString,
+                                    const wxChar *szDomain) const 
+{
+    wxChar *str = GetSingularString(szOrigString, szDomain);
+    return (str != NULL) ? str : wxLocale::GetString(szOrigString, szDomain);
+}
+
+const wxChar *wxPyLocale::GetString(const wxChar *szOrigString,
+                                    const wxChar *szOrigString2, size_t n,
+                                    const wxChar *szDomain) const
+{
+    wxChar *str = GetPluralString(szOrigString, szOrigString2, n, szDomain);
+    return (str != NULL) ? str : wxLocale::GetString(szOrigString, szOrigString2, n, szDomain);
+}
+
+wxChar *wxPyLocale::GetSingularString(const wxChar *szOrigString,
+                                      const wxChar *szDomain) const
+{
+    bool found;
+    static wxString str;
+    str = _T("error in translation"); // when the first if condition is true but the second if condition is not we do not want to return the previously queried string.
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    if((found=wxPyCBH_findCallback(m_myInst, "GetSingularString"))) {
+        PyObject* param1 = wx2PyString(szOrigString);
+        PyObject* param2 = wx2PyString(szDomain);
+        PyObject* ret = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)", param1, param2));
+        Py_DECREF(param1);
+        Py_DECREF(param2);
+        if (ret) {
+            str = Py2wxString(ret);
+            Py_DECREF(ret);
+        }
+    }
+    wxPyEndBlockThreads(blocked);
+    return (found ? (wxChar*)str.c_str() : NULL);
+}
+
+wxChar *wxPyLocale::GetPluralString(const wxChar *szOrigString,
+                                    const wxChar *szOrigString2, size_t n,
+                                    const wxChar *szDomain) const
+{
+    bool found;
+    static wxString str;
+    str = _T("error in translation"); // when the first if condition is true but the second if condition is not we do not want to return the previously queried string.
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    if((found=wxPyCBH_findCallback(m_myInst, "GetPluralString"))) {
+        PyObject* param1 = wx2PyString(szOrigString);
+        PyObject* param2 = wx2PyString(szOrigString2);
+        PyObject* param4 = wx2PyString(szDomain);
+        PyObject* ret = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiO)", param1, param2, (int)n, param4));
+        Py_DECREF(param1);
+        Py_DECREF(param2);
+        Py_DECREF(param4);
+        if( ret) {
+            str = Py2wxString(ret);
+            Py_DECREF(ret);
+        }
+    }
+    wxPyEndBlockThreads(blocked);
+    return (found ? (wxChar*)str.c_str() : NULL);
+}
+
+SWIGINTERN wxPyLocale *new_wxPyLocale(int language=-1,int flags=wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING){
+            wxPyLocale* loc;
+            if (language == -1)
+                loc = new wxPyLocale();
+            else
+                loc = new wxPyLocale(language, flags);
+            // Python before 2.4 needs to have LC_NUMERIC set to "C" in order
+            // for the floating point conversions and such to work right.
+#if PY_VERSION_HEX < 0x02040000
+            setlocale(LC_NUMERIC, "C");
+#endif
+            return loc;
+        }
+

 #include "wx/wxPython/pydrawxxx.h"
 
 SWIGINTERN wxColour wxDC_GetPixel(wxDC *self,int x,int y){
 #include "wx/wxPython/pydrawxxx.h"
 
 SWIGINTERN wxColour wxDC_GetPixel(wxDC *self,int x,int y){


@@ -3346,6 +3655,7 @@ SWIGINTERN PyObject *_wrap_new_Colour(PyObject *SWIGUNUSEDPARM(self), PyObject *
   byte arg1 = (byte) 0 ;
   byte arg2 = (byte) 0 ;
   byte arg3 = (byte) 0 ;
   byte arg1 = (byte) 0 ;
   byte arg2 = (byte) 0 ;
   byte arg3 = (byte) 0 ;

+  byte arg4 = (byte) wxALPHA_OPAQUE ;

   wxColour *result = 0 ;
   unsigned char val1 ;
   int ecode1 = 0 ;
   wxColour *result = 0 ;
   unsigned char val1 ;
   int ecode1 = 0 ;


@@ -3353,14 +3663,17 @@ SWIGINTERN PyObject *_wrap_new_Colour(PyObject *SWIGUNUSEDPARM(self), PyObject *
   int ecode2 = 0 ;
   unsigned char val3 ;
   int ecode3 = 0 ;
   int ecode2 = 0 ;
   unsigned char val3 ;
   int ecode3 = 0 ;

+  unsigned char val4 ;
+  int ecode4 = 0 ;

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

+  PyObject * obj3 = 0 ;

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

-    (char *) "red",(char *) "green",(char *) "blue", NULL 
+    (char *) "red",(char *) "green",(char *) "blue",(char *) "alpha", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_Colour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Colour",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;

   if (obj0) {
     ecode1 = SWIG_AsVal_unsigned_SS_char(obj0, &val1);
     if (!SWIG_IsOK(ecode1)) {
   if (obj0) {
     ecode1 = SWIG_AsVal_unsigned_SS_char(obj0, &val1);
     if (!SWIG_IsOK(ecode1)) {


@@ -3382,9 +3695,16 @@ SWIGINTERN PyObject *_wrap_new_Colour(PyObject *SWIGUNUSEDPARM(self), PyObject *
     } 
     arg3 = static_cast< byte >(val3);
   }
     } 
     arg3 = static_cast< byte >(val3);
   }

+  if (obj3) {
+    ecode4 = SWIG_AsVal_unsigned_SS_char(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Colour" "', expected argument " "4"" of type '" "byte""'");
+    } 
+    arg4 = static_cast< byte >(val4);
+  }

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

-    result = (wxColour *)new wxColour(arg1,arg2,arg3);
+    result = (wxColour *)new wxColour(arg1,arg2,arg3,arg4);

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


@@ -3575,6 +3895,34 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_Colour_Alpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxColour *arg1 = (wxColour *) 0 ;
+  byte result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour_Alpha" "', expected argument " "1"" of type '" "wxColour *""'"); 
+  }
+  arg1 = reinterpret_cast< wxColour * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (byte)(arg1)->Alpha();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_unsigned_SS_char(static_cast< unsigned char >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_Colour_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;
 SWIGINTERN PyObject *_wrap_Colour_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;


@@ -3611,6 +3959,7 @@ SWIGINTERN PyObject *_wrap_Colour_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *
   byte arg2 ;
   byte arg3 ;
   byte arg4 ;
   byte arg2 ;
   byte arg3 ;
   byte arg4 ;

+  byte arg5 = (byte) wxALPHA_OPAQUE ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned char val2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned char val2 ;


@@ -3619,15 +3968,18 @@ SWIGINTERN PyObject *_wrap_Colour_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *
   int ecode3 = 0 ;
   unsigned char val4 ;
   int ecode4 = 0 ;
   int ecode3 = 0 ;
   unsigned char val4 ;
   int ecode4 = 0 ;

+  unsigned char val5 ;
+  int ecode5 = 0 ;

   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 *) "red",(char *) "green",(char *) "blue", NULL 
+    (char *) "self",(char *) "red",(char *) "green",(char *) "blue",(char *) "alpha", NULL 

   };
   
   };
   

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

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour_Set" "', expected argument " "1"" of type '" "wxColour *""'"); 
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour_Set" "', expected argument " "1"" of type '" "wxColour *""'"); 


@@ -3648,9 +4000,16 @@ SWIGINTERN PyObject *_wrap_Colour_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Colour_Set" "', expected argument " "4"" of type '" "byte""'");
   } 
   arg4 = static_cast< byte >(val4);
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Colour_Set" "', expected argument " "4"" of type '" "byte""'");
   } 
   arg4 = static_cast< byte >(val4);

+  if (obj4) {
+    ecode5 = SWIG_AsVal_unsigned_SS_char(obj4, &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Colour_Set" "', expected argument " "5"" of type '" "byte""'");
+    } 
+    arg5 = static_cast< byte >(val5);
+  }

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

-    (arg1)->Set(arg2,arg3,arg4);
+    (arg1)->Set(arg2,arg3,arg4,arg5);

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


@@ -3885,25 +4244,36 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Colour_Get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Colour_Get(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;

+  bool arg2 = (bool) false ;

   PyObject *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "includeAlpha", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Colour_Get",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour_Get" "', expected argument " "1"" of type '" "wxColour *""'"); 
   }
   arg1 = reinterpret_cast< wxColour * >(argp1);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour_Get" "', expected argument " "1"" of type '" "wxColour *""'"); 
   }
   arg1 = reinterpret_cast< wxColour * >(argp1);

+  if (obj1) {
+    ecode2 = SWIG_AsVal_bool(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Colour_Get" "', expected argument " "2"" of type '" "bool""'");
+    } 
+    arg2 = static_cast< bool >(val2);
+  }

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (PyObject *)wxColour_Get(arg1);
-    wxPyEndAllowThreads(__tstate);
+    result = (PyObject *)wxColour_Get(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = result;
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = result;


@@ -3929,9 +4299,7 @@ SWIGINTERN PyObject *_wrap_Colour_GetRGB(PyObject *SWIGUNUSEDPARM(self), PyObjec
   }
   arg1 = reinterpret_cast< wxColour * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxColour * >(argp1);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (unsigned long)wxColour_GetRGB(arg1);
     result = (unsigned long)wxColour_GetRGB(arg1);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(result));
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(result));


@@ -5404,10 +5772,8 @@ SWIGINTERN PyObject *_wrap_delete_Bitmap(PyObject *SWIGUNUSEDPARM(self), PyObjec
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     delete arg1;
     
     delete arg1;
     

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -5642,9 +6008,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_GetHandle(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (long)(arg1)->GetHandle();
     result = (long)(arg1)->GetHandle();

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_long(static_cast< long >(result));
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_long(static_cast< long >(result));


@@ -5680,9 +6044,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_SetHandle(PyObject *SWIGUNUSEDPARM(self), PyOb
   } 
   arg2 = static_cast< long >(val2);
   {
   } 
   arg2 = static_cast< long >(val2);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     wxBitmap_SetHandle(arg1,arg2);
     wxBitmap_SetHandle(arg1,arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -5708,9 +6070,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (bool)(arg1)->Ok();
     result = (bool)(arg1)->Ok();

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5738,9 +6098,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_GetWidth(PyObject *SWIGUNUSEDPARM(self), PyObj
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (int)(arg1)->GetWidth();
     result = (int)(arg1)->GetWidth();

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_int(static_cast< int >(result));
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_int(static_cast< int >(result));


@@ -5766,9 +6124,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_GetHeight(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (int)(arg1)->GetHeight();
     result = (int)(arg1)->GetHeight();

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_int(static_cast< int >(result));
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_int(static_cast< int >(result));


@@ -5794,9 +6150,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_GetDepth(PyObject *SWIGUNUSEDPARM(self), PyObj
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (int)(arg1)->GetDepth();
     result = (int)(arg1)->GetDepth();

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_int(static_cast< int >(result));
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_int(static_cast< int >(result));


@@ -5822,9 +6176,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_GetSize(PyObject *SWIGUNUSEDPARM(self), PyObje
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = wxBitmap_GetSize(arg1);
     result = wxBitmap_GetSize(arg1);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );


@@ -5850,9 +6202,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_ConvertToImage(PyObject *SWIGUNUSEDPARM(self),
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = ((wxBitmap const *)arg1)->ConvertToImage();
     result = ((wxBitmap const *)arg1)->ConvertToImage();

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_NewPointerObj((new wxImage(static_cast< const wxImage& >(result))), SWIGTYPE_p_wxImage, SWIG_POINTER_OWN |  0 );
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_NewPointerObj((new wxImage(static_cast< const wxImage& >(result))), SWIGTYPE_p_wxImage, SWIG_POINTER_OWN |  0 );


@@ -5878,9 +6228,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_GetMask(PyObject *SWIGUNUSEDPARM(self), PyObje
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (wxMask *)((wxBitmap const *)arg1)->GetMask();
     result = (wxMask *)((wxBitmap const *)arg1)->GetMask();

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMask, 0 |  0 );
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMask, 0 |  0 );


@@ -5914,9 +6262,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_SetMask(PyObject *SWIGUNUSEDPARM(self), PyObje
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Bitmap_SetMask" "', expected argument " "2"" of type '" "wxMask *""'");
   }
   {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Bitmap_SetMask" "', expected argument " "2"" of type '" "wxMask *""'");
   }
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     (arg1)->SetMask(arg2);
     (arg1)->SetMask(arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -5950,9 +6296,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_SetMaskColour(PyObject *SWIGUNUSEDPARM(self),
     if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
   }
   {
     if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
   }
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     wxBitmap_SetMaskColour(arg1,(wxColour const &)*arg2);
     wxBitmap_SetMaskColour(arg1,(wxColour const &)*arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -5987,9 +6331,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_GetSubBitmap(PyObject *SWIGUNUSEDPARM(self), P
     if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
   }
   {
     if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
   }
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = ((wxBitmap const *)arg1)->GetSubBitmap((wxRect const &)*arg2);
     result = ((wxBitmap const *)arg1)->GetSubBitmap((wxRect const &)*arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_NewPointerObj((new wxBitmap(static_cast< const wxBitmap& >(result))), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN |  0 );
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_NewPointerObj((new wxBitmap(static_cast< const wxBitmap& >(result))), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN |  0 );


@@ -6045,9 +6387,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_SaveFile(PyObject *SWIGUNUSEDPARM(self), PyObj
     arg4 = reinterpret_cast< wxPalette * >(argp4);
   }
   {
     arg4 = reinterpret_cast< wxPalette * >(argp4);
   }
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (bool)(arg1)->SaveFile((wxString const &)*arg2,arg3,arg4);
     result = (bool)(arg1)->SaveFile((wxString const &)*arg2,arg3,arg4);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -6102,9 +6442,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_LoadFile(PyObject *SWIGUNUSEDPARM(self), PyObj
   } 
   arg3 = static_cast< wxBitmapType >(val3);
   {
   } 
   arg3 = static_cast< wxBitmapType >(val3);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (bool)(arg1)->LoadFile((wxString const &)*arg2,arg3);
     result = (bool)(arg1)->LoadFile((wxString const &)*arg2,arg3);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -6140,9 +6478,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_GetPalette(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxBitmap * >(argp1);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (wxPalette *)((wxBitmap const *)arg1)->GetPalette();
     result = (wxPalette *)((wxBitmap const *)arg1)->GetPalette();

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPalette, 0 |  0 );
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPalette, 0 |  0 );


@@ -6181,9 +6517,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_SetPalette(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg2 = reinterpret_cast< wxPalette * >(argp2);
   {
   }
   arg2 = reinterpret_cast< wxPalette * >(argp2);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     (arg1)->SetPalette((wxPalette const &)*arg2);
     (arg1)->SetPalette((wxPalette const &)*arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -6223,9 +6557,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_CopyFromIcon(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< wxIcon * >(argp2);
   {
   }
   arg2 = reinterpret_cast< wxIcon * >(argp2);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (bool)(arg1)->CopyFromIcon((wxIcon const &)*arg2);
     result = (bool)(arg1)->CopyFromIcon((wxIcon const &)*arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -6263,9 +6595,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_SetHeight(PyObject *SWIGUNUSEDPARM(self), PyOb
   } 
   arg2 = static_cast< int >(val2);
   {
   } 
   arg2 = static_cast< int >(val2);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     (arg1)->SetHeight(arg2);
     (arg1)->SetHeight(arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -6301,9 +6631,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_SetWidth(PyObject *SWIGUNUSEDPARM(self), PyObj
   } 
   arg2 = static_cast< int >(val2);
   {
   } 
   arg2 = static_cast< int >(val2);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     (arg1)->SetWidth(arg2);
     (arg1)->SetWidth(arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -6339,9 +6667,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_SetDepth(PyObject *SWIGUNUSEDPARM(self), PyObj
   } 
   arg2 = static_cast< int >(val2);
   {
   } 
   arg2 = static_cast< int >(val2);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     (arg1)->SetDepth(arg2);
     (arg1)->SetDepth(arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -6375,9 +6701,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_SetSize(PyObject *SWIGUNUSEDPARM(self), PyObje
     if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
   }
   {
     if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
   }
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     wxBitmap_SetSize(arg1,(wxSize const &)*arg2);
     wxBitmap_SetSize(arg1,(wxSize const &)*arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -6417,9 +6741,7 @@ SWIGINTERN PyObject *_wrap_Bitmap_CopyFromCursor(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< wxCursor * >(argp2);
   {
   }
   arg2 = reinterpret_cast< wxCursor * >(argp2);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (bool)(arg1)->CopyFromCursor((wxCursor const &)*arg2);
     result = (bool)(arg1)->CopyFromCursor((wxCursor const &)*arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -6458,9 +6780,7 @@ SWIGINTERN PyObject *_wrap_Bitmap___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   }
   arg2 = reinterpret_cast< wxBitmap * >(argp2);
   {
   }
   arg2 = reinterpret_cast< wxBitmap * >(argp2);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (bool)wxBitmap___eq__(arg1,(wxBitmap const *)arg2);
     result = (bool)wxBitmap___eq__(arg1,(wxBitmap const *)arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -6499,9 +6819,7 @@ SWIGINTERN PyObject *_wrap_Bitmap___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   }
   arg2 = reinterpret_cast< wxBitmap * >(argp2);
   {
   }
   arg2 = reinterpret_cast< wxBitmap * >(argp2);
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     result = (bool)wxBitmap___ne__(arg1,(wxBitmap const *)arg2);
     result = (bool)wxBitmap___ne__(arg1,(wxBitmap const *)arg2);

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -6524,676 +6842,645 @@ SWIGINTERN PyObject *Bitmap_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_Mask(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap__BitmapFromBufferAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxBitmap *arg1 = 0 ;
-  wxColour const &arg2_defvalue = wxNullColour ;
-  wxColour *arg2 = (wxColour *) &arg2_defvalue ;
-  wxMask *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  wxColour temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  int arg1 ;
+  int arg2 ;
+  buffer arg3 ;
+  int arg4 ;
+  buffer arg5 ;
+  int arg6 ;
+  wxBitmap *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  Py_ssize_t temp3 ;
+  Py_ssize_t temp5 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;

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

-    (char *) "bitmap",(char *) "colour", NULL 
+    (char *) "width",(char *) "height",(char *) "data",(char *) "alpha", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Mask",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0  | 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Mask" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Mask" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:_BitmapFromBufferAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "_BitmapFromBufferAlpha" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "_BitmapFromBufferAlpha" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &temp3) == -1) SWIG_fail;
+    arg4 = (int)temp3;

   }
   }

-  arg1 = reinterpret_cast< wxBitmap * >(argp1);
-  if (obj1) {
-    {
-      arg2 = &temp2;
-      if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+  {
+    if (obj3 != Py_None) {
+      if (PyObject_AsReadBuffer(obj3, (const void**)(&arg5), &temp5) == -1) SWIG_fail;
+      arg6 = (int)temp5;

     }
   }
   {
     }
   }
   {

-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxMask *)new_wxMask((wxBitmap const &)*arg1,(wxColour const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (wxBitmap *)_BitmapFromBufferAlpha(arg1,arg2,arg3,arg4,arg5,arg6);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMask, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_delete_Mask(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap__BitmapFromBuffer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMask *arg1 = (wxMask *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  int arg1 ;
+  int arg2 ;
+  buffer arg3 ;
+  int arg4 ;
+  wxBitmap *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  Py_ssize_t temp3 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "width",(char *) "height",(char *) "data", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMask, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Mask" "', expected argument " "1"" of type '" "wxMask *""'"); 
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:_BitmapFromBuffer",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "_BitmapFromBuffer" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "_BitmapFromBuffer" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &temp3) == -1) SWIG_fail;
+    arg4 = (int)temp3;

   }
   }

-  arg1 = reinterpret_cast< wxMask * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    delete arg1;
-    
-    wxPyEndAllowThreads(__tstate);
+    result = (wxBitmap *)_BitmapFromBuffer(arg1,arg2,arg3,arg4);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *Mask_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxMask, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *Mask_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_Icon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap__BitmapFromBufferRGBA(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxString *arg1 = 0 ;
-  wxBitmapType arg2 ;
-  int arg3 = (int) -1 ;
-  int arg4 = (int) -1 ;
-  wxIcon *result = 0 ;
-  bool temp1 = false ;
+  int arg1 ;
+  int arg2 ;
+  buffer arg3 ;
+  int arg4 ;
+  wxBitmap *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;

   int val2 ;
   int ecode2 = 0 ;
   int val2 ;
   int ecode2 = 0 ;

-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
+  Py_ssize_t temp3 ;

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

-  PyObject * obj3 = 0 ;

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

-    (char *) "name",(char *) "type",(char *) "desiredWidth",(char *) "desiredHeight", NULL 
+    (char *) "width",(char *) "height",(char *) "data", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_Icon",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  {
-    arg1 = wxString_in_helper(obj0);
-    if (arg1 == NULL) SWIG_fail;
-    temp1 = true;
-  }
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:_BitmapFromBufferRGBA",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "_BitmapFromBufferRGBA" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);

   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Icon" "', expected argument " "2"" of type '" "wxBitmapType""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "_BitmapFromBufferRGBA" "', expected argument " "2"" of type '" "int""'");

   } 
   } 

-  arg2 = static_cast< wxBitmapType >(val2);
-  if (obj2) {
-    ecode3 = SWIG_AsVal_int(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Icon" "', expected argument " "3"" of type '" "int""'");
-    } 
-    arg3 = static_cast< int >(val3);
-  }
-  if (obj3) {
-    ecode4 = SWIG_AsVal_int(obj3, &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Icon" "', expected argument " "4"" of type '" "int""'");
-    } 
-    arg4 = static_cast< int >(val4);
-  }
+  arg2 = static_cast< int >(val2);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxIcon *)new wxIcon((wxString const &)*arg1,arg2,arg3,arg4);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &temp3) == -1) SWIG_fail;
+    arg4 = (int)temp3;

   }
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIcon, SWIG_POINTER_NEW |  0 );

   {
   {

-    if (temp1)
-    delete arg1;
+    result = (wxBitmap *)_BitmapFromBufferRGBA(arg1,arg2,arg3,arg4);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp1)
-    delete arg1;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_Icon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PixelDataBase_GetOrigin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = (wxIcon *) 0 ;
+  wxPixelDataBase *arg1 = (wxPixelDataBase *) 0 ;
+  wxPoint result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIcon, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPixelDataBase, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Icon" "', expected argument " "1"" of type '" "wxIcon *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PixelDataBase_GetOrigin" "', expected argument " "1"" of type '" "wxPixelDataBase const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIcon * >(argp1);
+  arg1 = reinterpret_cast< wxPixelDataBase * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    delete arg1;
-    
-    wxPyEndAllowThreads(__tstate);
+    result = ((wxPixelDataBase const *)arg1)->GetOrigin();

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_new_EmptyIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PixelDataBase_GetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *result = 0 ;
+  wxPixelDataBase *arg1 = (wxPixelDataBase *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!SWIG_Python_UnpackTuple(args,"new_EmptyIcon",0,0,0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPixelDataBase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PixelDataBase_GetWidth" "', expected argument " "1"" of type '" "wxPixelDataBase const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPixelDataBase * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxIcon *)new wxIcon();
-    wxPyEndAllowThreads(__tstate);
+    result = (int)((wxPixelDataBase const *)arg1)->GetWidth();

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIcon, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_new_IconFromLocation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PixelDataBase_GetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIconLocation *arg1 = 0 ;
-  wxIcon *result = 0 ;
+  wxPixelDataBase *arg1 = (wxPixelDataBase *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "loc", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconFromLocation",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxIconLocation,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPixelDataBase, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_IconFromLocation" "', expected argument " "1"" of type '" "wxIconLocation const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_IconFromLocation" "', expected argument " "1"" of type '" "wxIconLocation const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PixelDataBase_GetHeight" "', expected argument " "1"" of type '" "wxPixelDataBase const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIconLocation * >(argp1);
+  arg1 = reinterpret_cast< wxPixelDataBase * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxIcon *)new wxIcon((wxIconLocation const &)*arg1);
-    wxPyEndAllowThreads(__tstate);
+    result = (int)((wxPixelDataBase const *)arg1)->GetHeight();

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIcon, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_new_IconFromBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PixelDataBase_GetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxBitmap *arg1 = 0 ;
-  wxIcon *result = 0 ;
+  wxPixelDataBase *arg1 = (wxPixelDataBase *) 0 ;
+  wxSize result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "bmp", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconFromBitmap",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPixelDataBase, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_IconFromBitmap" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_IconFromBitmap" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PixelDataBase_GetSize" "', expected argument " "1"" of type '" "wxPixelDataBase const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  arg1 = reinterpret_cast< wxPixelDataBase * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxIcon *)new_wxIcon((wxBitmap const &)*arg1);
-    wxPyEndAllowThreads(__tstate);
+    result = ((wxPixelDataBase const *)arg1)->GetSize();

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIcon, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_new_IconFromXPMData(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PixelDataBase_GetRowStride(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  PyObject *arg1 = (PyObject *) 0 ;
-  wxIcon *result = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "listOfStrings", NULL 
-  };
+  wxPixelDataBase *arg1 = (wxPixelDataBase *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconFromXPMData",kwnames,&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPixelDataBase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PixelDataBase_GetRowStride" "', expected argument " "1"" of type '" "wxPixelDataBase const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPixelDataBase * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxIcon *)new_wxIcon(arg1);
-    wxPyEndAllowThreads(__tstate);
+    result = (int)((wxPixelDataBase const *)arg1)->GetRowStride();

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIcon, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_Icon_LoadFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxIcon *arg1 = (wxIcon *) 0 ;
-  wxString *arg2 = 0 ;
-  wxBitmapType arg3 ;
-  bool result;
+SWIGINTERN PyObject *PixelDataBase_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPixelDataBase, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_NativePixelData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
+  PyObject *resultobj = 0;
+  wxBitmap *arg1 = 0 ;
+  wxNativePixelData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "name",(char *) "type", NULL 
-  };

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Icon_LoadFile",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxBitmap,  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_LoadFile" "', expected argument " "1"" of type '" "wxIcon *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_NativePixelData" "', expected argument " "1"" of type '" "wxBitmap &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIcon * >(argp1);
-  {
-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_NativePixelData" "', expected argument " "1"" of type '" "wxBitmap &""'"); 

   }
   }

-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Icon_LoadFile" "', expected argument " "3"" of type '" "wxBitmapType""'");
-  } 
-  arg3 = static_cast< wxBitmapType >(val3);
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->LoadFile((wxString const &)*arg2,arg3);
-    wxPyEndAllowThreads(__tstate);
+    result = (wxNativePixelData *)new wxNativePixelData(*arg1);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  {
-    if (temp2)
-    delete arg2;
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativePixelData, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Icon_GetHandle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_NativePixelData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = (wxIcon *) 0 ;
-  long result;
+  wxBitmap *arg1 = 0 ;
+  wxRect *arg2 = 0 ;
+  wxNativePixelData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  wxRect temp2 ;

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxBitmap,  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_GetHandle" "', expected argument " "1"" of type '" "wxIcon *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_NativePixelData" "', expected argument " "1"" of type '" "wxBitmap &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIcon * >(argp1);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_NativePixelData" "', expected argument " "1"" of type '" "wxBitmap &""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (long)(arg1)->GetHandle();
-    wxPyEndAllowThreads(__tstate);
+    arg2 = &temp2;
+    if ( ! wxRect_helper(swig_obj[1], &arg2)) SWIG_fail;
+  }
+  {
+    result = (wxNativePixelData *)new wxNativePixelData(*arg1,(wxRect const &)*arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_long(static_cast< long >(result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativePixelData, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_Icon_SetHandle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_NativePixelData__SWIG_2(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = (wxIcon *) 0 ;
-  long arg2 ;
+  wxBitmap *arg1 = 0 ;
+  wxPoint *arg2 = 0 ;
+  wxSize *arg3 = 0 ;
+  wxNativePixelData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  long val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "handle", NULL 
-  };
+  wxPoint temp2 ;
+  wxSize temp3 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetHandle",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxBitmap,  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_SetHandle" "', expected argument " "1"" of type '" "wxIcon *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_NativePixelData" "', expected argument " "1"" of type '" "wxBitmap &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIcon * >(argp1);
-  ecode2 = SWIG_AsVal_long(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Icon_SetHandle" "', expected argument " "2"" of type '" "long""'");
-  } 
-  arg2 = static_cast< long >(val2);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_NativePixelData" "', expected argument " "1"" of type '" "wxBitmap &""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxIcon_SetHandle(arg1,arg2);
-    wxPyEndAllowThreads(__tstate);
+    arg2 = &temp2;
+    if ( ! wxPoint_helper(swig_obj[1], &arg2)) SWIG_fail;
+  }
+  {
+    arg3 = &temp3;
+    if ( ! wxSize_helper(swig_obj[2], &arg3)) SWIG_fail;
+  }
+  {
+    result = (wxNativePixelData *)new wxNativePixelData(*arg1,(wxPoint const &)*arg2,(wxSize const &)*arg3);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativePixelData, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_Icon_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_NativePixelData(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  
+  if (!(argc = SWIG_Python_UnpackTuple(args,"new_NativePixelData",0,3,argv))) SWIG_fail;
+  --argc;
+  if (argc == 1) {
+    return _wrap_new_NativePixelData__SWIG_0(self, argc, argv);
+  }
+  if (argc == 2) {
+    return _wrap_new_NativePixelData__SWIG_1(self, argc, argv);
+  }
+  if (argc == 3) {
+    return _wrap_new_NativePixelData__SWIG_2(self, argc, argv);
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_NativePixelData'");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_NativePixelData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = (wxIcon *) 0 ;
-  bool result;
+  wxNativePixelData *arg1 = (wxNativePixelData *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativePixelData, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_Ok" "', expected argument " "1"" of type '" "wxIcon *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_NativePixelData" "', expected argument " "1"" of type '" "wxNativePixelData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIcon * >(argp1);
+  arg1 = reinterpret_cast< wxNativePixelData * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->Ok();
-    wxPyEndAllowThreads(__tstate);
+    delete arg1;
+    

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

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

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

-SWIGINTERN PyObject *_wrap_Icon_GetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativePixelData_GetPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = (wxIcon *) 0 ;
-  int result;
+  wxNativePixelData *arg1 = (wxNativePixelData *) 0 ;
+  wxNativePixelData_Accessor result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativePixelData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_GetWidth" "', expected argument " "1"" of type '" "wxIcon *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativePixelData_GetPixels" "', expected argument " "1"" of type '" "wxNativePixelData const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIcon * >(argp1);
+  arg1 = reinterpret_cast< wxNativePixelData * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (int)(arg1)->GetWidth();
-    wxPyEndAllowThreads(__tstate);
+    result = ((wxNativePixelData const *)arg1)->GetPixels();

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_NewPointerObj((new wxNativePixelData_Accessor(static_cast< const wxNativePixelData_Accessor& >(result))), SWIGTYPE_p_wxNativePixelData_Accessor, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_Icon_GetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativePixelData_UseAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = (wxIcon *) 0 ;
-  int result;
+  wxNativePixelData *arg1 = (wxNativePixelData *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativePixelData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_GetHeight" "', expected argument " "1"" of type '" "wxIcon *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativePixelData_UseAlpha" "', expected argument " "1"" of type '" "wxNativePixelData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIcon * >(argp1);
+  arg1 = reinterpret_cast< wxNativePixelData * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (int)(arg1)->GetHeight();
-    wxPyEndAllowThreads(__tstate);
+    (arg1)->UseAlpha();

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Icon_GetDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativePixelData___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = (wxIcon *) 0 ;
-  int result;
+  wxNativePixelData *arg1 = (wxNativePixelData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativePixelData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_GetDepth" "', expected argument " "1"" of type '" "wxIcon *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativePixelData___nonzero__" "', expected argument " "1"" of type '" "wxNativePixelData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIcon * >(argp1);
+  arg1 = reinterpret_cast< wxNativePixelData * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (int)(arg1)->GetDepth();
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxNativePixelData___nonzero__(arg1);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

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

-SWIGINTERN PyObject *_wrap_Icon_SetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *NativePixelData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxNativePixelData, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *NativePixelData_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_NativePixelData_Accessor__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = (wxIcon *) 0 ;
-  int arg2 ;
+  wxNativePixelData *arg1 = 0 ;
+  wxNativePixelData_Accessor *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "w", NULL 
-  };

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetWidth",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxNativePixelData,  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_SetWidth" "', expected argument " "1"" of type '" "wxIcon *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_NativePixelData_Accessor" "', expected argument " "1"" of type '" "wxNativePixelData &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIcon * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Icon_SetWidth" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_NativePixelData_Accessor" "', expected argument " "1"" of type '" "wxNativePixelData &""'"); 
+  }
+  arg1 = reinterpret_cast< wxNativePixelData * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetWidth(arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (wxNativePixelData_Accessor *)new wxNativePixelData_Accessor(*arg1);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativePixelData_Accessor, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_Icon_SetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_NativePixelData_Accessor__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = (wxIcon *) 0 ;
-  int arg2 ;
+  wxBitmap *arg1 = 0 ;
+  wxNativePixelData *arg2 = 0 ;
+  wxNativePixelData_Accessor *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "h", NULL 
-  };
+  void *argp2 = 0 ;
+  int res2 = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetHeight",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxBitmap,  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_SetHeight" "', expected argument " "1"" of type '" "wxIcon *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_NativePixelData_Accessor" "', expected argument " "1"" of type '" "wxBitmap &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIcon * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Icon_SetHeight" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_NativePixelData_Accessor" "', expected argument " "1"" of type '" "wxBitmap &""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxNativePixelData,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_NativePixelData_Accessor" "', expected argument " "2"" of type '" "wxNativePixelData &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_NativePixelData_Accessor" "', expected argument " "2"" of type '" "wxNativePixelData &""'"); 
+  }
+  arg2 = reinterpret_cast< wxNativePixelData * >(argp2);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetHeight(arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (wxNativePixelData_Accessor *)new wxNativePixelData_Accessor(*arg1,*arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativePixelData_Accessor, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_Icon_SetDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_NativePixelData_Accessor__SWIG_2(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = (wxIcon *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "d", NULL 
-  };
+  wxNativePixelData_Accessor *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetDepth",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_SetDepth" "', expected argument " "1"" of type '" "wxIcon *""'"); 
-  }
-  arg1 = reinterpret_cast< wxIcon * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Icon_SetDepth" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetDepth(arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (wxNativePixelData_Accessor *)new wxNativePixelData_Accessor();

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativePixelData_Accessor, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_Icon_SetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_NativePixelData_Accessor(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  
+  if (!(argc = SWIG_Python_UnpackTuple(args,"new_NativePixelData_Accessor",0,2,argv))) SWIG_fail;
+  --argc;
+  if (argc == 0) {
+    return _wrap_new_NativePixelData_Accessor__SWIG_2(self, argc, argv);
+  }
+  if (argc == 1) {
+    return _wrap_new_NativePixelData_Accessor__SWIG_0(self, argc, argv);
+  }
+  if (argc == 2) {
+    return _wrap_new_NativePixelData_Accessor__SWIG_1(self, argc, argv);
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_NativePixelData_Accessor'");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_NativePixelData_Accessor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = (wxIcon *) 0 ;
-  wxSize *arg2 = 0 ;
+  wxNativePixelData_Accessor *arg1 = (wxNativePixelData_Accessor *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "size", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetSize",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativePixelData_Accessor, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_SetSize" "', expected argument " "1"" of type '" "wxIcon *""'"); 
-  }
-  arg1 = reinterpret_cast< wxIcon * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_NativePixelData_Accessor" "', expected argument " "1"" of type '" "wxNativePixelData_Accessor *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxNativePixelData_Accessor * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetSize((wxSize const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    delete arg1;
+    

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -7203,10 +7490,10 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Icon_CopyFromBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativePixelData_Accessor_Reset(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = (wxIcon *) 0 ;
-  wxBitmap *arg2 = 0 ;
+  wxNativePixelData_Accessor *arg1 = (wxNativePixelData_Accessor *) 0 ;
+  wxNativePixelData *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;


@@ -7214,27 +7501,25 @@ SWIGINTERN PyObject *_wrap_Icon_CopyFromBitmap(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "bmp", NULL 
+    (char *) "self",(char *) "data", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_CopyFromBitmap",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativePixelData_Accessor_Reset",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativePixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_CopyFromBitmap" "', expected argument " "1"" of type '" "wxIcon *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativePixelData_Accessor_Reset" "', expected argument " "1"" of type '" "wxNativePixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIcon * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+  arg1 = reinterpret_cast< wxNativePixelData_Accessor * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxNativePixelData,  0  | 0);

   if (!SWIG_IsOK(res2)) {
   if (!SWIG_IsOK(res2)) {

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Icon_CopyFromBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NativePixelData_Accessor_Reset" "', expected argument " "2"" of type '" "wxNativePixelData const &""'"); 

   }
   if (!argp2) {
   }
   if (!argp2) {

-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Icon_CopyFromBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NativePixelData_Accessor_Reset" "', expected argument " "2"" of type '" "wxNativePixelData const &""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  arg2 = reinterpret_cast< wxNativePixelData * >(argp2);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->CopyFromBitmap((wxBitmap const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    (arg1)->Reset((wxNativePixelData const &)*arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -7244,86 +7529,50 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *Icon_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxIcon, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *Icon_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_IconLocation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativePixelData_Accessor_IsOk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxString *arg1 = (wxString *) &wxPyEmptyString ;
-  int arg2 = (int) 0 ;
-  wxIconLocation *result = 0 ;
-  bool temp1 = false ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "filename",(char *) "num", NULL 
-  };
+  wxNativePixelData_Accessor *arg1 = (wxNativePixelData_Accessor *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_IconLocation",kwnames,&obj0,&obj1)) SWIG_fail;
-  if (obj0) {
-    {
-      arg1 = wxString_in_helper(obj0);
-      if (arg1 == NULL) SWIG_fail;
-      temp1 = true;
-    }
-  }
-  if (obj1) {
-    ecode2 = SWIG_AsVal_int(obj1, &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_IconLocation" "', expected argument " "2"" of type '" "int""'");
-    } 
-    arg2 = static_cast< int >(val2);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativePixelData_Accessor, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativePixelData_Accessor_IsOk" "', expected argument " "1"" of type '" "wxNativePixelData_Accessor const *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxNativePixelData_Accessor * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxIconLocation *)new_wxIconLocation((wxString const *)arg1,arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)((wxNativePixelData_Accessor const *)arg1)->IsOk();

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIconLocation, SWIG_POINTER_NEW |  0 );

   {
   {

-    if (temp1)
-    delete arg1;
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

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

-  {
-    if (temp1)
-    delete arg1;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_IconLocation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativePixelData_Accessor_nextPixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIconLocation *arg1 = (wxIconLocation *) 0 ;
+  wxNativePixelData_Accessor *arg1 = (wxNativePixelData_Accessor *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIconLocation, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativePixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IconLocation" "', expected argument " "1"" of type '" "wxIconLocation *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativePixelData_Accessor_nextPixel" "', expected argument " "1"" of type '" "wxNativePixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIconLocation * >(argp1);
+  arg1 = reinterpret_cast< wxNativePixelData_Accessor * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    delete arg1;
-    
-    wxPyEndAllowThreads(__tstate);
+    wxNativePixelData_Accessor_nextPixel(arg1);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -7333,147 +7582,261 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_IconLocation_IsOk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativePixelData_Accessor_Offset(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIconLocation *arg1 = (wxIconLocation *) 0 ;
-  bool result;
+  wxNativePixelData_Accessor *arg1 = (wxNativePixelData_Accessor *) 0 ;
+  wxNativePixelData *arg2 = 0 ;
+  int arg3 ;
+  int arg4 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "data",(char *) "x",(char *) "y", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIconLocation, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:NativePixelData_Accessor_Offset",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativePixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconLocation_IsOk" "', expected argument " "1"" of type '" "wxIconLocation const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativePixelData_Accessor_Offset" "', expected argument " "1"" of type '" "wxNativePixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIconLocation * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxIconLocation const *)arg1)->IsOk();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+  arg1 = reinterpret_cast< wxNativePixelData_Accessor * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxNativePixelData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NativePixelData_Accessor_Offset" "', expected argument " "2"" of type '" "wxNativePixelData const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NativePixelData_Accessor_Offset" "', expected argument " "2"" of type '" "wxNativePixelData const &""'"); 

   }
   }

+  arg2 = reinterpret_cast< wxNativePixelData * >(argp2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "NativePixelData_Accessor_Offset" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "NativePixelData_Accessor_Offset" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);

   {
   {

-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    (arg1)->Offset((wxNativePixelData const &)*arg2,arg3,arg4);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_IconLocation_SetFileName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativePixelData_Accessor_OffsetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIconLocation *arg1 = (wxIconLocation *) 0 ;
-  wxString *arg2 = 0 ;
+  wxNativePixelData_Accessor *arg1 = (wxNativePixelData_Accessor *) 0 ;
+  wxNativePixelData *arg2 = 0 ;
+  int arg3 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;

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

+  PyObject * obj2 = 0 ;

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

-    (char *) "self",(char *) "filename", NULL 
+    (char *) "self",(char *) "data",(char *) "x", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconLocation_SetFileName",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIconLocation, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:NativePixelData_Accessor_OffsetX",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativePixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconLocation_SetFileName" "', expected argument " "1"" of type '" "wxIconLocation *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativePixelData_Accessor_OffsetX" "', expected argument " "1"" of type '" "wxNativePixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIconLocation * >(argp1);
-  {
-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+  arg1 = reinterpret_cast< wxNativePixelData_Accessor * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxNativePixelData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NativePixelData_Accessor_OffsetX" "', expected argument " "2"" of type '" "wxNativePixelData const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NativePixelData_Accessor_OffsetX" "', expected argument " "2"" of type '" "wxNativePixelData const &""'"); 

   }
   }

+  arg2 = reinterpret_cast< wxNativePixelData * >(argp2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "NativePixelData_Accessor_OffsetX" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetFileName((wxString const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    (arg1)->OffsetX((wxNativePixelData const &)*arg2,arg3);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();

-  {
-    if (temp2)
-    delete arg2;
-  }

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_IconLocation_GetFileName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativePixelData_Accessor_OffsetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIconLocation *arg1 = (wxIconLocation *) 0 ;
-  wxString *result = 0 ;
+  wxNativePixelData_Accessor *arg1 = (wxNativePixelData_Accessor *) 0 ;
+  wxNativePixelData *arg2 = 0 ;
+  int arg3 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "data",(char *) "y", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIconLocation, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:NativePixelData_Accessor_OffsetY",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativePixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconLocation_GetFileName" "', expected argument " "1"" of type '" "wxIconLocation const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativePixelData_Accessor_OffsetY" "', expected argument " "1"" of type '" "wxNativePixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIconLocation * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    {
-      wxString const &_result_ref = ((wxIconLocation const *)arg1)->GetFileName();
-      result = (wxString *) &_result_ref;
-    }
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+  arg1 = reinterpret_cast< wxNativePixelData_Accessor * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxNativePixelData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NativePixelData_Accessor_OffsetY" "', expected argument " "2"" of type '" "wxNativePixelData const &""'"); 

   }
   }

+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NativePixelData_Accessor_OffsetY" "', expected argument " "2"" of type '" "wxNativePixelData const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxNativePixelData * >(argp2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "NativePixelData_Accessor_OffsetY" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);

   {
   {

-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
-#else
-    resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
-#endif
+    (arg1)->OffsetY((wxNativePixelData const &)*arg2,arg3);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_IconLocation_SetIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativePixelData_Accessor_MoveTo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIconLocation *arg1 = (wxIconLocation *) 0 ;
-  int arg2 ;
+  wxNativePixelData_Accessor *arg1 = (wxNativePixelData_Accessor *) 0 ;
+  wxNativePixelData *arg2 = 0 ;
+  int arg3 ;
+  int arg4 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;

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

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

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

-    (char *) "self",(char *) "num", NULL 
+    (char *) "self",(char *) "data",(char *) "x",(char *) "y", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconLocation_SetIndex",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIconLocation, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:NativePixelData_Accessor_MoveTo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativePixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconLocation_SetIndex" "', expected argument " "1"" of type '" "wxIconLocation *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativePixelData_Accessor_MoveTo" "', expected argument " "1"" of type '" "wxNativePixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIconLocation * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  arg1 = reinterpret_cast< wxNativePixelData_Accessor * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxNativePixelData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NativePixelData_Accessor_MoveTo" "', expected argument " "2"" of type '" "wxNativePixelData const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NativePixelData_Accessor_MoveTo" "', expected argument " "2"" of type '" "wxNativePixelData const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxNativePixelData * >(argp2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "NativePixelData_Accessor_MoveTo" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "NativePixelData_Accessor_MoveTo" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  {
+    (arg1)->MoveTo((wxNativePixelData const &)*arg2,arg3,arg4);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NativePixelData_Accessor_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxNativePixelData_Accessor *arg1 = (wxNativePixelData_Accessor *) 0 ;
+  byte arg2 ;
+  byte arg3 ;
+  byte arg4 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned char val2 ;
+  int ecode2 = 0 ;
+  unsigned char val3 ;
+  int ecode3 = 0 ;
+  unsigned char val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "red",(char *) "green",(char *) "blue", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:NativePixelData_Accessor_Set",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativePixelData_Accessor, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativePixelData_Accessor_Set" "', expected argument " "1"" of type '" "wxNativePixelData_Accessor *""'"); 
+  }
+  arg1 = reinterpret_cast< wxNativePixelData_Accessor * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_char(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IconLocation_SetIndex" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativePixelData_Accessor_Set" "', expected argument " "2"" of type '" "byte""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
+  arg2 = static_cast< byte >(val2);
+  ecode3 = SWIG_AsVal_unsigned_SS_char(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "NativePixelData_Accessor_Set" "', expected argument " "3"" of type '" "byte""'");
+  } 
+  arg3 = static_cast< byte >(val3);
+  ecode4 = SWIG_AsVal_unsigned_SS_char(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "NativePixelData_Accessor_Set" "', expected argument " "4"" of type '" "byte""'");
+  } 
+  arg4 = static_cast< byte >(val4);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxIconLocation_SetIndex(arg1,arg2);
-    wxPyEndAllowThreads(__tstate);
+    wxNativePixelData_Accessor_Set(arg1,arg2,arg3,arg4);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -7483,161 +7846,181 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_IconLocation_GetIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativePixelData_Accessor_Get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIconLocation *arg1 = (wxIconLocation *) 0 ;
-  int result;
+  wxNativePixelData_Accessor *arg1 = (wxNativePixelData_Accessor *) 0 ;
+  PyObject *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIconLocation, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativePixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconLocation_GetIndex" "', expected argument " "1"" of type '" "wxIconLocation *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativePixelData_Accessor_Get" "', expected argument " "1"" of type '" "wxNativePixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIconLocation * >(argp1);
+  arg1 = reinterpret_cast< wxNativePixelData_Accessor * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (int)wxIconLocation_GetIndex(arg1);
-    wxPyEndAllowThreads(__tstate);
+    result = (PyObject *)wxNativePixelData_Accessor_Get(arg1);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = result;

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

-SWIGINTERN PyObject *IconLocation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *NativePixelData_Accessor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxIconLocation, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxNativePixelData_Accessor, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *IconLocation_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *NativePixelData_Accessor_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_IconBundle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_AlphaPixelData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIconBundle *result = 0 ;
+  wxBitmap *arg1 = 0 ;
+  wxAlphaPixelData *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;

   
   

-  if (!SWIG_Python_UnpackTuple(args,"new_IconBundle",0,0,0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxBitmap,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_AlphaPixelData" "', expected argument " "1"" of type '" "wxBitmap &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_AlphaPixelData" "', expected argument " "1"" of type '" "wxBitmap &""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxIconBundle *)new wxIconBundle();
-    wxPyEndAllowThreads(__tstate);
+    result = (wxAlphaPixelData *)new wxAlphaPixelData(*arg1);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIconBundle, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAlphaPixelData, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_new_IconBundleFromFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_AlphaPixelData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxString *arg1 = 0 ;
-  long arg2 ;
-  wxIconBundle *result = 0 ;
-  bool temp1 = false ;
-  long val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "file",(char *) "type", NULL 
-  };
+  wxBitmap *arg1 = 0 ;
+  wxRect *arg2 = 0 ;
+  wxAlphaPixelData *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxRect temp2 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_IconBundleFromFile",kwnames,&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = wxString_in_helper(obj0);
-    if (arg1 == NULL) SWIG_fail;
-    temp1 = true;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxBitmap,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_AlphaPixelData" "', expected argument " "1"" of type '" "wxBitmap &""'"); 

   }
   }

-  ecode2 = SWIG_AsVal_long(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_IconBundleFromFile" "', expected argument " "2"" of type '" "long""'");
-  } 
-  arg2 = static_cast< long >(val2);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_AlphaPixelData" "', expected argument " "1"" of type '" "wxBitmap &""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxIconBundle *)new wxIconBundle((wxString const &)*arg1,arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    arg2 = &temp2;
+    if ( ! wxRect_helper(swig_obj[1], &arg2)) SWIG_fail;

   }
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIconBundle, SWIG_POINTER_OWN |  0 );

   {
   {

-    if (temp1)
-    delete arg1;
+    result = (wxAlphaPixelData *)new wxAlphaPixelData(*arg1,(wxRect const &)*arg2);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAlphaPixelData, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp1)
-    delete arg1;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_new_IconBundleFromIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_AlphaPixelData__SWIG_2(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIcon *arg1 = 0 ;
-  wxIconBundle *result = 0 ;
+  wxBitmap *arg1 = 0 ;
+  wxPoint *arg2 = 0 ;
+  wxSize *arg3 = 0 ;
+  wxAlphaPixelData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "icon", NULL 
-  };
+  wxPoint temp2 ;
+  wxSize temp3 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconBundleFromIcon",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxIcon,  0  | 0);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxBitmap,  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_IconBundleFromIcon" "', expected argument " "1"" of type '" "wxIcon const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_AlphaPixelData" "', expected argument " "1"" of type '" "wxBitmap &""'"); 

   }
   if (!argp1) {
   }
   if (!argp1) {

-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_IconBundleFromIcon" "', expected argument " "1"" of type '" "wxIcon const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_AlphaPixelData" "', expected argument " "1"" of type '" "wxBitmap &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIcon * >(argp1);
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxIconBundle *)new wxIconBundle((wxIcon const &)*arg1);
-    wxPyEndAllowThreads(__tstate);
+    arg2 = &temp2;
+    if ( ! wxPoint_helper(swig_obj[1], &arg2)) SWIG_fail;
+  }
+  {
+    arg3 = &temp3;
+    if ( ! wxSize_helper(swig_obj[2], &arg3)) SWIG_fail;
+  }
+  {
+    result = (wxAlphaPixelData *)new wxAlphaPixelData(*arg1,(wxPoint const &)*arg2,(wxSize const &)*arg3);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIconBundle, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAlphaPixelData, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_delete_IconBundle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_AlphaPixelData(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  
+  if (!(argc = SWIG_Python_UnpackTuple(args,"new_AlphaPixelData",0,3,argv))) SWIG_fail;
+  --argc;
+  if (argc == 1) {
+    return _wrap_new_AlphaPixelData__SWIG_0(self, argc, argv);
+  }
+  if (argc == 2) {
+    return _wrap_new_AlphaPixelData__SWIG_1(self, argc, argv);
+  }
+  if (argc == 3) {
+    return _wrap_new_AlphaPixelData__SWIG_2(self, argc, argv);
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_AlphaPixelData'");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_AlphaPixelData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIconBundle *arg1 = (wxIconBundle *) 0 ;
+  wxAlphaPixelData *arg1 = (wxAlphaPixelData *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIconBundle, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAlphaPixelData, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IconBundle" "', expected argument " "1"" of type '" "wxIconBundle *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_AlphaPixelData" "', expected argument " "1"" of type '" "wxAlphaPixelData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIconBundle * >(argp1);
+  arg1 = reinterpret_cast< wxAlphaPixelData * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();

     delete arg1;
     
     delete arg1;
     

-    wxPyEndAllowThreads(__tstate);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -7647,137 +8030,78 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_IconBundle_AddIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_AlphaPixelData_GetPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIconBundle *arg1 = (wxIconBundle *) 0 ;
-  wxIcon *arg2 = 0 ;
+  wxAlphaPixelData *arg1 = (wxAlphaPixelData *) 0 ;
+  wxAlphaPixelData_Accessor result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "icon", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconBundle_AddIcon",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIconBundle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAlphaPixelData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconBundle_AddIcon" "', expected argument " "1"" of type '" "wxIconBundle *""'"); 
-  }
-  arg1 = reinterpret_cast< wxIconBundle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxIcon,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IconBundle_AddIcon" "', expected argument " "2"" of type '" "wxIcon const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaPixelData_GetPixels" "', expected argument " "1"" of type '" "wxAlphaPixelData const *""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IconBundle_AddIcon" "', expected argument " "2"" of type '" "wxIcon const &""'"); 
-  }
-  arg2 = reinterpret_cast< wxIcon * >(argp2);
+  arg1 = reinterpret_cast< wxAlphaPixelData * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->AddIcon((wxIcon const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = ((wxAlphaPixelData const *)arg1)->GetPixels();

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj((new wxAlphaPixelData_Accessor(static_cast< const wxAlphaPixelData_Accessor& >(result))), SWIGTYPE_p_wxAlphaPixelData_Accessor, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_AlphaPixelData_UseAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIconBundle *arg1 = (wxIconBundle *) 0 ;
-  wxString *arg2 = 0 ;
-  long arg3 ;
+  wxAlphaPixelData *arg1 = (wxAlphaPixelData *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
-  long val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "file",(char *) "type", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:IconBundle_AddIconFromFile",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIconBundle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAlphaPixelData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconBundle_AddIconFromFile" "', expected argument " "1"" of type '" "wxIconBundle *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaPixelData_UseAlpha" "', expected argument " "1"" of type '" "wxAlphaPixelData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxIconBundle * >(argp1);
+  arg1 = reinterpret_cast< wxAlphaPixelData * >(argp1);

   {
   {

-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
-  }
-  ecode3 = SWIG_AsVal_long(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IconBundle_AddIconFromFile" "', expected argument " "3"" of type '" "long""'");
-  } 
-  arg3 = static_cast< long >(val3);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->AddIcon((wxString const &)*arg2,arg3);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    (arg1)->UseAlpha();
+    if (PyErr_Occurred()) SWIG_fail;

   }
   resultobj = SWIG_Py_Void();
   }
   resultobj = SWIG_Py_Void();

-  {
-    if (temp2)
-    delete arg2;
-  }

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_IconBundle_GetIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_AlphaPixelData___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxIconBundle *arg1 = (wxIconBundle *) 0 ;
-  wxSize *arg2 = 0 ;
-  wxIcon *result = 0 ;
+  wxAlphaPixelData *arg1 = (wxAlphaPixelData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "size", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconBundle_GetIcon",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIconBundle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAlphaPixelData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconBundle_GetIcon" "', expected argument " "1"" of type '" "wxIconBundle const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxIconBundle * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaPixelData___nonzero__" "', expected argument " "1"" of type '" "wxAlphaPixelData *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxAlphaPixelData * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    {
-      wxIcon const &_result_ref = ((wxIconBundle const *)arg1)->GetIcon((wxSize const &)*arg2);
-      result = (wxIcon *) &_result_ref;
-    }
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxAlphaPixelData___nonzero__(arg1);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {

-    wxIcon* resultptr = new wxIcon(*result);
-    resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxIcon, 1);
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

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


@@ -7785,236 +8109,176 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *IconBundle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *AlphaPixelData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxIconBundle, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxAlphaPixelData, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *IconBundle_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *AlphaPixelData_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_Cursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_AlphaPixelData_Accessor__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxString *arg1 = 0 ;
-  long arg2 ;
-  int arg3 = (int) 0 ;
-  int arg4 = (int) 0 ;
-  wxCursor *result = 0 ;
-  bool temp1 = false ;
-  long val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  char *  kwnames[] = {
-    (char *) "cursorName",(char *) "type",(char *) "hotSpotX",(char *) "hotSpotY", NULL 
-  };
+  wxAlphaPixelData *arg1 = 0 ;
+  wxAlphaPixelData_Accessor *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_Cursor",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  {
-    arg1 = wxString_in_helper(obj0);
-    if (arg1 == NULL) SWIG_fail;
-    temp1 = true;
-  }
-  ecode2 = SWIG_AsVal_long(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Cursor" "', expected argument " "2"" of type '" "long""'");
-  } 
-  arg2 = static_cast< long >(val2);
-  if (obj2) {
-    ecode3 = SWIG_AsVal_int(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Cursor" "', expected argument " "3"" of type '" "int""'");
-    } 
-    arg3 = static_cast< int >(val3);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxAlphaPixelData,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_AlphaPixelData_Accessor" "', expected argument " "1"" of type '" "wxAlphaPixelData &""'"); 

   }
   }

-  if (obj3) {
-    ecode4 = SWIG_AsVal_int(obj3, &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Cursor" "', expected argument " "4"" of type '" "int""'");
-    } 
-    arg4 = static_cast< int >(val4);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_AlphaPixelData_Accessor" "', expected argument " "1"" of type '" "wxAlphaPixelData &""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxAlphaPixelData * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxCursor *)new_wxCursor((wxString const &)*arg1,arg2,arg3,arg4);
-    wxPyEndAllowThreads(__tstate);
+    result = (wxAlphaPixelData_Accessor *)new wxAlphaPixelData_Accessor(*arg1);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxCursor, SWIG_POINTER_NEW |  0 );
-  {
-    if (temp1)
-    delete arg1;
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAlphaPixelData_Accessor, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp1)
-    delete arg1;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_Cursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_AlphaPixelData_Accessor__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxCursor *arg1 = (wxCursor *) 0 ;
+  wxBitmap *arg1 = 0 ;
+  wxAlphaPixelData *arg2 = 0 ;
+  wxAlphaPixelData_Accessor *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxCursor, SWIG_POINTER_DISOWN |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxBitmap,  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Cursor" "', expected argument " "1"" of type '" "wxCursor *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_AlphaPixelData_Accessor" "', expected argument " "1"" of type '" "wxBitmap &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxCursor * >(argp1);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_AlphaPixelData_Accessor" "', expected argument " "1"" of type '" "wxBitmap &""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxAlphaPixelData,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_AlphaPixelData_Accessor" "', expected argument " "2"" of type '" "wxAlphaPixelData &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_AlphaPixelData_Accessor" "', expected argument " "2"" of type '" "wxAlphaPixelData &""'"); 
+  }
+  arg2 = reinterpret_cast< wxAlphaPixelData * >(argp2);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    delete arg1;
-    
-    wxPyEndAllowThreads(__tstate);
+    result = (wxAlphaPixelData_Accessor *)new wxAlphaPixelData_Accessor(*arg1,*arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAlphaPixelData_Accessor, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_new_StockCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_AlphaPixelData_Accessor__SWIG_2(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  int arg1 ;
-  wxCursor *result = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "id", NULL 
-  };
+  wxAlphaPixelData_Accessor *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_StockCursor",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_StockCursor" "', expected argument " "1"" of type '" "int""'");
-  } 
-  arg1 = static_cast< int >(val1);
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxCursor *)new wxCursor(arg1);
-    wxPyEndAllowThreads(__tstate);
+    result = (wxAlphaPixelData_Accessor *)new wxAlphaPixelData_Accessor();

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxCursor, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAlphaPixelData_Accessor, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_new_CursorFromImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxImage *arg1 = 0 ;
-  wxCursor *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "image", NULL 
-  };
+SWIGINTERN PyObject *_wrap_new_AlphaPixelData_Accessor(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_CursorFromImage",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxImage,  0  | 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CursorFromImage" "', expected argument " "1"" of type '" "wxImage const &""'"); 
+  if (!(argc = SWIG_Python_UnpackTuple(args,"new_AlphaPixelData_Accessor",0,2,argv))) SWIG_fail;
+  --argc;
+  if (argc == 0) {
+    return _wrap_new_AlphaPixelData_Accessor__SWIG_2(self, argc, argv);

   }
   }

-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CursorFromImage" "', expected argument " "1"" of type '" "wxImage const &""'"); 
+  if (argc == 1) {
+    return _wrap_new_AlphaPixelData_Accessor__SWIG_0(self, argc, argv);

   }
   }

-  arg1 = reinterpret_cast< wxImage * >(argp1);
-  {
-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxCursor *)new wxCursor((wxImage const &)*arg1);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+  if (argc == 2) {
+    return _wrap_new_AlphaPixelData_Accessor__SWIG_1(self, argc, argv);

   }
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxCursor, SWIG_POINTER_OWN |  0 );
-  return resultobj;
+  

 fail:
 fail:

+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_AlphaPixelData_Accessor'");

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Cursor_GetHandle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_AlphaPixelData_Accessor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxCursor *arg1 = (wxCursor *) 0 ;
-  long result;
+  wxAlphaPixelData_Accessor *arg1 = (wxAlphaPixelData_Accessor *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAlphaPixelData_Accessor, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_GetHandle" "', expected argument " "1"" of type '" "wxCursor *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_AlphaPixelData_Accessor" "', expected argument " "1"" of type '" "wxAlphaPixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxCursor * >(argp1);
+  arg1 = reinterpret_cast< wxAlphaPixelData_Accessor * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (long)(arg1)->GetHandle();
-    wxPyEndAllowThreads(__tstate);
+    delete arg1;
+    

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_long(static_cast< long >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Cursor_SetHandle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_AlphaPixelData_Accessor_Reset(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxCursor *arg1 = (wxCursor *) 0 ;
-  long arg2 ;
+  wxAlphaPixelData_Accessor *arg1 = (wxAlphaPixelData_Accessor *) 0 ;
+  wxAlphaPixelData *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  long val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;

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

-    (char *) "self",(char *) "handle", NULL 
+    (char *) "self",(char *) "data", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetHandle",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AlphaPixelData_Accessor_Reset",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAlphaPixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_SetHandle" "', expected argument " "1"" of type '" "wxCursor *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaPixelData_Accessor_Reset" "', expected argument " "1"" of type '" "wxAlphaPixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxCursor * >(argp1);
-  ecode2 = SWIG_AsVal_long(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Cursor_SetHandle" "', expected argument " "2"" of type '" "long""'");
-  } 
-  arg2 = static_cast< long >(val2);
+  arg1 = reinterpret_cast< wxAlphaPixelData_Accessor * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxAlphaPixelData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AlphaPixelData_Accessor_Reset" "', expected argument " "2"" of type '" "wxAlphaPixelData const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AlphaPixelData_Accessor_Reset" "', expected argument " "2"" of type '" "wxAlphaPixelData const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxAlphaPixelData * >(argp2);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxCursor_SetHandle(arg1,arg2);
-    wxPyEndAllowThreads(__tstate);
+    (arg1)->Reset((wxAlphaPixelData const &)*arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -8024,9 +8288,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Cursor_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AlphaPixelData_Accessor_IsOk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxCursor *arg1 = (wxCursor *) 0 ;
+  wxAlphaPixelData_Accessor *arg1 = (wxAlphaPixelData_Accessor *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;


@@ -8034,15 +8298,13 @@ SWIGINTERN PyObject *_wrap_Cursor_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAlphaPixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_Ok" "', expected argument " "1"" of type '" "wxCursor *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaPixelData_Accessor_IsOk" "', expected argument " "1"" of type '" "wxAlphaPixelData_Accessor const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxCursor * >(argp1);
+  arg1 = reinterpret_cast< wxAlphaPixelData_Accessor * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->Ok();
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)((wxAlphaPixelData_Accessor const *)arg1)->IsOk();

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -8054,119 +8316,175 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Cursor_GetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AlphaPixelData_Accessor_nextPixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxCursor *arg1 = (wxCursor *) 0 ;
-  int result;
+  wxAlphaPixelData_Accessor *arg1 = (wxAlphaPixelData_Accessor *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAlphaPixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_GetWidth" "', expected argument " "1"" of type '" "wxCursor *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaPixelData_Accessor_nextPixel" "', expected argument " "1"" of type '" "wxAlphaPixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxCursor * >(argp1);
+  arg1 = reinterpret_cast< wxAlphaPixelData_Accessor * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (int)(arg1)->GetWidth();
-    wxPyEndAllowThreads(__tstate);
+    wxAlphaPixelData_Accessor_nextPixel(arg1);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Cursor_GetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AlphaPixelData_Accessor_Offset(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxCursor *arg1 = (wxCursor *) 0 ;
-  int result;
+  wxAlphaPixelData_Accessor *arg1 = (wxAlphaPixelData_Accessor *) 0 ;
+  wxAlphaPixelData *arg2 = 0 ;
+  int arg3 ;
+  int arg4 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_GetHeight" "', expected argument " "1"" of type '" "wxCursor *""'"); 
-  }
-  arg1 = reinterpret_cast< wxCursor * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (int)(arg1)->GetHeight();
-    wxPyEndAllowThreads(__tstate);
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "data",(char *) "x",(char *) "y", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AlphaPixelData_Accessor_Offset",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAlphaPixelData_Accessor, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaPixelData_Accessor_Offset" "', expected argument " "1"" of type '" "wxAlphaPixelData_Accessor *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAlphaPixelData_Accessor * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxAlphaPixelData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AlphaPixelData_Accessor_Offset" "', expected argument " "2"" of type '" "wxAlphaPixelData const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AlphaPixelData_Accessor_Offset" "', expected argument " "2"" of type '" "wxAlphaPixelData const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxAlphaPixelData * >(argp2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AlphaPixelData_Accessor_Offset" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AlphaPixelData_Accessor_Offset" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  {
+    (arg1)->Offset((wxAlphaPixelData const &)*arg2,arg3,arg4);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Cursor_GetDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AlphaPixelData_Accessor_OffsetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxCursor *arg1 = (wxCursor *) 0 ;
-  int result;
+  wxAlphaPixelData_Accessor *arg1 = (wxAlphaPixelData_Accessor *) 0 ;
+  wxAlphaPixelData *arg2 = 0 ;
+  int arg3 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "data",(char *) "x", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:AlphaPixelData_Accessor_OffsetX",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAlphaPixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_GetDepth" "', expected argument " "1"" of type '" "wxCursor *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaPixelData_Accessor_OffsetX" "', expected argument " "1"" of type '" "wxAlphaPixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxCursor * >(argp1);
+  arg1 = reinterpret_cast< wxAlphaPixelData_Accessor * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxAlphaPixelData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AlphaPixelData_Accessor_OffsetX" "', expected argument " "2"" of type '" "wxAlphaPixelData const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AlphaPixelData_Accessor_OffsetX" "', expected argument " "2"" of type '" "wxAlphaPixelData const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxAlphaPixelData * >(argp2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AlphaPixelData_Accessor_OffsetX" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (int)(arg1)->GetDepth();
-    wxPyEndAllowThreads(__tstate);
+    (arg1)->OffsetX((wxAlphaPixelData const &)*arg2,arg3);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Cursor_SetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_AlphaPixelData_Accessor_OffsetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxCursor *arg1 = (wxCursor *) 0 ;
-  int arg2 ;
+  wxAlphaPixelData_Accessor *arg1 = (wxAlphaPixelData_Accessor *) 0 ;
+  wxAlphaPixelData *arg2 = 0 ;
+  int arg3 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;

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

+  PyObject * obj2 = 0 ;

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

-    (char *) "self",(char *) "w", NULL 
+    (char *) "self",(char *) "data",(char *) "y", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetWidth",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:AlphaPixelData_Accessor_OffsetY",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAlphaPixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_SetWidth" "', expected argument " "1"" of type '" "wxCursor *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaPixelData_Accessor_OffsetY" "', expected argument " "1"" of type '" "wxAlphaPixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxCursor * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Cursor_SetWidth" "', expected argument " "2"" of type '" "int""'");
+  arg1 = reinterpret_cast< wxAlphaPixelData_Accessor * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxAlphaPixelData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AlphaPixelData_Accessor_OffsetY" "', expected argument " "2"" of type '" "wxAlphaPixelData const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AlphaPixelData_Accessor_OffsetY" "', expected argument " "2"" of type '" "wxAlphaPixelData const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxAlphaPixelData * >(argp2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AlphaPixelData_Accessor_OffsetY" "', expected argument " "3"" of type '" "int""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
+  arg3 = static_cast< int >(val3);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetWidth(arg2);
-    wxPyEndAllowThreads(__tstate);
+    (arg1)->OffsetY((wxAlphaPixelData const &)*arg2,arg3);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -8176,35 +8494,54 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Cursor_SetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_AlphaPixelData_Accessor_MoveTo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxCursor *arg1 = (wxCursor *) 0 ;
-  int arg2 ;
+  wxAlphaPixelData_Accessor *arg1 = (wxAlphaPixelData_Accessor *) 0 ;
+  wxAlphaPixelData *arg2 = 0 ;
+  int arg3 ;
+  int arg4 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;

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

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

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

-    (char *) "self",(char *) "h", NULL 
+    (char *) "self",(char *) "data",(char *) "x",(char *) "y", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetHeight",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AlphaPixelData_Accessor_MoveTo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAlphaPixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_SetHeight" "', expected argument " "1"" of type '" "wxCursor *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaPixelData_Accessor_MoveTo" "', expected argument " "1"" of type '" "wxAlphaPixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxCursor * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Cursor_SetHeight" "', expected argument " "2"" of type '" "int""'");
+  arg1 = reinterpret_cast< wxAlphaPixelData_Accessor * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxAlphaPixelData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AlphaPixelData_Accessor_MoveTo" "', expected argument " "2"" of type '" "wxAlphaPixelData const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AlphaPixelData_Accessor_MoveTo" "', expected argument " "2"" of type '" "wxAlphaPixelData const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxAlphaPixelData * >(argp2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AlphaPixelData_Accessor_MoveTo" "', expected argument " "3"" of type '" "int""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AlphaPixelData_Accessor_MoveTo" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetHeight(arg2);
-    wxPyEndAllowThreads(__tstate);
+    (arg1)->MoveTo((wxAlphaPixelData const &)*arg2,arg3,arg4);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -8214,35 +8551,60 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Cursor_SetDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_AlphaPixelData_Accessor_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxCursor *arg1 = (wxCursor *) 0 ;
-  int arg2 ;
+  wxAlphaPixelData_Accessor *arg1 = (wxAlphaPixelData_Accessor *) 0 ;
+  byte arg2 ;
+  byte arg3 ;
+  byte arg4 ;
+  byte arg5 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
+  unsigned char val2 ;

   int ecode2 = 0 ;
   int ecode2 = 0 ;

+  unsigned char val3 ;
+  int ecode3 = 0 ;
+  unsigned char val4 ;
+  int ecode4 = 0 ;
+  unsigned char val5 ;
+  int ecode5 = 0 ;

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

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

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

-    (char *) "self",(char *) "d", NULL 
+    (char *) "self",(char *) "red",(char *) "green",(char *) "blue",(char *) "alpha", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetDepth",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:AlphaPixelData_Accessor_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAlphaPixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_SetDepth" "', expected argument " "1"" of type '" "wxCursor *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaPixelData_Accessor_Set" "', expected argument " "1"" of type '" "wxAlphaPixelData_Accessor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxCursor * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  arg1 = reinterpret_cast< wxAlphaPixelData_Accessor * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_char(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Cursor_SetDepth" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AlphaPixelData_Accessor_Set" "', expected argument " "2"" of type '" "byte""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
+  arg2 = static_cast< byte >(val2);
+  ecode3 = SWIG_AsVal_unsigned_SS_char(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AlphaPixelData_Accessor_Set" "', expected argument " "3"" of type '" "byte""'");
+  } 
+  arg3 = static_cast< byte >(val3);
+  ecode4 = SWIG_AsVal_unsigned_SS_char(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AlphaPixelData_Accessor_Set" "', expected argument " "4"" of type '" "byte""'");
+  } 
+  arg4 = static_cast< byte >(val4);
+  ecode5 = SWIG_AsVal_unsigned_SS_char(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AlphaPixelData_Accessor_Set" "', expected argument " "5"" of type '" "byte""'");
+  } 
+  arg5 = static_cast< byte >(val5);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetDepth(arg2);
-    wxPyEndAllowThreads(__tstate);
+    wxAlphaPixelData_Accessor_Set(arg1,arg2,arg3,arg4,arg5);

     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();


@@ -8252,265 +8614,207 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Cursor_SetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_AlphaPixelData_Accessor_Get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxCursor *arg1 = (wxCursor *) 0 ;
-  wxSize *arg2 = 0 ;
+  wxAlphaPixelData_Accessor *arg1 = (wxAlphaPixelData_Accessor *) 0 ;
+  PyObject *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "size", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetSize",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAlphaPixelData_Accessor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_SetSize" "', expected argument " "1"" of type '" "wxCursor *""'"); 
-  }
-  arg1 = reinterpret_cast< wxCursor * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaPixelData_Accessor_Get" "', expected argument " "1"" of type '" "wxAlphaPixelData_Accessor *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxAlphaPixelData_Accessor * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetSize((wxSize const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (PyObject *)wxAlphaPixelData_Accessor_Get(arg1);

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = result;

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

-SWIGINTERN PyObject *Cursor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *AlphaPixelData_Accessor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxCursor, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxAlphaPixelData_Accessor, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *Cursor_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *AlphaPixelData_Accessor_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_Region(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_Mask(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  int arg1 = (int) 0 ;
-  int arg2 = (int) 0 ;
-  int arg3 = (int) 0 ;
-  int arg4 = (int) 0 ;
-  wxRegion *result = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
+  wxBitmap *arg1 = 0 ;
+  wxColour const &arg2_defvalue = wxNullColour ;
+  wxColour *arg2 = (wxColour *) &arg2_defvalue ;
+  wxMask *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxColour temp2 ;

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

-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;

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

-    (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
+    (char *) "bitmap",(char *) "colour", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Region",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  if (obj0) {
-    ecode1 = SWIG_AsVal_int(obj0, &val1);
-    if (!SWIG_IsOK(ecode1)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Region" "', expected argument " "1"" of type '" "int""'");
-    } 
-    arg1 = static_cast< int >(val1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Mask",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Mask" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 

   }
   }

-  if (obj1) {
-    ecode2 = SWIG_AsVal_int(obj1, &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Region" "', expected argument " "2"" of type '" "int""'");
-    } 
-    arg2 = static_cast< int >(val2);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Mask" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 

   }
   }

-  if (obj2) {
-    ecode3 = SWIG_AsVal_int(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Region" "', expected argument " "3"" of type '" "int""'");
-    } 
-    arg3 = static_cast< int >(val3);
-  }
-  if (obj3) {
-    ecode4 = SWIG_AsVal_int(obj3, &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Region" "', expected argument " "4"" of type '" "int""'");
-    } 
-    arg4 = static_cast< int >(val4);
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  if (obj1) {
+    {
+      arg2 = &temp2;
+      if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+    }

   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxRegion *)new wxRegion(arg1,arg2,arg3,arg4);
+    result = (wxMask *)new_wxMask((wxBitmap const &)*arg1,(wxColour const &)*arg2);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRegion, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMask, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_new_RegionFromBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_delete_Mask(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxBitmap *arg1 = 0 ;
-  wxRegion *result = 0 ;
+  wxMask *arg1 = (wxMask *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "bmp", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_RegionFromBitmap",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMask, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RegionFromBitmap" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RegionFromBitmap" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Mask" "', expected argument " "1"" of type '" "wxMask *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  arg1 = reinterpret_cast< wxMask * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxRegion *)new wxRegion((wxBitmap const &)*arg1);
-    wxPyEndAllowThreads(__tstate);
+    delete arg1;
+    

     if (PyErr_Occurred()) SWIG_fail;
   }
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRegion, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_new_RegionFromBitmapColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *Mask_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxMask, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *Mask_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Icon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxBitmap *arg1 = 0 ;
-  wxColour *arg2 = 0 ;
-  int arg3 = (int) 0 ;
-  wxRegion *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  wxColour temp2 ;
+  wxString *arg1 = 0 ;
+  wxBitmapType arg2 ;
+  int arg3 = (int) -1 ;
+  int arg4 = (int) -1 ;
+  wxIcon *result = 0 ;
+  bool temp1 = false ;
+  int val2 ;
+  int ecode2 = 0 ;

   int val3 ;
   int ecode3 = 0 ;
   int val3 ;
   int ecode3 = 0 ;

+  int val4 ;
+  int ecode4 = 0 ;

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

+  PyObject * obj3 = 0 ;

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

-    (char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL 
+    (char *) "name",(char *) "type",(char *) "desiredWidth",(char *) "desiredHeight", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_RegionFromBitmapColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0  | 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RegionFromBitmapColour" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RegionFromBitmapColour" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 
-  }
-  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_Icon",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+    arg1 = wxString_in_helper(obj0);
+    if (arg1 == NULL) SWIG_fail;
+    temp1 = true;

   }
   }

+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Icon" "', expected argument " "2"" of type '" "wxBitmapType""'");
+  } 
+  arg2 = static_cast< wxBitmapType >(val2);

   if (obj2) {
     ecode3 = SWIG_AsVal_int(obj2, &val3);
     if (!SWIG_IsOK(ecode3)) {
   if (obj2) {
     ecode3 = SWIG_AsVal_int(obj2, &val3);
     if (!SWIG_IsOK(ecode3)) {

-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_RegionFromBitmapColour" "', expected argument " "3"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Icon" "', expected argument " "3"" of type '" "int""'");

     } 
     arg3 = static_cast< int >(val3);
   }
     } 
     arg3 = static_cast< int >(val3);
   }

-  {
-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxRegion *)new wxRegion((wxBitmap const &)*arg1,(wxColour const &)*arg2,arg3);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRegion, SWIG_POINTER_OWN |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_RegionFromPoints(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  int arg1 ;
-  wxPoint *arg2 = (wxPoint *) 0 ;
-  int arg3 = (int) wxWINDING_RULE ;
-  wxRegion *result = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "points",(char *) "fillStyle", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_RegionFromPoints",kwnames,&obj0,&obj1)) SWIG_fail;
-  {
-    arg2 = wxPoint_LIST_helper(obj0, &arg1);
-    if (arg2 == NULL) SWIG_fail;
-  }
-  if (obj1) {
-    ecode3 = SWIG_AsVal_int(obj1, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_RegionFromPoints" "', expected argument " "3"" of type '" "int""'");
+  if (obj3) {
+    ecode4 = SWIG_AsVal_int(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Icon" "', expected argument " "4"" of type '" "int""'");

     } 
     } 

-    arg3 = static_cast< int >(val3);
+    arg4 = static_cast< int >(val4);

   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxRegion *)new wxRegion(arg1,arg2,arg3);
+    result = (wxIcon *)new wxIcon((wxString const &)*arg1,arg2,arg3,arg4);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRegion, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIcon, SWIG_POINTER_NEW |  0 );

   {
   {

-    if (arg2) delete [] arg2;
+    if (temp1)
+    delete arg1;

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

-    if (arg2) delete [] arg2;
+    if (temp1)
+    delete arg1;

   }
   return NULL;
 }
 
 
   }
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_Region(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Icon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxIcon *arg1 = (wxIcon *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegion, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIcon, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Region" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Icon" "', expected argument " "1"" of type '" "wxIcon *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  arg1 = reinterpret_cast< wxIcon * >(argp1);

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


@@ -8525,394 +8829,259 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Region_Clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_EmptyIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  wxIcon *result = 0 ;

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Clear" "', expected argument " "1"" of type '" "wxRegion *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  if (!SWIG_Python_UnpackTuple(args,"new_EmptyIcon",0,0,0)) SWIG_fail;

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    (arg1)->Clear();
+    result = (wxIcon *)new wxIcon();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIcon, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_Region_Offset(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_IconFromLocation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  bool result;
+  wxIconLocation *arg1 = 0 ;
+  wxIcon *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;

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

-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;

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

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

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Region_Offset",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconFromLocation",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxIconLocation,  0  | 0);

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Offset" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_IconFromLocation" "', expected argument " "1"" of type '" "wxIconLocation const &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_Offset" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_Offset" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_IconFromLocation" "', expected argument " "1"" of type '" "wxIconLocation const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxIconLocation * >(argp1);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (bool)(arg1)->Offset(arg2,arg3);
+    result = (wxIcon *)new wxIcon((wxIconLocation const &)*arg1);

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIcon, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_Region_Contains(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_IconFromBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  wxRegionContain result;
+  wxBitmap *arg1 = 0 ;
+  wxIcon *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;

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

-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;

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

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

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Region_Contains",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconFromBitmap",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0  | 0);

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Contains" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_IconFromBitmap" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_Contains" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_Contains" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxRegionContain)(arg1)->Contains(arg2,arg3);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Region_ContainsPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxPoint *arg2 = 0 ;
-  wxRegionContain result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  wxPoint temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "pt", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_ContainsPoint",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_ContainsPoint" "', expected argument " "1"" of type '" "wxRegion *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_IconFromBitmap" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxBitmap * >(argp1);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxRegionContain)(arg1)->Contains((wxPoint const &)*arg2);
+    result = (wxIcon *)new_wxIcon((wxBitmap const &)*arg1);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIcon, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_Region_ContainsRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_IconFromXPMData(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxRect *arg2 = 0 ;
-  wxRegionContain result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  wxRect temp2 ;
+  PyObject *arg1 = (PyObject *) 0 ;
+  wxIcon *result = 0 ;

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

-  PyObject * obj1 = 0 ;

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

-    (char *) "self",(char *) "rect", NULL 
+    (char *) "listOfStrings", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_ContainsRect",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_ContainsRect" "', expected argument " "1"" of type '" "wxRegion *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
-  }
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconFromXPMData",kwnames,&obj0)) SWIG_fail;
+  arg1 = obj0;

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxRegionContain)(arg1)->Contains((wxRect const &)*arg2);
+    result = (wxIcon *)new_wxIcon(arg1);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIcon, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_Region_ContainsRectDim(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Icon_LoadFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  wxRegionContain result;
+  wxIcon *arg1 = (wxIcon *) 0 ;
+  wxString *arg2 = 0 ;
+  wxBitmapType arg3 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
+  bool temp2 = false ;

   int val3 ;
   int ecode3 = 0 ;
   int val3 ;
   int ecode3 = 0 ;

-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;

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

-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;

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

-    (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
+    (char *) "self",(char *) "name",(char *) "type", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_ContainsRectDim",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Icon_LoadFile",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_ContainsRectDim" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_LoadFile" "', expected argument " "1"" of type '" "wxIcon *""'"); 
+  }
+  arg1 = reinterpret_cast< wxIcon * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_ContainsRectDim" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);

   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_ContainsRectDim" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Region_ContainsRectDim" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
-  ecode5 = SWIG_AsVal_int(obj4, &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Region_ContainsRectDim" "', expected argument " "5"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Icon_LoadFile" "', expected argument " "3"" of type '" "wxBitmapType""'");

   } 
   } 

-  arg5 = static_cast< int >(val5);
+  arg3 = static_cast< wxBitmapType >(val3);

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

-    result = (wxRegionContain)(arg1)->Contains(arg2,arg3,arg4,arg5);
+    result = (bool)(arg1)->LoadFile((wxString const &)*arg2,arg3);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp2)
+    delete arg2;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Region_GetBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Icon_GetHandle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxRect result;
+  wxIcon *arg1 = (wxIcon *) 0 ;
+  long result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_GetBox" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_GetHandle" "', expected argument " "1"" of type '" "wxIcon *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  arg1 = reinterpret_cast< wxIcon * >(argp1);

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

-    result = (arg1)->GetBox();
+    result = (long)(arg1)->GetHandle();

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

-  resultobj = SWIG_NewPointerObj((new wxRect(static_cast< const wxRect& >(result))), SWIGTYPE_p_wxRect, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_From_long(static_cast< long >(result));

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

-SWIGINTERN PyObject *_wrap_Region_Intersect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Icon_SetHandle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  bool result;
+  wxIcon *arg1 = (wxIcon *) 0 ;
+  long arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
+  long val2 ;

   int ecode2 = 0 ;
   int ecode2 = 0 ;

-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;

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

-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;

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

-    (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
+    (char *) "self",(char *) "handle", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Intersect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetHandle",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Intersect" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_SetHandle" "', expected argument " "1"" of type '" "wxIcon *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  arg1 = reinterpret_cast< wxIcon * >(argp1);
+  ecode2 = SWIG_AsVal_long(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_Intersect" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_Intersect" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Region_Intersect" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
-  ecode5 = SWIG_AsVal_int(obj4, &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Region_Intersect" "', expected argument " "5"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Icon_SetHandle" "', expected argument " "2"" of type '" "long""'");

   } 
   } 

-  arg5 = static_cast< int >(val5);
+  arg2 = static_cast< long >(val2);

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

-    result = (bool)(arg1)->Intersect(arg2,arg3,arg4,arg5);
+    wxIcon_SetHandle(arg1,arg2);

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

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

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

-SWIGINTERN PyObject *_wrap_Region_IntersectRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Icon_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxRect *arg2 = 0 ;
+  wxIcon *arg1 = (wxIcon *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRect temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "rect", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_IntersectRect",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_IntersectRect" "', expected argument " "1"" of type '" "wxRegion *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_Ok" "', expected argument " "1"" of type '" "wxIcon *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxIcon * >(argp1);

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

-    result = (bool)(arg1)->Intersect((wxRect const &)*arg2);
+    result = (bool)(arg1)->Ok();

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


@@ -8925,343 +9094,244 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Region_IntersectRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Icon_GetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxRegion *arg2 = 0 ;
-  bool result;
+  wxIcon *arg1 = (wxIcon *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "region", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_IntersectRegion",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_IntersectRegion" "', expected argument " "1"" of type '" "wxRegion *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Region_IntersectRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Region_IntersectRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_GetWidth" "', expected argument " "1"" of type '" "wxIcon *""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxRegion * >(argp2);
+  arg1 = reinterpret_cast< wxIcon * >(argp1);

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

-    result = (bool)(arg1)->Intersect((wxRegion const &)*arg2);
+    result = (int)(arg1)->GetWidth();

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_Region_IsEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Icon_GetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  bool result;
+  wxIcon *arg1 = (wxIcon *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_IsEmpty" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_GetHeight" "', expected argument " "1"" of type '" "wxIcon *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  arg1 = reinterpret_cast< wxIcon * >(argp1);

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

-    result = (bool)(arg1)->IsEmpty();
+    result = (int)(arg1)->GetHeight();

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_Region_Union(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Icon_GetDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  bool result;
+  wxIcon *arg1 = (wxIcon *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Union",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Union" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_GetDepth" "', expected argument " "1"" of type '" "wxIcon *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_Union" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_Union" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Region_Union" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
-  ecode5 = SWIG_AsVal_int(obj4, &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Region_Union" "', expected argument " "5"" of type '" "int""'");
-  } 
-  arg5 = static_cast< int >(val5);
+  arg1 = reinterpret_cast< wxIcon * >(argp1);

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

-    result = (bool)(arg1)->Union(arg2,arg3,arg4,arg5);
+    result = (int)(arg1)->GetDepth();

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_Region_UnionRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Icon_SetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxRect *arg2 = 0 ;
-  bool result;
+  wxIcon *arg1 = (wxIcon *) 0 ;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRect temp2 ;
+  int val2 ;
+  int ecode2 = 0 ;

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

-    (char *) "self",(char *) "rect", NULL 
+    (char *) "self",(char *) "w", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_UnionRect",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetWidth",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_UnionRect" "', expected argument " "1"" of type '" "wxRegion *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_SetWidth" "', expected argument " "1"" of type '" "wxIcon *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxIcon * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Icon_SetWidth" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

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

-    result = (bool)(arg1)->Union((wxRect const &)*arg2);
+    (arg1)->SetWidth(arg2);

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

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

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

-SWIGINTERN PyObject *_wrap_Region_UnionRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Icon_SetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxRegion *arg2 = 0 ;
-  bool result;
+  wxIcon *arg1 = (wxIcon *) 0 ;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;

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

-    (char *) "self",(char *) "region", NULL 
+    (char *) "self",(char *) "h", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_UnionRegion",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetHeight",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_UnionRegion" "', expected argument " "1"" of type '" "wxRegion *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Region_UnionRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Region_UnionRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_SetHeight" "', expected argument " "1"" of type '" "wxIcon *""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxRegion * >(argp2);
+  arg1 = reinterpret_cast< wxIcon * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Icon_SetHeight" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

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

-    result = (bool)(arg1)->Union((wxRegion const &)*arg2);
+    (arg1)->SetHeight(arg2);

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

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

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

-SWIGINTERN PyObject *_wrap_Region_Subtract(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Icon_SetDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxIcon *arg1 = (wxIcon *) 0 ;

   int arg2 ;
   int arg2 ;

-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;

-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;

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

-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;

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

-    (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
+    (char *) "self",(char *) "d", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Subtract",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetDepth",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Subtract" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_SetDepth" "', expected argument " "1"" of type '" "wxIcon *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  arg1 = reinterpret_cast< wxIcon * >(argp1);

   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_Subtract" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Icon_SetDepth" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   } 
   arg2 = static_cast< int >(val2);

-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_Subtract" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Region_Subtract" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
-  ecode5 = SWIG_AsVal_int(obj4, &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Region_Subtract" "', expected argument " "5"" of type '" "int""'");
-  } 
-  arg5 = static_cast< int >(val5);

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

-    result = (bool)(arg1)->Subtract(arg2,arg3,arg4,arg5);
+    (arg1)->SetDepth(arg2);

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

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

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

-SWIGINTERN PyObject *_wrap_Region_SubtractRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Icon_SetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxRect *arg2 = 0 ;
-  bool result;
+  wxIcon *arg1 = (wxIcon *) 0 ;
+  wxSize *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRect temp2 ;
+  wxSize temp2 ;

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

-    (char *) "self",(char *) "rect", NULL 
+    (char *) "self",(char *) "size", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_SubtractRect",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetSize",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_SubtractRect" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_SetSize" "', expected argument " "1"" of type '" "wxIcon *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  arg1 = reinterpret_cast< wxIcon * >(argp1);

   {
     arg2 = &temp2;
   {
     arg2 = &temp2;

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

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

-    result = (bool)(arg1)->Subtract((wxRect const &)*arg2);
+    (arg1)->SetSize((wxSize const &)*arg2);

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

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

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

-SWIGINTERN PyObject *_wrap_Region_SubtractRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Icon_CopyFromBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxRegion *arg2 = 0 ;
-  bool result;
+  wxIcon *arg1 = (wxIcon *) 0 ;
+  wxBitmap *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;


@@ -9269,133 +9339,143 @@ SWIGINTERN PyObject *_wrap_Region_SubtractRegion(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "region", NULL 
+    (char *) "self",(char *) "bmp", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_SubtractRegion",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_CopyFromBitmap",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIcon, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_SubtractRegion" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Icon_CopyFromBitmap" "', expected argument " "1"" of type '" "wxIcon *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion,  0  | 0);
+  arg1 = reinterpret_cast< wxIcon * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);

   if (!SWIG_IsOK(res2)) {
   if (!SWIG_IsOK(res2)) {

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Region_SubtractRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Icon_CopyFromBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 

   }
   if (!argp2) {
   }
   if (!argp2) {

-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Region_SubtractRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Icon_CopyFromBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxRegion * >(argp2);
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);

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

-    result = (bool)(arg1)->Subtract((wxRegion const &)*arg2);
+    (arg1)->CopyFromBitmap((wxBitmap const &)*arg2);

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

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

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

-SWIGINTERN PyObject *_wrap_Region_Xor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *Icon_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxIcon, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *Icon_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_IconLocation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  bool result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+  wxString *arg1 = (wxString *) &wxPyEmptyString ;
+  int arg2 = (int) 0 ;
+  wxIconLocation *result = 0 ;
+  bool temp1 = false ;

   int val2 ;
   int ecode2 = 0 ;
   int val2 ;
   int ecode2 = 0 ;

-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;

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

-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;

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

-    (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
+    (char *) "filename",(char *) "num", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Xor",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Xor" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_IconLocation",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (obj0) {
+    {
+      arg1 = wxString_in_helper(obj0);
+      if (arg1 == NULL) SWIG_fail;
+      temp1 = true;
+    }
+  }
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_IconLocation" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_Xor" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_Xor" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Region_Xor" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
-  ecode5 = SWIG_AsVal_int(obj4, &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Region_Xor" "', expected argument " "5"" of type '" "int""'");
-  } 
-  arg5 = static_cast< int >(val5);

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

-    result = (bool)(arg1)->Xor(arg2,arg3,arg4,arg5);
+    result = (wxIconLocation *)new_wxIconLocation((wxString const *)arg1,arg2);

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

+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIconLocation, SWIG_POINTER_NEW |  0 );

   {
   {

-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    if (temp1)
+    delete arg1;

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

+  {
+    if (temp1)
+    delete arg1;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Region_XorRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_delete_IconLocation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxRect *arg2 = 0 ;
-  bool result;
+  wxIconLocation *arg1 = (wxIconLocation *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRect temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "rect", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_XorRect",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIconLocation, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_XorRect" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IconLocation" "', expected argument " "1"" of type '" "wxIconLocation *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  arg1 = reinterpret_cast< wxIconLocation * >(argp1);

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_IconLocation_IsOk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxIconLocation *arg1 = (wxIconLocation *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIconLocation, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconLocation_IsOk" "', expected argument " "1"" of type '" "wxIconLocation const *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxIconLocation * >(argp1);

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

-    result = (bool)(arg1)->Xor((wxRect const &)*arg2);
+    result = (bool)((wxIconLocation const *)arg1)->IsOk();

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


@@ -9408,695 +9488,756 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Region_XorRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_IconLocation_SetFileName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxRegion *arg2 = 0 ;
-  bool result;
+  wxIconLocation *arg1 = (wxIconLocation *) 0 ;
+  wxString *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  bool temp2 = false ;

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

-    (char *) "self",(char *) "region", NULL 
+    (char *) "self",(char *) "filename", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_XorRegion",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconLocation_SetFileName",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIconLocation, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_XorRegion" "', expected argument " "1"" of type '" "wxRegion *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Region_XorRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconLocation_SetFileName" "', expected argument " "1"" of type '" "wxIconLocation *""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Region_XorRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+  arg1 = reinterpret_cast< wxIconLocation * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;

   }
   }

-  arg2 = reinterpret_cast< wxRegion * >(argp2);

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

-    result = (bool)(arg1)->Xor((wxRegion const &)*arg2);
+    (arg1)->SetFileName((wxString const &)*arg2);

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

+  resultobj = SWIG_Py_Void();

   {
   {

-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    if (temp2)
+    delete arg2;

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

+  {
+    if (temp2)
+    delete arg2;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Region_ConvertToBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IconLocation_GetFileName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  SwigValueWrapper<wxBitmap > result;
+  wxIconLocation *arg1 = (wxIconLocation *) 0 ;
+  wxString *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIconLocation, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_ConvertToBitmap" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconLocation_GetFileName" "', expected argument " "1"" of type '" "wxIconLocation const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  arg1 = reinterpret_cast< wxIconLocation * >(argp1);

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

-    result = (arg1)->ConvertToBitmap();
+    {
+      wxString const &_result_ref = ((wxIconLocation const *)arg1)->GetFileName();
+      result = (wxString *) &_result_ref;
+    }

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

-  resultobj = SWIG_NewPointerObj((new wxBitmap(static_cast< const wxBitmap& >(result))), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN |  0 );
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
+#else
+    resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
+#endif
+  }

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

-SWIGINTERN PyObject *_wrap_Region_UnionBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_IconLocation_SetIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxBitmap *arg2 = 0 ;
-  bool result;
+  wxIconLocation *arg1 = (wxIconLocation *) 0 ;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;

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

-    (char *) "self",(char *) "bmp", NULL 
+    (char *) "self",(char *) "num", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_UnionBitmap",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconLocation_SetIndex",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIconLocation, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_UnionBitmap" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconLocation_SetIndex" "', expected argument " "1"" of type '" "wxIconLocation *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Region_UnionBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Region_UnionBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
-  }
-  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  arg1 = reinterpret_cast< wxIconLocation * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IconLocation_SetIndex" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

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

-    result = (bool)(arg1)->Union((wxBitmap const &)*arg2);
+    wxIconLocation_SetIndex(arg1,arg2);

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

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

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

-SWIGINTERN PyObject *_wrap_Region_UnionBitmapColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_IconLocation_GetIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = (wxRegion *) 0 ;
-  wxBitmap *arg2 = 0 ;
-  wxColour *arg3 = 0 ;
-  int arg4 = (int) 0 ;
-  bool result;
+  wxIconLocation *arg1 = (wxIconLocation *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  wxColour temp3 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Region_UnionBitmapColour",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIconLocation, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_UnionBitmapColour" "', expected argument " "1"" of type '" "wxRegion *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRegion * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Region_UnionBitmapColour" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Region_UnionBitmapColour" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
-  }
-  arg2 = reinterpret_cast< wxBitmap * >(argp2);
-  {
-    arg3 = &temp3;
-    if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
-  }
-  if (obj3) {
-    ecode4 = SWIG_AsVal_int(obj3, &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Region_UnionBitmapColour" "', expected argument " "4"" of type '" "int""'");
-    } 
-    arg4 = static_cast< int >(val4);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconLocation_GetIndex" "', expected argument " "1"" of type '" "wxIconLocation *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxIconLocation * >(argp1);

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

-    result = (bool)(arg1)->Union((wxBitmap const &)*arg2,(wxColour const &)*arg3,arg4);
+    result = (int)wxIconLocation_GetIndex(arg1);

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *Region_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *IconLocation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxRegion, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxIconLocation, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *Region_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *IconLocation_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_RegionIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_IconBundle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegion *arg1 = 0 ;
-  wxRegionIterator *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "region", NULL 
-  };
+  wxIconBundle *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_RegionIterator",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxRegion,  0  | 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RegionIterator" "', expected argument " "1"" of type '" "wxRegion const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RegionIterator" "', expected argument " "1"" of type '" "wxRegion const &""'"); 
-  }
-  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  if (!SWIG_Python_UnpackTuple(args,"new_IconBundle",0,0,0)) SWIG_fail;

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxRegionIterator *)new wxRegionIterator((wxRegion const &)*arg1);
+    result = (wxIconBundle *)new wxIconBundle();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRegionIterator, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIconBundle, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_delete_RegionIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IconBundleFromFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  wxString *arg1 = 0 ;
+  long arg2 ;
+  wxIconBundle *result = 0 ;
+  bool temp1 = false ;
+  long val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "file",(char *) "type", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RegionIterator" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_IconBundleFromFile",kwnames,&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = wxString_in_helper(obj0);
+    if (arg1 == NULL) SWIG_fail;
+    temp1 = true;

   }
   }

-  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);
+  ecode2 = SWIG_AsVal_long(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_IconBundleFromFile" "', expected argument " "2"" of type '" "long""'");
+  } 
+  arg2 = static_cast< long >(val2);

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

-    delete arg1;
-    
+    result = (wxIconBundle *)new wxIconBundle((wxString const &)*arg1,arg2);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIconBundle, SWIG_POINTER_OWN |  0 );
+  {
+    if (temp1)
+    delete arg1;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp1)
+    delete arg1;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_RegionIterator_GetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IconBundleFromIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-  int result;
+  wxIcon *arg1 = 0 ;
+  wxIconBundle *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "icon", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_IconBundleFromIcon",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxIcon,  0  | 0);

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetX" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_IconBundleFromIcon" "', expected argument " "1"" of type '" "wxIcon const &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_IconBundleFromIcon" "', expected argument " "1"" of type '" "wxIcon const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxIcon * >(argp1);

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

-    result = (int)(arg1)->GetX();
+    result = (wxIconBundle *)new wxIconBundle((wxIcon const &)*arg1);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxIconBundle, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_RegionIterator_GetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_IconBundle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-  int result;
+  wxIconBundle *arg1 = (wxIconBundle *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxIconBundle, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetY" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IconBundle" "', expected argument " "1"" of type '" "wxIconBundle *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);
+  arg1 = reinterpret_cast< wxIconBundle * >(argp1);

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

-    result = (int)(arg1)->GetY();
+    delete arg1;
+    

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_RegionIterator_GetW(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IconBundle_AddIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-  int result;
+  wxIconBundle *arg1 = (wxIconBundle *) 0 ;
+  wxIcon *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "icon", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconBundle_AddIcon",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIconBundle, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetW" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconBundle_AddIcon" "', expected argument " "1"" of type '" "wxIconBundle *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);
+  arg1 = reinterpret_cast< wxIconBundle * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxIcon,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IconBundle_AddIcon" "', expected argument " "2"" of type '" "wxIcon const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IconBundle_AddIcon" "', expected argument " "2"" of type '" "wxIcon const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxIcon * >(argp2);

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

-    result = (int)(arg1)->GetW();
+    (arg1)->AddIcon((wxIcon const &)*arg2);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_RegionIterator_GetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-  int result;
+  wxIconBundle *arg1 = (wxIconBundle *) 0 ;
+  wxString *arg2 = 0 ;
+  long arg3 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool temp2 = false ;
+  long val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "file",(char *) "type", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:IconBundle_AddIconFromFile",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIconBundle, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetWidth" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconBundle_AddIconFromFile" "', expected argument " "1"" of type '" "wxIconBundle *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);
+  arg1 = reinterpret_cast< wxIconBundle * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  ecode3 = SWIG_AsVal_long(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IconBundle_AddIconFromFile" "', expected argument " "3"" of type '" "long""'");
+  } 
+  arg3 = static_cast< long >(val3);

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

-    result = (int)(arg1)->GetWidth();
+    (arg1)->AddIcon((wxString const &)*arg2,arg3);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();
+  {
+    if (temp2)
+    delete arg2;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp2)
+    delete arg2;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_RegionIterator_GetH(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IconBundle_GetIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-  int result;
+  wxIconBundle *arg1 = (wxIconBundle *) 0 ;
+  wxSize *arg2 = 0 ;
+  wxIcon *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  wxSize temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "size", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconBundle_GetIcon",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxIconBundle, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetH" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IconBundle_GetIcon" "', expected argument " "1"" of type '" "wxIconBundle const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxIconBundle * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;

   }
   }

-  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

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

-    result = (int)(arg1)->GetH();
+    {
+      wxIcon const &_result_ref = ((wxIconBundle const *)arg1)->GetIcon((wxSize const &)*arg2);
+      result = (wxIcon *) &_result_ref;
+    }

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  {
+    wxIcon* resultptr = new wxIcon(*result);
+    resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxIcon, 1);
+  }

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

-SWIGINTERN PyObject *_wrap_RegionIterator_GetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *IconBundle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxIconBundle, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *IconBundle_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Cursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  wxString *arg1 = 0 ;
+  long arg2 ;
+  int arg3 = (int) 0 ;
+  int arg4 = (int) 0 ;
+  wxCursor *result = 0 ;
+  bool temp1 = false ;
+  long val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "cursorName",(char *) "type",(char *) "hotSpotX",(char *) "hotSpotY", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetHeight" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_Cursor",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = wxString_in_helper(obj0);
+    if (arg1 == NULL) SWIG_fail;
+    temp1 = true;
+  }
+  ecode2 = SWIG_AsVal_long(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Cursor" "', expected argument " "2"" of type '" "long""'");
+  } 
+  arg2 = static_cast< long >(val2);
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Cursor" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }
+  if (obj3) {
+    ecode4 = SWIG_AsVal_int(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Cursor" "', expected argument " "4"" of type '" "int""'");
+    } 
+    arg4 = static_cast< int >(val4);

   }
   }

-  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (int)(arg1)->GetHeight();
+    result = (wxCursor *)new_wxCursor((wxString const &)*arg1,arg2,arg3,arg4);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxCursor, SWIG_POINTER_NEW |  0 );
+  {
+    if (temp1)
+    delete arg1;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp1)
+    delete arg1;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_RegionIterator_GetRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Cursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-  wxRect result;
+  wxCursor *arg1 = (wxCursor *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxCursor, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetRect" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Cursor" "', expected argument " "1"" of type '" "wxCursor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);
+  arg1 = reinterpret_cast< wxCursor * >(argp1);

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

-    result = (arg1)->GetRect();
+    delete arg1;
+    

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

-  resultobj = SWIG_NewPointerObj((new wxRect(static_cast< const wxRect& >(result))), SWIGTYPE_p_wxRect, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_RegionIterator_HaveRects(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_StockCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-  bool result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  int arg1 ;
+  wxCursor *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "id", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_HaveRects" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_StockCursor",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_StockCursor" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (bool)(arg1)->HaveRects();
+    result = (wxCursor *)new wxCursor(arg1);

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxCursor, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_RegionIterator_Reset(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_CursorFromImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
+  wxImage *arg1 = 0 ;
+  wxCursor *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "image", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_CursorFromImage",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxImage,  0  | 0);

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_Reset" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CursorFromImage" "', expected argument " "1"" of type '" "wxImage const &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CursorFromImage" "', expected argument " "1"" of type '" "wxImage const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxImage * >(argp1);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    (arg1)->Reset();
+    result = (wxCursor *)new wxCursor((wxImage const &)*arg1);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxCursor, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_RegionIterator_Next(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Cursor_GetHandle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
+  wxCursor *arg1 = (wxCursor *) 0 ;
+  long result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_Next" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_GetHandle" "', expected argument " "1"" of type '" "wxCursor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);
+  arg1 = reinterpret_cast< wxCursor * >(argp1);

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

-    wxRegionIterator_Next(arg1);
+    result = (long)(arg1)->GetHandle();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_long(static_cast< long >(result));

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

-SWIGINTERN PyObject *_wrap_RegionIterator___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Cursor_SetHandle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-  bool result;
+  wxCursor *arg1 = (wxCursor *) 0 ;
+  long arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  long val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "handle", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetHandle",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator___nonzero__" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_SetHandle" "', expected argument " "1"" of type '" "wxCursor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)wxRegionIterator___nonzero__(arg1);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *RegionIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxRegionIterator, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *RegionIterator_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_NativeFontInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxNativeFontInfo *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"new_NativeFontInfo",0,0,0)) SWIG_fail;
+  arg1 = reinterpret_cast< wxCursor * >(argp1);
+  ecode2 = SWIG_AsVal_long(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Cursor_SetHandle" "', expected argument " "2"" of type '" "long""'");
+  } 
+  arg2 = static_cast< long >(val2);

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

-    result = (wxNativeFontInfo *)new wxNativeFontInfo();
+    wxCursor_SetHandle(arg1,arg2);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativeFontInfo, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_delete_NativeFontInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Cursor_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxCursor *arg1 = (wxCursor *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_NativeFontInfo" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_Ok" "', expected argument " "1"" of type '" "wxCursor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  arg1 = reinterpret_cast< wxCursor * >(argp1);

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

-    delete arg1;
-    
+    result = (bool)(arg1)->Ok();

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

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

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_Init(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Cursor_GetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxCursor *arg1 = (wxCursor *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_Init" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_GetWidth" "', expected argument " "1"" of type '" "wxCursor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  arg1 = reinterpret_cast< wxCursor * >(argp1);

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

-    (arg1)->Init();
+    result = (int)(arg1)->GetWidth();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_InitFromFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Cursor_GetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxFont *arg2 = 0 ;
+  wxCursor *arg1 = (wxCursor *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "font", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_InitFromFont",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_InitFromFont" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
-  }
-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NativeFontInfo_InitFromFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NativeFontInfo_InitFromFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_GetHeight" "', expected argument " "1"" of type '" "wxCursor *""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  arg1 = reinterpret_cast< wxCursor * >(argp1);

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

-    (arg1)->InitFromFont((wxFont const &)*arg2);
+    result = (int)(arg1)->GetHeight();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_GetPointSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Cursor_GetDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxCursor *arg1 = (wxCursor *) 0 ;

   int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int result;
   void *argp1 = 0 ;
   int res1 = 0 ;


@@ -10104,14 +10245,14 @@ SWIGINTERN PyObject *_wrap_NativeFontInfo_GetPointSize(PyObject *SWIGUNUSEDPARM(
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetPointSize" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_GetDepth" "', expected argument " "1"" of type '" "wxCursor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  arg1 = reinterpret_cast< wxCursor * >(argp1);

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

-    result = (int)((wxNativeFontInfo const *)arg1)->GetPointSize();
+    result = (int)(arg1)->GetDepth();

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


@@ -10122,312 +10263,383 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_NativeFontInfo_GetPixelSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Cursor_SetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxSize result;
+  wxCursor *arg1 = (wxCursor *) 0 ;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "w", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetWidth",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetPixelSize" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_SetWidth" "', expected argument " "1"" of type '" "wxCursor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  arg1 = reinterpret_cast< wxCursor * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Cursor_SetWidth" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

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

-    result = ((wxNativeFontInfo const *)arg1)->GetPixelSize();
+    (arg1)->SetWidth(arg2);

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

-  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_GetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Cursor_SetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxFontStyle result;
+  wxCursor *arg1 = (wxCursor *) 0 ;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "h", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetHeight",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetStyle" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_SetHeight" "', expected argument " "1"" of type '" "wxCursor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  arg1 = reinterpret_cast< wxCursor * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Cursor_SetHeight" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

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

-    result = (wxFontStyle)((wxNativeFontInfo const *)arg1)->GetStyle();
+    (arg1)->SetHeight(arg2);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_GetWeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Cursor_SetDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxFontWeight result;
+  wxCursor *arg1 = (wxCursor *) 0 ;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "d", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetDepth",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetWeight" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_SetDepth" "', expected argument " "1"" of type '" "wxCursor *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  arg1 = reinterpret_cast< wxCursor * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Cursor_SetDepth" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

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

-    result = (wxFontWeight)((wxNativeFontInfo const *)arg1)->GetWeight();
+    (arg1)->SetDepth(arg2);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_GetUnderlined(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Cursor_SetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  bool result;
+  wxCursor *arg1 = (wxCursor *) 0 ;
+  wxSize *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  wxSize temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "size", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetSize",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxCursor, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetUnderlined" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Cursor_SetSize" "', expected argument " "1"" of type '" "wxCursor *""'"); 
+  }
+  arg1 = reinterpret_cast< wxCursor * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

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

-    result = (bool)((wxNativeFontInfo const *)arg1)->GetUnderlined();
+    (arg1)->SetSize((wxSize const &)*arg2);

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

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

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_GetFaceName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxString result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetFaceName" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = ((wxNativeFontInfo const *)arg1)->GetFaceName();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-  }
-  return resultobj;
-fail:
-  return NULL;
+SWIGINTERN PyObject *Cursor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxCursor, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();

 }
 
 }
 

+SWIGINTERN PyObject *Cursor_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}

 
 

-SWIGINTERN PyObject *_wrap_NativeFontInfo_GetFamily(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Region(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxFontFamily result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  int arg1 = (int) 0 ;
+  int arg2 = (int) 0 ;
+  int arg3 = (int) 0 ;
+  int arg4 = (int) 0 ;
+  wxRegion *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetFamily" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Region",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (obj0) {
+    ecode1 = SWIG_AsVal_int(obj0, &val1);
+    if (!SWIG_IsOK(ecode1)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Region" "', expected argument " "1"" of type '" "int""'");
+    } 
+    arg1 = static_cast< int >(val1);
+  }
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Region" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Region" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }
+  if (obj3) {
+    ecode4 = SWIG_AsVal_int(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Region" "', expected argument " "4"" of type '" "int""'");
+    } 
+    arg4 = static_cast< int >(val4);

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxFontFamily)((wxNativeFontInfo const *)arg1)->GetFamily();
+    result = (wxRegion *)new wxRegion(arg1,arg2,arg3,arg4);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRegion, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_GetEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RegionFromBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxFontEncoding result;
+  wxBitmap *arg1 = 0 ;
+  wxRegion *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "bmp", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_RegionFromBitmap",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0  | 0);

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetEncoding" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RegionFromBitmap" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RegionFromBitmap" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxFontEncoding)((wxNativeFontInfo const *)arg1)->GetEncoding();
+    result = (wxRegion *)new wxRegion((wxBitmap const &)*arg1);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRegion, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_SetPointSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_RegionFromBitmapColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  int arg2 ;
+  wxBitmap *arg1 = 0 ;
+  wxColour *arg2 = 0 ;
+  int arg3 = (int) 0 ;
+  wxRegion *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
+  wxColour temp2 ;
+  int val3 ;
+  int ecode3 = 0 ;

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

+  PyObject * obj2 = 0 ;

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

-    (char *) "self",(char *) "pointsize", NULL 
+    (char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetPointSize",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_RegionFromBitmapColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0  | 0);

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetPointSize" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RegionFromBitmapColour" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RegionFromBitmapColour" "', expected argument " "1"" of type '" "wxBitmap const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+  }
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_RegionFromBitmapColour" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeFontInfo_SetPointSize" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    (arg1)->SetPointSize(arg2);
+    result = (wxRegion *)new wxRegion((wxBitmap const &)*arg1,(wxColour const &)*arg2,arg3);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRegion, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_SetPixelSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_RegionFromPoints(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxSize *arg2 = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  wxSize temp2 ;
+  int arg1 ;
+  wxPoint *arg2 = (wxPoint *) 0 ;
+  int arg3 = (int) wxWINDING_RULE ;
+  wxRegion *result = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;

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

-    (char *) "self",(char *) "pixelSize", NULL 
+    (char *) "points",(char *) "fillStyle", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetPixelSize",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetPixelSize" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
-  }
-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_RegionFromPoints",kwnames,&obj0,&obj1)) SWIG_fail;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+    arg2 = wxPoint_LIST_helper(obj0, &arg1);
+    if (arg2 == NULL) SWIG_fail;
+  }
+  if (obj1) {
+    ecode3 = SWIG_AsVal_int(obj1, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_RegionFromPoints" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);

   }
   {
   }
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    (arg1)->SetPixelSize((wxSize const &)*arg2);
+    result = (wxRegion *)new wxRegion(arg1,arg2,arg3);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRegion, SWIG_POINTER_OWN |  0 );
+  {
+    if (arg2) delete [] arg2;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (arg2) delete [] arg2;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_NativeFontInfo_SetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_delete_Region(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxFontStyle arg2 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "style", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetStyle",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegion, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetStyle" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Region" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeFontInfo_SetStyle" "', expected argument " "2"" of type '" "wxFontStyle""'");
-  } 
-  arg2 = static_cast< wxFontStyle >(val2);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);

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

-    (arg1)->SetStyle(arg2);
+    delete arg1;
+    

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


@@ -10438,34 +10650,23 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_NativeFontInfo_SetWeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Region_Clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxFontWeight arg2 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "weight", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetWeight",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetWeight" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Clear" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeFontInfo_SetWeight" "', expected argument " "2"" of type '" "wxFontWeight""'");
-  } 
-  arg2 = static_cast< wxFontWeight >(val2);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);

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

-    (arg1)->SetWeight(arg2);
+    (arg1)->Clear();

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


@@ -10476,269 +10677,333 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_NativeFontInfo_SetUnderlined(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Region_Offset(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  bool arg2 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
+  int val2 ;

   int ecode2 = 0 ;
   int ecode2 = 0 ;

+  int val3 ;
+  int ecode3 = 0 ;

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

+  PyObject * obj2 = 0 ;

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

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

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetUnderlined",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Region_Offset",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetUnderlined" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Offset" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeFontInfo_SetUnderlined" "', expected argument " "2"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_Offset" "', expected argument " "2"" of type '" "int""'");

   } 
   } 

-  arg2 = static_cast< bool >(val2);
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_Offset" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);

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

-    (arg1)->SetUnderlined(arg2);
+    result = (bool)(arg1)->Offset(arg2,arg3);

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

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

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Region_Contains(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxString arg2 ;
-  bool result;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  wxRegionContain result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;

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

+  PyObject * obj2 = 0 ;

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

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

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetFaceName",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Region_Contains",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetFaceName" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
-  }
-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
-  {
-    wxString* sptr = wxString_in_helper(obj1);
-    if (sptr == NULL) SWIG_fail;
-    arg2 = *sptr;
-    delete sptr;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Contains" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_Contains" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_Contains" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);

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

-    result = (bool)(arg1)->SetFaceName(arg2);
+    result = (wxRegionContain)(arg1)->Contains(arg2,arg3);

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_SetFamily(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Region_ContainsPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxFontFamily arg2 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxPoint *arg2 = 0 ;
+  wxRegionContain result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
+  wxPoint temp2 ;

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

-    (char *) "self",(char *) "family", NULL 
+    (char *) "self",(char *) "pt", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetFamily",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_ContainsPoint",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetFamily" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_ContainsPoint" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeFontInfo_SetFamily" "', expected argument " "2"" of type '" "wxFontFamily""'");
-  } 
-  arg2 = static_cast< wxFontFamily >(val2);

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

-    (arg1)->SetFamily(arg2);
+    result = (wxRegionContain)(arg1)->Contains((wxPoint const &)*arg2);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_SetEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Region_ContainsRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxFontEncoding arg2 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxRect *arg2 = 0 ;
+  wxRegionContain result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
+  wxRect temp2 ;

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

-    (char *) "self",(char *) "encoding", NULL 
+    (char *) "self",(char *) "rect", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetEncoding",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_ContainsRect",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetEncoding" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_ContainsRect" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeFontInfo_SetEncoding" "', expected argument " "2"" of type '" "wxFontEncoding""'");
-  } 
-  arg2 = static_cast< wxFontEncoding >(val2);

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

-    (arg1)->SetEncoding(arg2);
+    result = (wxRegionContain)(arg1)->Contains((wxRect const &)*arg2);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo_FromString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Region_ContainsRectDim(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxString *arg2 = 0 ;
-  bool result;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
+  wxRegionContain result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;

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

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

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

-    (char *) "self",(char *) "s", NULL 
+    (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_FromString",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_ContainsRectDim",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_FromString" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
-  }
-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
-  {
-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_ContainsRectDim" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_ContainsRectDim" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_ContainsRectDim" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Region_ContainsRectDim" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Region_ContainsRectDim" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);

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

-    result = (bool)(arg1)->FromString((wxString const &)*arg2);
+    result = (wxRegionContain)(arg1)->Contains(arg2,arg3,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);
-  }
-  {
-    if (temp2)
-    delete arg2;
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_NativeFontInfo_ToString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Region_GetBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxString result;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxRect result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_ToString" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_GetBox" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);

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

-    result = ((wxNativeFontInfo const *)arg1)->ToString();
+    result = (arg1)->GetBox();

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

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-  }
+  resultobj = SWIG_NewPointerObj((new wxRect(static_cast< const wxRect& >(result))), SWIGTYPE_p_wxRect, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_NativeFontInfo___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Region_Intersect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxString result;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Intersect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo___str__" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Intersect" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_Intersect" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_Intersect" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Region_Intersect" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Region_Intersect" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);

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

-    result = wxNativeFontInfo___str__(arg1);
+    result = (bool)(arg1)->Intersect(arg2,arg3,arg4,arg5);

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

-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

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


@@ -10746,158 +11011,112 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Region_IntersectRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxString *arg2 = 0 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxRect *arg2 = 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
+  wxRect temp2 ;

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

-    (char *) "self",(char *) "s", NULL 
+    (char *) "self",(char *) "rect", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_FromUserString",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_IntersectRect",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_FromUserString" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_IntersectRect" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);

   {
   {

-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    arg2 = &temp2;
+    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;

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

-    result = (bool)(arg1)->FromUserString((wxString const &)*arg2);
+    result = (bool)(arg1)->Intersect((wxRect const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
   }

-  {
-    if (temp2)
-    delete arg2;
-  }

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_NativeFontInfo_ToUserString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Region_IntersectRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
-  wxString result;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxRegion *arg2 = 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "region", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_IntersectRegion",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_ToUserString" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_IntersectRegion" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Region_IntersectRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Region_IntersectRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxRegion * >(argp2);

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

-    result = ((wxNativeFontInfo const *)arg1)->ToUserString();
+    result = (bool)(arg1)->Intersect((wxRegion const &)*arg2);

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

-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *NativeFontInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxNativeFontInfo, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *NativeFontInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
-  wxString *arg2 = (wxString *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  bool temp2 = false ;
-  PyObject *swig_obj[2] ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"NativeEncodingInfo_facename_set",2,2,swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeEncodingInfo_facename_set" "', expected argument " "1"" of type '" "wxNativeEncodingInfo *""'"); 
-  }
-  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);
-  {
-    arg2 = wxString_in_helper(swig_obj[1]);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
-  }
-  if (arg1) (arg1)->facename = *arg2;
-  
-  resultobj = SWIG_Py_Void();
-  {
-    if (temp2)
-    delete arg2;
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

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

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Region_IsEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
-  wxString *result = 0 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeEncodingInfo_facename_get" "', expected argument " "1"" of type '" "wxNativeEncodingInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_IsEmpty" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);
-  result = (wxString *)& ((arg1)->facename);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);

   {
   {

-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
-#else
-    resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
-#endif
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->IsEmpty();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

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


@@ -10905,180 +11124,301 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_NativeEncodingInfo_encoding_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Region_Union(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
-  wxFontEncoding arg2 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;

-  PyObject *swig_obj[2] ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
+  };

   
   

-  if (!SWIG_Python_UnpackTuple(args,"NativeEncodingInfo_encoding_set",2,2,swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Union",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeEncodingInfo_encoding_set" "', expected argument " "1"" of type '" "wxNativeEncodingInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Union" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);
-  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeEncodingInfo_encoding_set" "', expected argument " "2"" of type '" "wxFontEncoding""'");
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_Union" "', expected argument " "2"" of type '" "int""'");

   } 
   } 

-  arg2 = static_cast< wxFontEncoding >(val2);
-  if (arg1) (arg1)->encoding = arg2;
-  
-  resultobj = SWIG_Py_Void();
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_Union" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Region_Union" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Region_Union" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->Union(arg2,arg3,arg4,arg5);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

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

-SWIGINTERN PyObject *_wrap_NativeEncodingInfo_encoding_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Region_UnionRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
-  wxFontEncoding result;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxRect *arg2 = 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  wxRect temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "rect", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_UnionRect",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeEncodingInfo_encoding_get" "', expected argument " "1"" of type '" "wxNativeEncodingInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_UnionRect" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->Union((wxRect const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

   }
   }

-  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);
-  result = (wxFontEncoding) ((arg1)->encoding);
-  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_new_NativeEncodingInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Region_UnionRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeEncodingInfo *result = 0 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxRegion *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "region", NULL 
+  };

   
   

-  if (!SWIG_Python_UnpackTuple(args,"new_NativeEncodingInfo",0,0,0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_UnionRegion",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_UnionRegion" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Region_UnionRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Region_UnionRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxRegion * >(argp2);

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

-    result = (wxNativeEncodingInfo *)new wxNativeEncodingInfo();
+    result = (bool)(arg1)->Union((wxRegion const &)*arg2);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativeEncodingInfo, SWIG_POINTER_NEW |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

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

-SWIGINTERN PyObject *_wrap_delete_NativeEncodingInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Region_Subtract(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeEncodingInfo, SWIG_POINTER_DISOWN |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Subtract",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_NativeEncodingInfo" "', expected argument " "1"" of type '" "wxNativeEncodingInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Subtract" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_Subtract" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_Subtract" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Region_Subtract" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Region_Subtract" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);

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

-    delete arg1;
-    
+    result = (bool)(arg1)->Subtract(arg2,arg3,arg4,arg5);

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

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

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

-SWIGINTERN PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Region_SubtractRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
-  wxString *arg2 = 0 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxRect *arg2 = 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
+  wxRect temp2 ;

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

-    (char *) "self",(char *) "s", NULL 
+    (char *) "self",(char *) "rect", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_FromString",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_SubtractRect",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeEncodingInfo_FromString" "', expected argument " "1"" of type '" "wxNativeEncodingInfo *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_SubtractRect" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);

   {
   {

-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    arg2 = &temp2;
+    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;

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

-    result = (bool)(arg1)->FromString((wxString const &)*arg2);
+    result = (bool)(arg1)->Subtract((wxRect const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
   }

-  {
-    if (temp2)
-    delete arg2;
-  }

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_NativeEncodingInfo_ToString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Region_SubtractRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
-  wxString result;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxRegion *arg2 = 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "region", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_SubtractRegion",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeEncodingInfo_ToString" "', expected argument " "1"" of type '" "wxNativeEncodingInfo const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_SubtractRegion" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Region_SubtractRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Region_SubtractRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxRegion * >(argp2);

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

-    result = ((wxNativeEncodingInfo const *)arg1)->ToString();
+    result = (bool)(arg1)->Subtract((wxRegion const &)*arg2);

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

-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

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


@@ -11086,70 +11426,101 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *NativeEncodingInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxNativeEncodingInfo, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *NativeEncodingInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_GetNativeFontEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Region_Xor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontEncoding arg1 ;
-  wxNativeEncodingInfo *result = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;

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

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

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

-    (char *) "encoding", NULL 
+    (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetNativeFontEncoding",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "GetNativeFontEncoding" "', expected argument " "1"" of type '" "wxFontEncoding""'");
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Xor",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_Xor" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Region_Xor" "', expected argument " "2"" of type '" "int""'");

   } 
   } 

-  arg1 = static_cast< wxFontEncoding >(val1);
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Region_Xor" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Region_Xor" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Region_Xor" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);

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

-    result = (wxNativeEncodingInfo *)wxGetNativeFontEncoding(arg1);
+    result = (bool)(arg1)->Xor(arg2,arg3,arg4,arg5);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

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

-SWIGINTERN PyObject *_wrap_TestFontEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Region_XorRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeEncodingInfo *arg1 = 0 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxRect *arg2 = 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  wxRect temp2 ;

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

+  PyObject * obj1 = 0 ;

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

-    (char *) "info", NULL 
+    (char *) "self",(char *) "rect", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TestFontEncoding",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxNativeEncodingInfo,  0  | 0);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_XorRect",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TestFontEncoding" "', expected argument " "1"" of type '" "wxNativeEncodingInfo const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_XorRect" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TestFontEncoding" "', expected argument " "1"" of type '" "wxNativeEncodingInfo const &""'"); 
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;

   }
   }

-  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);

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

-    result = (bool)wxTestFontEncoding((wxNativeEncodingInfo const &)*arg1);
+    result = (bool)(arg1)->Xor((wxRect const &)*arg2);

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


@@ -11162,540 +11533,500 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_new_FontMapper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Region_XorRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontMapper *result = 0 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxRegion *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "region", NULL 
+  };

   
   

-  if (!SWIG_Python_UnpackTuple(args,"new_FontMapper",0,0,0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_XorRegion",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_XorRegion" "', expected argument " "1"" of type '" "wxRegion *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Region_XorRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Region_XorRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxRegion * >(argp2);

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

-    result = (wxFontMapper *)new wxFontMapper();
+    result = (bool)(arg1)->Xor((wxRegion const &)*arg2);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFontMapper, SWIG_POINTER_NEW |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

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

-SWIGINTERN PyObject *_wrap_delete_FontMapper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Region_ConvertToBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  SwigValueWrapper<wxBitmap > result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFontMapper, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FontMapper" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFontMapper * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    delete arg1;
-    
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_ConvertToBitmap" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FontMapper_Get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxFontMapper *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"FontMapper_Get",0,0,0)) SWIG_fail;
+  arg1 = reinterpret_cast< wxRegion * >(argp1);

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

-    result = (wxFontMapper *)wxFontMapper::Get();
+    result = (arg1)->ConvertToBitmap();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  resultobj = SWIG_NewPointerObj((new wxBitmap(static_cast< const wxBitmap& >(result))), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_FontMapper_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Region_UnionBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
-  wxFontMapper *result = 0 ;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxBitmap *arg2 = 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  void *argp2 = 0 ;
+  int res2 = 0 ;

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

+  PyObject * obj1 = 0 ;

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

-    (char *) "mapper", NULL 
+    (char *) "self",(char *) "bmp", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_Set",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Region_UnionBitmap",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_Set" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_UnionBitmap" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFontMapper * >(argp1);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Region_UnionBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Region_UnionBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);

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

-    result = (wxFontMapper *)wxFontMapper::Set(arg1);
+    result = (bool)(arg1)->Union((wxBitmap const &)*arg2);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

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

-SWIGINTERN PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Region_UnionBitmapColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
-  wxString *arg2 = 0 ;
-  bool arg3 = (bool) true ;
-  wxFontEncoding result;
+  wxRegion *arg1 = (wxRegion *) 0 ;
+  wxBitmap *arg2 = 0 ;
+  wxColour *arg3 = 0 ;
+  int arg4 = (int) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
-  bool val3 ;
-  int ecode3 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  wxColour temp3 ;
+  int val4 ;
+  int ecode4 = 0 ;

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

+  PyObject * obj3 = 0 ;

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

-    (char *) "self",(char *) "charset",(char *) "interactive", NULL 
+    (char *) "self",(char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FontMapper_CharsetToEncoding",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Region_UnionBitmapColour",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRegion, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_CharsetToEncoding" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Region_UnionBitmapColour" "', expected argument " "1"" of type '" "wxRegion *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFontMapper * >(argp1);
+  arg1 = reinterpret_cast< wxRegion * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Region_UnionBitmapColour" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Region_UnionBitmapColour" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);

   {
   {

-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    arg3 = &temp3;
+    if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;

   }
   }

-  if (obj2) {
-    ecode3 = SWIG_AsVal_bool(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FontMapper_CharsetToEncoding" "', expected argument " "3"" of type '" "bool""'");
+  if (obj3) {
+    ecode4 = SWIG_AsVal_int(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Region_UnionBitmapColour" "', expected argument " "4"" of type '" "int""'");

     } 
     } 

-    arg3 = static_cast< bool >(val3);
+    arg4 = static_cast< int >(val4);

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

-    result = (wxFontEncoding)(arg1)->CharsetToEncoding((wxString const &)*arg2,arg3);
+    result = (bool)(arg1)->Union((wxBitmap const &)*arg2,(wxColour const &)*arg3,arg4);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));

   {
   {

-    if (temp2)
-    delete arg2;
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

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

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_FontMapper_GetSupportedEncodingsCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  size_t result;
+SWIGINTERN PyObject *Region_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxRegion, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *Region_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_RegionIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxRegion *arg1 = 0 ;
+  wxRegionIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "region", NULL 
+  };

   
   

-  if (!SWIG_Python_UnpackTuple(args,"FontMapper_GetSupportedEncodingsCount",0,0,0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_RegionIterator",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxRegion,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RegionIterator" "', expected argument " "1"" of type '" "wxRegion const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RegionIterator" "', expected argument " "1"" of type '" "wxRegion const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxRegion * >(argp1);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (size_t)wxFontMapper::GetSupportedEncodingsCount();
+    result = (wxRegionIterator *)new wxRegionIterator((wxRegion const &)*arg1);

     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_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRegionIterator, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_FontMapper_GetEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_delete_RegionIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  size_t arg1 ;
-  wxFontEncoding result;
-  size_t val1 ;
-  int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "n", NULL 
-  };
+  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncoding",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "FontMapper_GetEncoding" "', expected argument " "1"" of type '" "size_t""'");
-  } 
-  arg1 = static_cast< size_t >(val1);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RegionIterator" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

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

-    result = (wxFontEncoding)wxFontMapper::GetEncoding(arg1);
+    delete arg1;
+    

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_FontMapper_GetEncodingName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_RegionIterator_GetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontEncoding arg1 ;
-  wxString result;
-  int val1 ;
-  int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "encoding", NULL 
-  };
+  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingName",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "FontMapper_GetEncodingName" "', expected argument " "1"" of type '" "wxFontEncoding""'");
-  } 
-  arg1 = static_cast< wxFontEncoding >(val1);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetX" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

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

-    result = wxFontMapper::GetEncodingName(arg1);
+    result = (int)(arg1)->GetX();

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

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_FontMapper_GetEncodingDescription(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_RegionIterator_GetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontEncoding arg1 ;
-  wxString result;
-  int val1 ;
-  int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "encoding", NULL 
-  };
+  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingDescription",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "FontMapper_GetEncodingDescription" "', expected argument " "1"" of type '" "wxFontEncoding""'");
-  } 
-  arg1 = static_cast< wxFontEncoding >(val1);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetY" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

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

-    result = wxFontMapper::GetEncodingDescription(arg1);
+    result = (int)(arg1)->GetY();

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

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_FontMapper_GetEncodingFromName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_RegionIterator_GetW(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxString *arg1 = 0 ;
-  wxFontEncoding result;
-  bool temp1 = false ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "name", NULL 
-  };
+  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingFromName",kwnames,&obj0)) SWIG_fail;
-  {
-    arg1 = wxString_in_helper(obj0);
-    if (arg1 == NULL) SWIG_fail;
-    temp1 = true;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetW" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

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

-    result = (wxFontEncoding)wxFontMapper::GetEncodingFromName((wxString const &)*arg1);
+    result = (int)(arg1)->GetW();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_int(static_cast< int >(result));
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_int(static_cast< int >(result));

-  {
-    if (temp1)
-    delete arg1;
-  }

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp1)
-    delete arg1;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_FontMapper_SetConfigPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_RegionIterator_GetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
-  wxString *arg2 = 0 ;
+  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "prefix", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetConfigPath",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_SetConfigPath" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFontMapper * >(argp1);
-  {
-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetWidth" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

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

-    (arg1)->SetConfigPath((wxString const &)*arg2);
+    result = (int)(arg1)->GetWidth();

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

-  resultobj = SWIG_Py_Void();
-  {
-    if (temp2)
-    delete arg2;
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_FontMapper_GetDefaultConfigPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RegionIterator_GetH(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxString result;
+  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!SWIG_Python_UnpackTuple(args,"FontMapper_GetDefaultConfigPath",0,0,0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetH" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

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

-    result = wxFontMapper::GetDefaultConfigPath();
+    result = (int)(arg1)->GetH();

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

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_RegionIterator_GetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
-  wxFontEncoding arg2 ;
-  wxString const &arg3_defvalue = wxPyEmptyString ;
-  wxString *arg3 = (wxString *) &arg3_defvalue ;
-  bool arg4 = (bool) true ;
-  PyObject *result = 0 ;
+  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  bool temp3 = false ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "encoding",(char *) "facename",(char *) "interactive", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:FontMapper_GetAltForEncoding",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_GetAltForEncoding" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFontMapper * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FontMapper_GetAltForEncoding" "', expected argument " "2"" of type '" "wxFontEncoding""'");
-  } 
-  arg2 = static_cast< wxFontEncoding >(val2);
-  if (obj2) {
-    {
-      arg3 = wxString_in_helper(obj2);
-      if (arg3 == NULL) SWIG_fail;
-      temp3 = true;
-    }
-  }
-  if (obj3) {
-    ecode4 = SWIG_AsVal_bool(obj3, &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FontMapper_GetAltForEncoding" "', expected argument " "4"" of type '" "bool""'");
-    } 
-    arg4 = static_cast< bool >(val4);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetHeight" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

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

-    result = (PyObject *)wxFontMapper_GetAltForEncoding(arg1,arg2,(wxString const &)*arg3,arg4);
+    result = (int)(arg1)->GetHeight();

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

-  resultobj = result;
-  {
-    if (temp3)
-    delete arg3;
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return resultobj;
 fail:

+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_RegionIterator_GetRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
+  wxRect result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_GetRect" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

   {
   {

-    if (temp3)
-    delete arg3;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (arg1)->GetRect();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_NewPointerObj((new wxRect(static_cast< const wxRect& >(result))), SWIGTYPE_p_wxRect, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_RegionIterator_HaveRects(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
-  wxFontEncoding arg2 ;
-  wxString const &arg3_defvalue = wxPyEmptyString ;
-  wxString *arg3 = (wxString *) &arg3_defvalue ;
+  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  bool temp3 = false ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "encoding",(char *) "facename", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FontMapper_IsEncodingAvailable",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_IsEncodingAvailable" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFontMapper * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FontMapper_IsEncodingAvailable" "', expected argument " "2"" of type '" "wxFontEncoding""'");
-  } 
-  arg2 = static_cast< wxFontEncoding >(val2);
-  if (obj2) {
-    {
-      arg3 = wxString_in_helper(obj2);
-      if (arg3 == NULL) SWIG_fail;
-      temp3 = true;
-    }
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_HaveRects" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

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

-    result = (bool)(arg1)->IsEncodingAvailable(arg2,(wxString const &)*arg3);
+    result = (bool)(arg1)->HaveRects();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
   }

-  {
-    if (temp3)
-    delete arg3;
-  }

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp3)
-    delete arg3;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_FontMapper_SetDialogParent(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_RegionIterator_Reset(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
-  wxWindow *arg2 = (wxWindow *) 0 ;
+  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "parent", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetDialogParent",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_SetDialogParent" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFontMapper * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FontMapper_SetDialogParent" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_Reset" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

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

-    (arg1)->SetDialogParent(arg2);
+    (arg1)->Reset();

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


@@ -11706,175 +12037,106 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_RegionIterator_Next(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
-  wxString *arg2 = 0 ;
+  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "title", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetDialogTitle",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_SetDialogTitle" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator_Next" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFontMapper * >(argp1);
+  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

   {
   {

-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxRegionIterator_Next(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_RegionIterator___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRegionIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RegionIterator___nonzero__" "', expected argument " "1"" of type '" "wxRegionIterator *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxRegionIterator * >(argp1);

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

-    (arg1)->SetDialogTitle((wxString const &)*arg2);
+    result = (bool)wxRegionIterator___nonzero__(arg1);

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

-  resultobj = SWIG_Py_Void();

   {
   {

-    if (temp2)
-    delete arg2;
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

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

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *FontMapper_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *RegionIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxFontMapper, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxRegionIterator, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *FontMapper_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *RegionIterator_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_Font(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_NativeFontInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 = (bool) false ;
-  wxString const &arg6_defvalue = wxPyEmptyString ;
-  wxString *arg6 = (wxString *) &arg6_defvalue ;
-  wxFontEncoding arg7 = (wxFontEncoding) wxFONTENCODING_DEFAULT ;
-  wxFont *result = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  bool temp6 = false ;
-  int val7 ;
-  int ecode7 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
-  PyObject * obj6 = 0 ;
-  char *  kwnames[] = {
-    (char *) "pointSize",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "face",(char *) "encoding", NULL 
-  };
+  wxNativeFontInfo *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:new_Font",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Font" "', expected argument " "1"" of type '" "int""'");
-  } 
-  arg1 = static_cast< int >(val1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Font" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Font" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Font" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
-  if (obj4) {
-    ecode5 = SWIG_AsVal_bool(obj4, &val5);
-    if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_Font" "', expected argument " "5"" of type '" "bool""'");
-    } 
-    arg5 = static_cast< bool >(val5);
-  }
-  if (obj5) {
-    {
-      arg6 = wxString_in_helper(obj5);
-      if (arg6 == NULL) SWIG_fail;
-      temp6 = true;
-    }
-  }
-  if (obj6) {
-    ecode7 = SWIG_AsVal_int(obj6, &val7);
-    if (!SWIG_IsOK(ecode7)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_Font" "', expected argument " "7"" of type '" "wxFontEncoding""'");
-    } 
-    arg7 = static_cast< wxFontEncoding >(val7);
-  }
+  if (!SWIG_Python_UnpackTuple(args,"new_NativeFontInfo",0,0,0)) SWIG_fail;

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxFont *)new wxFont(arg1,arg2,arg3,arg4,arg5,(wxString const &)*arg6,arg7);
+    result = (wxNativeFontInfo *)new wxNativeFontInfo();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, SWIG_POINTER_NEW |  0 );
-  {
-    if (temp6)
-    delete arg6;
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativeFontInfo, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp6)
-    delete arg6;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_Font(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_NativeFontInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Font" "', expected argument " "1"" of type '" "wxFont *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_NativeFontInfo" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

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


@@ -11889,338 +12151,189 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_new_FontFromNativeInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_Init(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxNativeFontInfo *arg1 = 0 ;
-  wxFont *result = 0 ;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "info", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_FontFromNativeInfo",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxNativeFontInfo,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FontFromNativeInfo" "', expected argument " "1"" of type '" "wxNativeFontInfo const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FontFromNativeInfo" "', expected argument " "1"" of type '" "wxNativeFontInfo const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_Init" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 

   }
   arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxFont *)new wxFont((wxNativeFontInfo const &)*arg1);
+    (arg1)->Init();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_new_FontFromNativeInfoString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_InitFromFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxString *arg1 = 0 ;
-  wxFont *result = 0 ;
-  bool temp1 = false ;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxFont *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;

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

+  PyObject * obj1 = 0 ;

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

-    (char *) "info", NULL 
+    (char *) "self",(char *) "font", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_FontFromNativeInfoString",kwnames,&obj0)) SWIG_fail;
-  {
-    arg1 = wxString_in_helper(obj0);
-    if (arg1 == NULL) SWIG_fail;
-    temp1 = true;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_InitFromFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_InitFromFont" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NativeFontInfo_InitFromFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 

   }
   }

+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NativeFontInfo_InitFromFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxFont *)new_wxFont((wxString const &)*arg1);
+    (arg1)->InitFromFont((wxFont const &)*arg2);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );
-  {
-    if (temp1)
-    delete arg1;
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp1)
-    delete arg1;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_new_FFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_GetPointSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  int arg1 ;
-  wxFontFamily arg2 ;
-  int arg3 = (int) wxFONTFLAG_DEFAULT ;
-  wxString const &arg4_defvalue = wxPyEmptyString ;
-  wxString *arg4 = (wxString *) &arg4_defvalue ;
-  wxFontEncoding arg5 = (wxFontEncoding) wxFONTENCODING_DEFAULT ;
-  wxFont *result = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool temp4 = false ;
-  int val5 ;
-  int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  char *  kwnames[] = {
-    (char *) "pointSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL 
-  };
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_FFont",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FFont" "', expected argument " "1"" of type '" "int""'");
-  } 
-  arg1 = static_cast< int >(val1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FFont" "', expected argument " "2"" of type '" "wxFontFamily""'");
-  } 
-  arg2 = static_cast< wxFontFamily >(val2);
-  if (obj2) {
-    ecode3 = SWIG_AsVal_int(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FFont" "', expected argument " "3"" of type '" "int""'");
-    } 
-    arg3 = static_cast< int >(val3);
-  }
-  if (obj3) {
-    {
-      arg4 = wxString_in_helper(obj3);
-      if (arg4 == NULL) SWIG_fail;
-      temp4 = true;
-    }
-  }
-  if (obj4) {
-    ecode5 = SWIG_AsVal_int(obj4, &val5);
-    if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_FFont" "', expected argument " "5"" of type '" "wxFontEncoding""'");
-    } 
-    arg5 = static_cast< wxFontEncoding >(val5);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetPointSize" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxFont *)new_wxFont(arg1,arg2,arg3,(wxString const &)*arg4,arg5);
+    result = (int)((wxNativeFontInfo const *)arg1)->GetPointSize();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );
-  {
-    if (temp4)
-    delete arg4;
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return resultobj;
 fail:

+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NativeFontInfo_GetPixelSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxSize result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetPixelSize" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

   {
   {

-    if (temp4)
-    delete arg4;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxNativeFontInfo const *)arg1)->GetPixelSize();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_new_FontFromPixelSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_GetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxSize *arg1 = 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 = (bool) false ;
-  wxString const &arg6_defvalue = wxEmptyString ;
-  wxString *arg6 = (wxString *) &arg6_defvalue ;
-  wxFontEncoding arg7 = (wxFontEncoding) wxFONTENCODING_DEFAULT ;
-  wxFont *result = 0 ;
-  wxSize temp1 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  bool temp6 = false ;
-  int val7 ;
-  int ecode7 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
-  PyObject * obj6 = 0 ;
-  char *  kwnames[] = {
-    (char *) "pixelSize",(char *) "family",(char *) "style",(char *) "weight",(char *) "underlined",(char *) "face",(char *) "encoding", NULL 
-  };
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxFontStyle result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:new_FontFromPixelSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
-  {
-    arg1 = &temp1;
-    if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail;
-  }
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FontFromPixelSize" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FontFromPixelSize" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FontFromPixelSize" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
-  if (obj4) {
-    ecode5 = SWIG_AsVal_bool(obj4, &val5);
-    if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_FontFromPixelSize" "', expected argument " "5"" of type '" "bool""'");
-    } 
-    arg5 = static_cast< bool >(val5);
-  }
-  if (obj5) {
-    {
-      arg6 = wxString_in_helper(obj5);
-      if (arg6 == NULL) SWIG_fail;
-      temp6 = true;
-    }
-  }
-  if (obj6) {
-    ecode7 = SWIG_AsVal_int(obj6, &val7);
-    if (!SWIG_IsOK(ecode7)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_FontFromPixelSize" "', expected argument " "7"" of type '" "wxFontEncoding""'");
-    } 
-    arg7 = static_cast< wxFontEncoding >(val7);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetStyle" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxFont *)new_wxFont((wxSize const &)*arg1,arg2,arg3,arg4,arg5,(wxString const &)*arg6,arg7);
+    result = (wxFontStyle)((wxNativeFontInfo const *)arg1)->GetStyle();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );
-  {
-    if (temp6)
-    delete arg6;
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp6)
-    delete arg6;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_new_FFontFromPixelSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_GetWeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxSize *arg1 = 0 ;
-  wxFontFamily arg2 ;
-  int arg3 = (int) wxFONTFLAG_DEFAULT ;
-  wxString const &arg4_defvalue = wxEmptyString ;
-  wxString *arg4 = (wxString *) &arg4_defvalue ;
-  wxFontEncoding arg5 = (wxFontEncoding) wxFONTENCODING_DEFAULT ;
-  wxFont *result = 0 ;
-  wxSize temp1 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool temp4 = false ;
-  int val5 ;
-  int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  char *  kwnames[] = {
-    (char *) "pixelSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL 
-  };
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxFontWeight result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_FFontFromPixelSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  {
-    arg1 = &temp1;
-    if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail;
-  }
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FFontFromPixelSize" "', expected argument " "2"" of type '" "wxFontFamily""'");
-  } 
-  arg2 = static_cast< wxFontFamily >(val2);
-  if (obj2) {
-    ecode3 = SWIG_AsVal_int(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FFontFromPixelSize" "', expected argument " "3"" of type '" "int""'");
-    } 
-    arg3 = static_cast< int >(val3);
-  }
-  if (obj3) {
-    {
-      arg4 = wxString_in_helper(obj3);
-      if (arg4 == NULL) SWIG_fail;
-      temp4 = true;
-    }
-  }
-  if (obj4) {
-    ecode5 = SWIG_AsVal_int(obj4, &val5);
-    if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_FFontFromPixelSize" "', expected argument " "5"" of type '" "wxFontEncoding""'");
-    } 
-    arg5 = static_cast< wxFontEncoding >(val5);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetWeight" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxFont *)new_wxFont((wxSize const &)*arg1,arg2,arg3,(wxString const &)*arg4,arg5);
+    result = (wxFontWeight)((wxNativeFontInfo const *)arg1)->GetWeight();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );
-  {
-    if (temp4)
-    delete arg4;
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp4)
-    delete arg4;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_GetUnderlined(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;


@@ -12228,14 +12341,14 @@ SWIGINTERN PyObject *_wrap_Font_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_Ok" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetUnderlined" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

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

-    result = (bool)((wxFont const *)arg1)->Ok();
+    result = (bool)((wxNativeFontInfo const *)arg1)->GetUnderlined();

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


@@ -12248,40 +12361,33 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Font___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_GetFaceName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  wxFont *arg2 = (wxFont *) 0 ;
-  bool result;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxString result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "other", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font___eq__" "', expected argument " "1"" of type '" "wxFont *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFont * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Font___eq__" "', expected argument " "2"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetFaceName" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

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

-    result = (bool)wxFont___eq__(arg1,(wxFont const *)arg2);
+    result = ((wxNativeFontInfo const *)arg1)->GetFaceName();

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

-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif

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


@@ -12289,65 +12395,52 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Font___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_GetFamily(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  wxFont *arg2 = (wxFont *) 0 ;
-  bool result;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxFontFamily result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "other", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font___ne__" "', expected argument " "1"" of type '" "wxFont *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFont * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Font___ne__" "', expected argument " "2"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetFamily" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

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

-    result = (bool)wxFont___ne__(arg1,(wxFont const *)arg2);
+    result = (wxFontFamily)((wxNativeFontInfo const *)arg1)->GetFamily();

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_Font_GetPointSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_GetEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  int result;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxFontEncoding result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetPointSize" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_GetEncoding" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

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

-    result = (int)((wxFont const *)arg1)->GetPointSize();
+    result = (wxFontEncoding)((wxNativeFontInfo const *)arg1)->GetEncoding();

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


@@ -12358,166 +12451,222 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_GetPixelSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_SetPointSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  wxSize result;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pointsize", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetPointSize",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetPixelSize" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetPointSize" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeFontInfo_SetPointSize" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

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

-    result = ((wxFont const *)arg1)->GetPixelSize();
+    (arg1)->SetPointSize(arg2);

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

-  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Font_IsUsingSizeInPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_SetPixelSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  bool result;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxSize *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  wxSize temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pixelSize", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetPixelSize",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_IsUsingSizeInPixels" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetPixelSize" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);

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

-    result = (bool)((wxFont const *)arg1)->IsUsingSizeInPixels();
+    (arg1)->SetPixelSize((wxSize const &)*arg2);

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

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

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

-SWIGINTERN PyObject *_wrap_Font_GetFamily(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_SetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  int result;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxFontStyle arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "style", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetStyle",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetFamily" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetStyle" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeFontInfo_SetStyle" "', expected argument " "2"" of type '" "wxFontStyle""'");
+  } 
+  arg2 = static_cast< wxFontStyle >(val2);

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

-    result = (int)((wxFont const *)arg1)->GetFamily();
+    (arg1)->SetStyle(arg2);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Font_GetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_SetWeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  int result;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxFontWeight arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "weight", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetWeight",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetStyle" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetWeight" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeFontInfo_SetWeight" "', expected argument " "2"" of type '" "wxFontWeight""'");
+  } 
+  arg2 = static_cast< wxFontWeight >(val2);

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

-    result = (int)((wxFont const *)arg1)->GetStyle();
+    (arg1)->SetWeight(arg2);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Font_GetWeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_SetUnderlined(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  int result;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "underlined", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetUnderlined",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetWeight" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetUnderlined" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeFontInfo_SetUnderlined" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

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

-    result = (int)((wxFont const *)arg1)->GetWeight();
+    (arg1)->SetUnderlined(arg2);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Font_GetUnderlined(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxString arg2 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "facename", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetFaceName",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetUnderlined" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetFaceName" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  {
+    wxString* sptr = wxString_in_helper(obj1);
+    if (sptr == NULL) SWIG_fail;
+    arg2 = *sptr;
+    delete sptr;

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);

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

-    result = (bool)((wxFont const *)arg1)->GetUnderlined();
+    result = (bool)(arg1)->SetFaceName(arg2);

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


@@ -12530,129 +12679,133 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_GetFaceName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_SetFamily(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  wxString result;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxFontFamily arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "family", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetFamily",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetFaceName" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetFamily" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeFontInfo_SetFamily" "', expected argument " "2"" of type '" "wxFontFamily""'");
+  } 
+  arg2 = static_cast< wxFontFamily >(val2);

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

-    result = ((wxFont const *)arg1)->GetFaceName();
+    (arg1)->SetFamily(arg2);

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

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-  }
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Font_GetEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_SetEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  wxFontEncoding result;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxFontEncoding arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "encoding", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetEncoding",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetEncoding" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_SetEncoding" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeFontInfo_SetEncoding" "', expected argument " "2"" of type '" "wxFontEncoding""'");
+  } 
+  arg2 = static_cast< wxFontEncoding >(val2);

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

-    result = (wxFontEncoding)((wxFont const *)arg1)->GetEncoding();
+    (arg1)->SetEncoding(arg2);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Font_GetNativeFontInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_FromString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  wxNativeFontInfo *result = 0 ;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxString *arg2 = 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "s", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_FromString",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetNativeFontInfo" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_FromString" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxNativeFontInfo *)((wxFont const *)arg1)->GetNativeFontInfo();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Font_IsFixedWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxFont *arg1 = (wxFont *) 0 ;
-  bool result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_IsFixedWidth" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);

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

-    result = (bool)((wxFont const *)arg1)->IsFixedWidth();
+    result = (bool)(arg1)->FromString((wxString const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
   }

+  {
+    if (temp2)
+    delete arg2;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp2)
+    delete arg2;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_GetNativeFontInfoDesc(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_ToString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;

   wxString result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxString result;
   void *argp1 = 0 ;
   int res1 = 0 ;


@@ -12660,14 +12813,14 @@ SWIGINTERN PyObject *_wrap_Font_GetNativeFontInfoDesc(PyObject *SWIGUNUSEDPARM(s
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetNativeFontInfoDesc" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_ToString" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

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

-    result = ((wxFont const *)arg1)->GetNativeFontInfoDesc();
+    result = ((wxNativeFontInfo const *)arg1)->ToString();

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


@@ -12684,9 +12837,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_GetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;

   wxString result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxString result;
   void *argp1 = 0 ;
   int res1 = 0 ;


@@ -12694,14 +12847,14 @@ SWIGINTERN PyObject *_wrap_Font_GetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPA
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetNativeFontInfoUserDesc" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo___str__" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

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

-    result = ((wxFont const *)arg1)->GetNativeFontInfoUserDesc();
+    result = wxNativeFontInfo___str__(arg1);

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


@@ -12718,184 +12871,254 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_SetPointSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  int arg2 ;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxString *arg2 = 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
+  bool temp2 = false ;

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

-    (char *) "self",(char *) "pointSize", NULL 
+    (char *) "self",(char *) "s", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetPointSize",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_FromUserString",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetPointSize" "', expected argument " "1"" of type '" "wxFont *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_FromUserString" "', expected argument " "1"" of type '" "wxNativeFontInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetPointSize" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);

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

-    (arg1)->SetPointSize(arg2);
+    result = (bool)(arg1)->FromUserString((wxString const &)*arg2);

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

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp2)
+    delete arg2;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_SetPixelSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeFontInfo_ToUserString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  wxSize *arg2 = 0 ;
+  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
+  wxString result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "pixelSize", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetPixelSize",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetPixelSize" "', expected argument " "1"" of type '" "wxFont *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFont * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeFontInfo_ToUserString" "', expected argument " "1"" of type '" "wxNativeFontInfo const *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);

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

-    (arg1)->SetPixelSize((wxSize const &)*arg2);
+    result = ((wxNativeFontInfo const *)arg1)->ToUserString();

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

-  resultobj = SWIG_Py_Void();
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }

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

-SWIGINTERN PyObject *_wrap_Font_SetFamily(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *NativeFontInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxNativeFontInfo, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *NativeFontInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  int arg2 ;
+  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
+  wxString *arg2 = (wxString *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "family", NULL 
-  };
+  bool temp2 = false ;
+  PyObject *swig_obj[2] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetFamily",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args,"NativeEncodingInfo_facename_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetFamily" "', expected argument " "1"" of type '" "wxFont *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeEncodingInfo_facename_set" "', expected argument " "1"" of type '" "wxNativeEncodingInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetFamily" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
+  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetFamily(arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    arg2 = wxString_in_helper(swig_obj[1]);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;

   }
   }

+  if (arg1) (arg1)->facename = *arg2;
+  

   resultobj = SWIG_Py_Void();
   resultobj = SWIG_Py_Void();

+  {
+    if (temp2)
+    delete arg2;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp2)
+    delete arg2;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_SetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  int arg2 ;
+  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
+  wxString *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "style", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetStyle",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetStyle" "', expected argument " "1"" of type '" "wxFont *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeEncodingInfo_facename_get" "', expected argument " "1"" of type '" "wxNativeEncodingInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetStyle" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
+  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);
+  result = (wxString *)& ((arg1)->facename);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetStyle(arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
+#else
+    resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
+#endif

   }
   }

-  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Font_SetWeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeEncodingInfo_encoding_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  int arg2 ;
+  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
+  wxFontEncoding arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;

-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "weight", NULL 
-  };
+  PyObject *swig_obj[2] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetWeight",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args,"NativeEncodingInfo_encoding_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetWeight" "', expected argument " "1"" of type '" "wxFont *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeEncodingInfo_encoding_set" "', expected argument " "1"" of type '" "wxNativeEncodingInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetWeight" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "NativeEncodingInfo_encoding_set" "', expected argument " "2"" of type '" "wxFontEncoding""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
+  arg2 = static_cast< wxFontEncoding >(val2);
+  if (arg1) (arg1)->encoding = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NativeEncodingInfo_encoding_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
+  wxFontEncoding result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeEncodingInfo_encoding_get" "', expected argument " "1"" of type '" "wxNativeEncodingInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);
+  result = (wxFontEncoding) ((arg1)->encoding);
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_NativeEncodingInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxNativeEncodingInfo *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_NativeEncodingInfo",0,0,0)) SWIG_fail;

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

-    (arg1)->SetWeight(arg2);
+    result = (wxNativeEncodingInfo *)new wxNativeEncodingInfo();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativeEncodingInfo, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_NativeEncodingInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeEncodingInfo, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_NativeEncodingInfo" "', expected argument " "1"" of type '" "wxNativeEncodingInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    

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


@@ -12906,9 +13129,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
+  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;

   wxString *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   wxString *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;


@@ -12917,15 +13140,15 @@ SWIGINTERN PyObject *_wrap_Font_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "faceName", NULL 
+    (char *) "self",(char *) "s", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetFaceName",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_FromString",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetFaceName" "', expected argument " "1"" of type '" "wxFont *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeEncodingInfo_FromString" "', expected argument " "1"" of type '" "wxNativeEncodingInfo *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);

   {
     arg2 = wxString_in_helper(obj1);
     if (arg2 == NULL) SWIG_fail;
   {
     arg2 = wxString_in_helper(obj1);
     if (arg2 == NULL) SWIG_fail;


@@ -12933,7 +13156,7 @@ SWIGINTERN PyObject *_wrap_Font_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->SetFaceName((wxString const &)*arg2);
+    result = (bool)(arg1)->FromString((wxString const &)*arg2);

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


@@ -12954,205 +13177,253 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_SetUnderlined(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_NativeEncodingInfo_ToString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  bool arg2 ;
+  wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
+  wxString result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "underlined", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetUnderlined",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetUnderlined" "', expected argument " "1"" of type '" "wxFont *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NativeEncodingInfo_ToString" "', expected argument " "1"" of type '" "wxNativeEncodingInfo const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetUnderlined" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);
+  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);

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

-    (arg1)->SetUnderlined(arg2);
+    result = ((wxNativeEncodingInfo const *)arg1)->ToString();

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

-  resultobj = SWIG_Py_Void();
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }

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

-SWIGINTERN PyObject *_wrap_Font_SetEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *NativeEncodingInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxNativeEncodingInfo, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *NativeEncodingInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_GetNativeFontEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  wxFontEncoding arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  wxFontEncoding arg1 ;
+  wxNativeEncodingInfo *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;

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

-  PyObject * obj1 = 0 ;

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

-    (char *) "self",(char *) "encoding", NULL 
+    (char *) "encoding", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetEncoding",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetEncoding" "', expected argument " "1"" of type '" "wxFont *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFont * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetEncoding" "', expected argument " "2"" of type '" "wxFontEncoding""'");
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetNativeFontEncoding",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "GetNativeFontEncoding" "', expected argument " "1"" of type '" "wxFontEncoding""'");

   } 
   } 

-  arg2 = static_cast< wxFontEncoding >(val2);
+  arg1 = static_cast< wxFontEncoding >(val1);

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

-    (arg1)->SetEncoding(arg2);
+    result = (wxNativeEncodingInfo *)wxGetNativeFontEncoding(arg1);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativeEncodingInfo, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_TestFontEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  wxNativeFontInfo *arg2 = 0 ;
+  wxNativeEncodingInfo *arg1 = 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;

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

-  PyObject * obj1 = 0 ;

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

-    (char *) "self",(char *) "info", NULL 
+    (char *) "info", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetNativeFontInfo",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TestFontEncoding",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxNativeEncodingInfo,  0  | 0);

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetNativeFontInfo" "', expected argument " "1"" of type '" "wxFont *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TestFontEncoding" "', expected argument " "1"" of type '" "wxNativeEncodingInfo const &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxNativeFontInfo,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Font_SetNativeFontInfo" "', expected argument " "2"" of type '" "wxNativeFontInfo const &""'"); 
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TestFontEncoding" "', expected argument " "1"" of type '" "wxNativeEncodingInfo const &""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Font_SetNativeFontInfo" "', expected argument " "2"" of type '" "wxNativeFontInfo const &""'"); 
+  arg1 = reinterpret_cast< wxNativeEncodingInfo * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)wxTestFontEncoding((wxNativeEncodingInfo const &)*arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

-  arg2 = reinterpret_cast< wxNativeFontInfo * >(argp2);
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FontMapper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFontMapper *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_FontMapper",0,0,0)) SWIG_fail;

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

-    (arg1)->SetNativeFontInfo((wxNativeFontInfo const &)*arg2);
+    result = (wxFontMapper *)new wxFontMapper();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFontMapper, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_delete_FontMapper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  wxString *arg2 = 0 ;
-  bool result;
+  wxFontMapper *arg1 = (wxFontMapper *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "info", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetNativeFontInfoFromString",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFontMapper, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetNativeFontInfoFromString" "', expected argument " "1"" of type '" "wxFont *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FontMapper" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxFontMapper * >(argp1);

   {
   {

-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FontMapper_Get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFontMapper *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"FontMapper_Get",0,0,0)) SWIG_fail;

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

-    result = (bool)(arg1)->SetNativeFontInfo((wxString const &)*arg2);
+    result = (wxFontMapper *)wxFontMapper::Get();

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FontMapper_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
+  wxFontMapper *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "mapper", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_Set",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_Set" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxFontMapper * >(argp1);

   {
   {

-    if (temp2)
-    delete arg2;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxFontMapper *)wxFontMapper::Set(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFontMapper, 0 |  0 );

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
+  wxFontMapper *arg1 = (wxFontMapper *) 0 ;

   wxString *arg2 = 0 ;
   wxString *arg2 = 0 ;

-  bool result;
+  bool arg3 = (bool) true ;
+  wxFontEncoding result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   bool temp2 = false ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool temp2 = false ;

+  bool val3 ;
+  int ecode3 = 0 ;

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

+  PyObject * obj2 = 0 ;

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

-    (char *) "self",(char *) "info", NULL 
+    (char *) "self",(char *) "charset",(char *) "interactive", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetNativeFontInfoUserDesc",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FontMapper_CharsetToEncoding",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetNativeFontInfoUserDesc" "', expected argument " "1"" of type '" "wxFont *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_CharsetToEncoding" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  arg1 = reinterpret_cast< wxFontMapper * >(argp1);

   {
     arg2 = wxString_in_helper(obj1);
     if (arg2 == NULL) SWIG_fail;
     temp2 = true;
   }
   {
     arg2 = wxString_in_helper(obj1);
     if (arg2 == NULL) SWIG_fail;
     temp2 = true;
   }

+  if (obj2) {
+    ecode3 = SWIG_AsVal_bool(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FontMapper_CharsetToEncoding" "', expected argument " "3"" of type '" "bool""'");
+    } 
+    arg3 = static_cast< bool >(val3);
+  }

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

-    result = (bool)(arg1)->SetNativeFontInfoUserDesc((wxString const &)*arg2);
+    result = (wxFontEncoding)(arg1)->CharsetToEncoding((wxString const &)*arg2,arg3);

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

   {
     if (temp2)
     delete arg2;
   {
     if (temp2)
     delete arg2;


@@ -13167,58 +13438,74 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_GetFamilyString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FontMapper_GetSupportedEncodingsCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  wxString result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  size_t result;

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetFamilyString" "', expected argument " "1"" of type '" "wxFont const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  if (!SWIG_Python_UnpackTuple(args,"FontMapper_GetSupportedEncodingsCount",0,0,0)) SWIG_fail;

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

-    result = ((wxFont const *)arg1)->GetFamilyString();
+    result = (size_t)wxFontMapper::GetSupportedEncodingsCount();

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

+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FontMapper_GetEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  size_t arg1 ;
+  wxFontEncoding result;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "n", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncoding",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "FontMapper_GetEncoding" "', expected argument " "1"" of type '" "size_t""'");
+  } 
+  arg1 = static_cast< size_t >(val1);

   {
   {

-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxFontEncoding)wxFontMapper::GetEncoding(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_Font_GetStyleString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FontMapper_GetEncodingName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
+  wxFontEncoding arg1 ;

   wxString result;
   wxString result;

-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "encoding", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetStyleString" "', expected argument " "1"" of type '" "wxFont const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingName",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "FontMapper_GetEncodingName" "', expected argument " "1"" of type '" "wxFontEncoding""'");
+  } 
+  arg1 = static_cast< wxFontEncoding >(val1);

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

-    result = ((wxFont const *)arg1)->GetStyleString();
+    result = wxFontMapper::GetEncodingName(arg1);

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


@@ -13235,24 +13522,26 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_GetWeightString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FontMapper_GetEncodingDescription(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
+  wxFontEncoding arg1 ;

   wxString result;
   wxString result;

-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "encoding", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetWeightString" "', expected argument " "1"" of type '" "wxFont const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFont * >(argp1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingDescription",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "FontMapper_GetEncodingDescription" "', expected argument " "1"" of type '" "wxFontEncoding""'");
+  } 
+  arg1 = static_cast< wxFontEncoding >(val1);

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

-    result = ((wxFont const *)arg1)->GetWeightString();
+    result = wxFontMapper::GetEncodingDescription(arg1);

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


@@ -13269,191 +13558,125 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_FontMapper_GetEncodingFromName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFont *arg1 = (wxFont *) 0 ;
-  bool arg2 = (bool) true ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  bool val2 ;
-  int ecode2 = 0 ;
+  wxString *arg1 = 0 ;
+  wxFontEncoding result;
+  bool temp1 = false ;

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

-  PyObject * obj1 = 0 ;

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

-    (char *) "self",(char *) "no", NULL 
+    (char *) "name", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Font_SetNoAntiAliasing",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetNoAntiAliasing" "', expected argument " "1"" of type '" "wxFont *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFont * >(argp1);
-  if (obj1) {
-    ecode2 = SWIG_AsVal_bool(obj1, &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetNoAntiAliasing" "', expected argument " "2"" of type '" "bool""'");
-    } 
-    arg2 = static_cast< bool >(val2);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingFromName",kwnames,&obj0)) SWIG_fail;
+  {
+    arg1 = wxString_in_helper(obj0);
+    if (arg1 == NULL) SWIG_fail;
+    temp1 = true;

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

-    (arg1)->SetNoAntiAliasing(arg2);
+    result = (wxFontEncoding)wxFontMapper::GetEncodingFromName((wxString const &)*arg1);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  {
+    if (temp1)
+    delete arg1;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxFont *arg1 = (wxFont *) 0 ;
-  bool result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetNoAntiAliasing" "', expected argument " "1"" of type '" "wxFont const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFont * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxFont const *)arg1)->GetNoAntiAliasing();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Font_GetDefaultEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxFontEncoding result;
-  
-  if (!SWIG_Python_UnpackTuple(args,"Font_GetDefaultEncoding",0,0,0)) SWIG_fail;

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxFontEncoding)wxFont::GetDefaultEncoding();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    if (temp1)
+    delete arg1;

   }
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Font_SetDefaultEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_FontMapper_SetConfigPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontEncoding arg1 ;
-  int val1 ;
-  int ecode1 = 0 ;
+  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
+  wxString *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;

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

+  PyObject * obj1 = 0 ;

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

-    (char *) "encoding", NULL 
+    (char *) "self",(char *) "prefix", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_SetDefaultEncoding",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Font_SetDefaultEncoding" "', expected argument " "1"" of type '" "wxFontEncoding""'");
-  } 
-  arg1 = static_cast< wxFontEncoding >(val1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetConfigPath",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_SetConfigPath" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFontMapper * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    wxFont::SetDefaultEncoding(arg1);
+    (arg1)->SetConfigPath((wxString const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();

-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *Font_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxFont, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *Font_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_FontEnumerator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxPyFontEnumerator *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"new_FontEnumerator",0,0,0)) SWIG_fail;

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxPyFontEnumerator *)new wxPyFontEnumerator();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    if (temp2)
+    delete arg2;

   }
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyFontEnumerator, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp2)
+    delete arg2;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_FontEnumerator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FontMapper_GetDefaultConfigPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  wxString result;

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyFontEnumerator, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FontEnumerator" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
+  if (!SWIG_Python_UnpackTuple(args,"FontMapper_GetDefaultConfigPath",0,0,0)) SWIG_fail;

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

-    delete arg1;
-    
+    result = wxFontMapper::GetDefaultConfigPath();

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

-  resultobj = SWIG_Py_Void();
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }

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

-SWIGINTERN PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
-  PyObject *arg2 = (PyObject *) 0 ;
-  PyObject *arg3 = (PyObject *) 0 ;
-  bool arg4 ;
+  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
+  wxFontEncoding arg2 ;
+  wxString const &arg3_defvalue = wxPyEmptyString ;
+  wxString *arg3 = (wxString *) &arg3_defvalue ;
+  bool arg4 = (bool) true ;
+  PyObject *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  int val2 ;
+  int ecode2 = 0 ;
+  bool temp3 = false ;

   bool val4 ;
   int ecode4 = 0 ;
   PyObject * obj0 = 0 ;
   bool val4 ;
   int ecode4 = 0 ;
   PyObject * obj0 = 0 ;


@@ -13461,126 +13684,184 @@ SWIGINTERN PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   char *  kwnames[] = {
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL 
+    (char *) "self",(char *) "encoding",(char *) "facename",(char *) "interactive", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FontEnumerator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:FontMapper_GetAltForEncoding",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_GetAltForEncoding" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
-  arg2 = obj1;
-  arg3 = obj2;
-  ecode4 = SWIG_AsVal_bool(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FontEnumerator__setCallbackInfo" "', expected argument " "4"" of type '" "bool""'");
+  arg1 = reinterpret_cast< wxFontMapper * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FontMapper_GetAltForEncoding" "', expected argument " "2"" of type '" "wxFontEncoding""'");

   } 
   } 

-  arg4 = static_cast< bool >(val4);
+  arg2 = static_cast< wxFontEncoding >(val2);
+  if (obj2) {
+    {
+      arg3 = wxString_in_helper(obj2);
+      if (arg3 == NULL) SWIG_fail;
+      temp3 = true;
+    }
+  }
+  if (obj3) {
+    ecode4 = SWIG_AsVal_bool(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FontMapper_GetAltForEncoding" "', expected argument " "4"" of type '" "bool""'");
+    } 
+    arg4 = static_cast< bool >(val4);
+  }

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

-    (arg1)->_setCallbackInfo(arg2,arg3,arg4);
+    result = (PyObject *)wxFontMapper_GetAltForEncoding(arg1,arg2,(wxString const &)*arg3,arg4);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = result;
+  {
+    if (temp3)
+    delete arg3;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp3)
+    delete arg3;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
-  wxFontEncoding arg2 = (wxFontEncoding) wxFONTENCODING_SYSTEM ;
-  bool arg3 = (bool) false ;
+  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
+  wxFontEncoding arg2 ;
+  wxString const &arg3_defvalue = wxPyEmptyString ;
+  wxString *arg3 = (wxString *) &arg3_defvalue ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;

-  bool val3 ;
-  int ecode3 = 0 ;
+  bool temp3 = false ;

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

-    (char *) "self",(char *) "encoding",(char *) "fixedWidthOnly", NULL 
+    (char *) "self",(char *) "encoding",(char *) "facename", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:FontEnumerator_EnumerateFacenames",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FontMapper_IsEncodingAvailable",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator_EnumerateFacenames" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
-  if (obj1) {
-    ecode2 = SWIG_AsVal_int(obj1, &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FontEnumerator_EnumerateFacenames" "', expected argument " "2"" of type '" "wxFontEncoding""'");
-    } 
-    arg2 = static_cast< wxFontEncoding >(val2);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_IsEncodingAvailable" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxFontMapper * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FontMapper_IsEncodingAvailable" "', expected argument " "2"" of type '" "wxFontEncoding""'");
+  } 
+  arg2 = static_cast< wxFontEncoding >(val2);

   if (obj2) {
   if (obj2) {

-    ecode3 = SWIG_AsVal_bool(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FontEnumerator_EnumerateFacenames" "', expected argument " "3"" of type '" "bool""'");
-    } 
-    arg3 = static_cast< bool >(val3);
+    {
+      arg3 = wxString_in_helper(obj2);
+      if (arg3 == NULL) SWIG_fail;
+      temp3 = true;
+    }

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

-    result = (bool)(arg1)->EnumerateFacenames(arg2,arg3);
+    result = (bool)(arg1)->IsEncodingAvailable(arg2,(wxString const &)*arg3);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
   }

+  {
+    if (temp3)
+    delete arg3;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp3)
+    delete arg3;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_FontMapper_SetDialogParent(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
-  wxString const &arg2_defvalue = wxPyEmptyString ;
-  wxString *arg2 = (wxString *) &arg2_defvalue ;
-  bool result;
+  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;

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

-    (char *) "self",(char *) "facename", NULL 
+    (char *) "self",(char *) "parent", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:FontEnumerator_EnumerateEncodings",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetDialogParent",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator_EnumerateEncodings" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_SetDialogParent" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
-  if (obj1) {
-    {
-      arg2 = wxString_in_helper(obj1);
-      if (arg2 == NULL) SWIG_fail;
-      temp2 = true;
-    }
+  arg1 = reinterpret_cast< wxFontMapper * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FontMapper_SetDialogParent" "', expected argument " "2"" of type '" "wxWindow *""'"); 

   }
   }

+  arg2 = reinterpret_cast< wxWindow * >(argp2);

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

-    result = (bool)(arg1)->EnumerateEncodings((wxString const &)*arg2);
+    (arg1)->SetDialogParent(arg2);

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

+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFontMapper *arg1 = (wxFontMapper *) 0 ;
+  wxString *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "title", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontMapper_SetDialogTitle",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontMapper, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontMapper_SetDialogTitle" "', expected argument " "1"" of type '" "wxFontMapper *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFontMapper * >(argp1);

   {
   {

-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetDialogTitle((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_Py_Void();

   {
     if (temp2)
     delete arg2;
   {
     if (temp2)
     delete arg2;


@@ -13595,67 +13876,202 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_FontEnumerator_GetEncodings(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FontMapper_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxFontMapper, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *FontMapper_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Font(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  PyObject *result = 0 ;
+  int arg1 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  bool arg5 = (bool) false ;
+  wxString const &arg6_defvalue = wxPyEmptyString ;
+  wxString *arg6 = (wxString *) &arg6_defvalue ;
+  wxFontEncoding arg7 = (wxFontEncoding) wxFONTENCODING_DEFAULT ;
+  wxFont *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  bool val5 ;
+  int ecode5 = 0 ;
+  bool temp6 = false ;
+  int val7 ;
+  int ecode7 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  char *  kwnames[] = {
+    (char *) "pointSize",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "face",(char *) "encoding", NULL 
+  };

   
   

-  if (!SWIG_Python_UnpackTuple(args,"FontEnumerator_GetEncodings",0,0,0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:new_Font",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Font" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Font" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Font" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Font" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  if (obj4) {
+    ecode5 = SWIG_AsVal_bool(obj4, &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_Font" "', expected argument " "5"" of type '" "bool""'");
+    } 
+    arg5 = static_cast< bool >(val5);
+  }
+  if (obj5) {
+    {
+      arg6 = wxString_in_helper(obj5);
+      if (arg6 == NULL) SWIG_fail;
+      temp6 = true;
+    }
+  }
+  if (obj6) {
+    ecode7 = SWIG_AsVal_int(obj6, &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_Font" "', expected argument " "7"" of type '" "wxFontEncoding""'");
+    } 
+    arg7 = static_cast< wxFontEncoding >(val7);
+  }

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (PyObject *)wxPyFontEnumerator_GetEncodings();
+    result = (wxFont *)new wxFont(arg1,arg2,arg3,arg4,arg5,(wxString const &)*arg6,arg7);

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

-  resultobj = result;
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, SWIG_POINTER_NEW |  0 );
+  {
+    if (temp6)
+    delete arg6;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp6)
+    delete arg6;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_FontEnumerator_GetFacenames(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Font(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  PyObject *result = 0 ;
+  wxFont *arg1 = (wxFont *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!SWIG_Python_UnpackTuple(args,"FontEnumerator_GetFacenames",0,0,0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Font" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);

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

-    result = (PyObject *)wxPyFontEnumerator_GetFacenames();
+    delete arg1;
+    

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

-  resultobj = result;
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_FontEnumerator_IsValidFacename(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_FontFromNativeInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxNativeFontInfo *arg1 = 0 ;
+  wxFont *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "info", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_FontFromNativeInfo",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxNativeFontInfo,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FontFromNativeInfo" "', expected argument " "1"" of type '" "wxNativeFontInfo const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FontFromNativeInfo" "', expected argument " "1"" of type '" "wxNativeFontInfo const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxNativeFontInfo * >(argp1);
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxFont *)new wxFont((wxNativeFontInfo const &)*arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FontFromNativeInfoString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxString *arg1 = 0 ;
   PyObject *resultobj = 0;
   wxString *arg1 = 0 ;

-  bool result;
+  wxFont *result = 0 ;

   bool temp1 = false ;
   PyObject * obj0 = 0 ;
   char *  kwnames[] = {
   bool temp1 = false ;
   PyObject * obj0 = 0 ;
   char *  kwnames[] = {

-    (char *) "str", NULL 
+    (char *) "info", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontEnumerator_IsValidFacename",kwnames,&obj0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_FontFromNativeInfoString",kwnames,&obj0)) SWIG_fail;

   {
     arg1 = wxString_in_helper(obj0);
     if (arg1 == NULL) SWIG_fail;
     temp1 = true;
   }
   {
   {
     arg1 = wxString_in_helper(obj0);
     if (arg1 == NULL) SWIG_fail;
     temp1 = true;
   }
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (bool)wxPyFontEnumerator::IsValidFacename((wxString const &)*arg1);
+    result = (wxFont *)new_wxFont((wxString const &)*arg1);

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );

   {
     if (temp1)
     delete arg1;
   {
     if (temp1)
     delete arg1;


@@ -13670,23 +14086,1732 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *FontEnumerator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPyFontEnumerator, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *FontEnumerator_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_LanguageInfo_Language_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+  int arg1 ;
+  wxFontFamily arg2 ;
+  int arg3 = (int) wxFONTFLAG_DEFAULT ;
+  wxString const &arg4_defvalue = wxPyEmptyString ;
+  wxString *arg4 = (wxString *) &arg4_defvalue ;
+  wxFontEncoding arg5 = (wxFontEncoding) wxFONTENCODING_DEFAULT ;
+  wxFont *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  bool temp4 = false ;
+  int val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  char *  kwnames[] = {
+    (char *) "pointSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_FFont",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FFont" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FFont" "', expected argument " "2"" of type '" "wxFontFamily""'");
+  } 
+  arg2 = static_cast< wxFontFamily >(val2);
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FFont" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }
+  if (obj3) {
+    {
+      arg4 = wxString_in_helper(obj3);
+      if (arg4 == NULL) SWIG_fail;
+      temp4 = true;
+    }
+  }
+  if (obj4) {
+    ecode5 = SWIG_AsVal_int(obj4, &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_FFont" "', expected argument " "5"" of type '" "wxFontEncoding""'");
+    } 
+    arg5 = static_cast< wxFontEncoding >(val5);
+  }
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxFont *)new_wxFont(arg1,arg2,arg3,(wxString const &)*arg4,arg5);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );
+  {
+    if (temp4)
+    delete arg4;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp4)
+    delete arg4;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FontFromPixelSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSize *arg1 = 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  bool arg5 = (bool) false ;
+  wxString const &arg6_defvalue = wxEmptyString ;
+  wxString *arg6 = (wxString *) &arg6_defvalue ;
+  wxFontEncoding arg7 = (wxFontEncoding) wxFONTENCODING_DEFAULT ;
+  wxFont *result = 0 ;
+  wxSize temp1 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  bool val5 ;
+  int ecode5 = 0 ;
+  bool temp6 = false ;
+  int val7 ;
+  int ecode7 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  char *  kwnames[] = {
+    (char *) "pixelSize",(char *) "family",(char *) "style",(char *) "weight",(char *) "underlined",(char *) "face",(char *) "encoding", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:new_FontFromPixelSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = &temp1;
+    if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail;
+  }
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FontFromPixelSize" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FontFromPixelSize" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FontFromPixelSize" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  if (obj4) {
+    ecode5 = SWIG_AsVal_bool(obj4, &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_FontFromPixelSize" "', expected argument " "5"" of type '" "bool""'");
+    } 
+    arg5 = static_cast< bool >(val5);
+  }
+  if (obj5) {
+    {
+      arg6 = wxString_in_helper(obj5);
+      if (arg6 == NULL) SWIG_fail;
+      temp6 = true;
+    }
+  }
+  if (obj6) {
+    ecode7 = SWIG_AsVal_int(obj6, &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_FontFromPixelSize" "', expected argument " "7"" of type '" "wxFontEncoding""'");
+    } 
+    arg7 = static_cast< wxFontEncoding >(val7);
+  }
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxFont *)new_wxFont((wxSize const &)*arg1,arg2,arg3,arg4,arg5,(wxString const &)*arg6,arg7);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );
+  {
+    if (temp6)
+    delete arg6;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp6)
+    delete arg6;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FFontFromPixelSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSize *arg1 = 0 ;
+  wxFontFamily arg2 ;
+  int arg3 = (int) wxFONTFLAG_DEFAULT ;
+  wxString const &arg4_defvalue = wxEmptyString ;
+  wxString *arg4 = (wxString *) &arg4_defvalue ;
+  wxFontEncoding arg5 = (wxFontEncoding) wxFONTENCODING_DEFAULT ;
+  wxFont *result = 0 ;
+  wxSize temp1 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  bool temp4 = false ;
+  int val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  char *  kwnames[] = {
+    (char *) "pixelSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_FFontFromPixelSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = &temp1;
+    if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail;
+  }
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FFontFromPixelSize" "', expected argument " "2"" of type '" "wxFontFamily""'");
+  } 
+  arg2 = static_cast< wxFontFamily >(val2);
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FFontFromPixelSize" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }
+  if (obj3) {
+    {
+      arg4 = wxString_in_helper(obj3);
+      if (arg4 == NULL) SWIG_fail;
+      temp4 = true;
+    }
+  }
+  if (obj4) {
+    ecode5 = SWIG_AsVal_int(obj4, &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_FFontFromPixelSize" "', expected argument " "5"" of type '" "wxFontEncoding""'");
+    } 
+    arg5 = static_cast< wxFontEncoding >(val5);
+  }
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxFont *)new_wxFont((wxSize const &)*arg1,arg2,arg3,(wxString const &)*arg4,arg5);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );
+  {
+    if (temp4)
+    delete arg4;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp4)
+    delete arg4;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_Ok" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)((wxFont const *)arg1)->Ok();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxFont *arg2 = (wxFont *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "other", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font___eq__" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Font___eq__" "', expected argument " "2"" of type '" "wxFont const *""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)wxFont___eq__(arg1,(wxFont const *)arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxFont *arg2 = (wxFont *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "other", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font___ne__" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Font___ne__" "', expected argument " "2"" of type '" "wxFont const *""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)wxFont___ne__(arg1,(wxFont const *)arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetPointSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetPointSize" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxFont const *)arg1)->GetPointSize();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetPixelSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxSize result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetPixelSize" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxFont const *)arg1)->GetPixelSize();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_IsUsingSizeInPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_IsUsingSizeInPixels" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)((wxFont const *)arg1)->IsUsingSizeInPixels();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetFamily(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetFamily" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxFont const *)arg1)->GetFamily();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetStyle" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxFont const *)arg1)->GetStyle();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetWeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetWeight" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxFont const *)arg1)->GetWeight();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetUnderlined(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetUnderlined" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)((wxFont const *)arg1)->GetUnderlined();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetFaceName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetFaceName" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxFont const *)arg1)->GetFaceName();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxFontEncoding result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetEncoding" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxFontEncoding)((wxFont const *)arg1)->GetEncoding();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetNativeFontInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxNativeFontInfo *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetNativeFontInfo" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxNativeFontInfo *)((wxFont const *)arg1)->GetNativeFontInfo();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxNativeFontInfo, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_IsFixedWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_IsFixedWidth" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)((wxFont const *)arg1)->IsFixedWidth();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetNativeFontInfoDesc(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetNativeFontInfoDesc" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxFont const *)arg1)->GetNativeFontInfoDesc();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetNativeFontInfoUserDesc" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxFont const *)arg1)->GetNativeFontInfoUserDesc();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetPointSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pointSize", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetPointSize",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetPointSize" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetPointSize" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetPointSize(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetPixelSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxSize *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxSize temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pixelSize", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetPixelSize",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetPixelSize" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetPixelSize((wxSize const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetFamily(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "family", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetFamily",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetFamily" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetFamily" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetFamily(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "style", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetStyle",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetStyle" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetStyle" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetStyle(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetWeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "weight", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetWeight",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetWeight" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetWeight" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetWeight(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxString *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "faceName", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetFaceName",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetFaceName" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->SetFaceName((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetUnderlined(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "underlined", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetUnderlined",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetUnderlined" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetUnderlined" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetUnderlined(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxFontEncoding arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "encoding", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetEncoding",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetEncoding" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetEncoding" "', expected argument " "2"" of type '" "wxFontEncoding""'");
+  } 
+  arg2 = static_cast< wxFontEncoding >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetEncoding(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxNativeFontInfo *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "info", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetNativeFontInfo",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetNativeFontInfo" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxNativeFontInfo,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Font_SetNativeFontInfo" "', expected argument " "2"" of type '" "wxNativeFontInfo const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Font_SetNativeFontInfo" "', expected argument " "2"" of type '" "wxNativeFontInfo const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxNativeFontInfo * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetNativeFontInfo((wxNativeFontInfo const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxString *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "info", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetNativeFontInfoFromString",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetNativeFontInfoFromString" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->SetNativeFontInfo((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxString *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "info", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetNativeFontInfoUserDesc",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetNativeFontInfoUserDesc" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->SetNativeFontInfoUserDesc((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetFamilyString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetFamilyString" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxFont const *)arg1)->GetFamilyString();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetStyleString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetStyleString" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxFont const *)arg1)->GetStyleString();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetWeightString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetWeightString" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxFont const *)arg1)->GetWeightString();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  bool arg2 = (bool) true ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "no", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Font_SetNoAntiAliasing",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_SetNoAntiAliasing" "', expected argument " "1"" of type '" "wxFont *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_bool(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Font_SetNoAntiAliasing" "', expected argument " "2"" of type '" "bool""'");
+    } 
+    arg2 = static_cast< bool >(val2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetNoAntiAliasing(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFont *arg1 = (wxFont *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Font_GetNoAntiAliasing" "', expected argument " "1"" of type '" "wxFont const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFont * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)((wxFont const *)arg1)->GetNoAntiAliasing();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_GetDefaultEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFontEncoding result;
+  
+  if (!SWIG_Python_UnpackTuple(args,"Font_GetDefaultEncoding",0,0,0)) SWIG_fail;
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxFontEncoding)wxFont::GetDefaultEncoding();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Font_SetDefaultEncoding(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFontEncoding arg1 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "encoding", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_SetDefaultEncoding",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Font_SetDefaultEncoding" "', expected argument " "1"" of type '" "wxFontEncoding""'");
+  } 
+  arg1 = static_cast< wxFontEncoding >(val1);
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxFont::SetDefaultEncoding(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Font_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxFont, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *Font_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FontEnumerator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyFontEnumerator *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_FontEnumerator",0,0,0)) SWIG_fail;
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPyFontEnumerator *)new wxPyFontEnumerator();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyFontEnumerator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FontEnumerator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyFontEnumerator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FontEnumerator" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  bool arg4 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FontEnumerator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
+  arg2 = obj1;
+  arg3 = obj2;
+  ecode4 = SWIG_AsVal_bool(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FontEnumerator__setCallbackInfo" "', expected argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->_setCallbackInfo(arg2,arg3,arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
+  wxFontEncoding arg2 = (wxFontEncoding) wxFONTENCODING_SYSTEM ;
+  bool arg3 = (bool) false ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "encoding",(char *) "fixedWidthOnly", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:FontEnumerator_EnumerateFacenames",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator_EnumerateFacenames" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FontEnumerator_EnumerateFacenames" "', expected argument " "2"" of type '" "wxFontEncoding""'");
+    } 
+    arg2 = static_cast< wxFontEncoding >(val2);
+  }
+  if (obj2) {
+    ecode3 = SWIG_AsVal_bool(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FontEnumerator_EnumerateFacenames" "', expected argument " "3"" of type '" "bool""'");
+    } 
+    arg3 = static_cast< bool >(val3);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->EnumerateFacenames(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
+  wxString const &arg2_defvalue = wxPyEmptyString ;
+  wxString *arg2 = (wxString *) &arg2_defvalue ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "facename", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:FontEnumerator_EnumerateEncodings",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator_EnumerateEncodings" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
+  if (obj1) {
+    {
+      arg2 = wxString_in_helper(obj1);
+      if (arg2 == NULL) SWIG_fail;
+      temp2 = true;
+    }
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->EnumerateEncodings((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FontEnumerator_GetEncodings(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"FontEnumerator_GetEncodings",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (PyObject *)wxPyFontEnumerator_GetEncodings();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FontEnumerator_GetFacenames(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"FontEnumerator_GetFacenames",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (PyObject *)wxPyFontEnumerator_GetFacenames();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FontEnumerator_IsValidFacename(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxString *arg1 = 0 ;
+  bool result;
+  bool temp1 = false ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "str", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontEnumerator_IsValidFacename",kwnames,&obj0)) SWIG_fail;
+  {
+    arg1 = wxString_in_helper(obj0);
+    if (arg1 == NULL) SWIG_fail;
+    temp1 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)wxPyFontEnumerator::IsValidFacename((wxString const &)*arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  {
+    if (temp1)
+    delete arg1;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp1)
+    delete arg1;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *FontEnumerator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPyFontEnumerator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *FontEnumerator_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_LanguageInfo_Language_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;

   int val2 ;
   int ecode2 = 0 ;
   PyObject *swig_obj[2] ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject *swig_obj[2] ;


@@ -14410,6 +16535,38 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_Locale_IsAvailable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  bool result;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "lang", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_IsAvailable",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Locale_IsAvailable" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)wxLocale::IsAvailable(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_Locale_IsLoaded(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxLocale *arg1 = (wxLocale *) 0 ;
 SWIGINTERN PyObject *_wrap_Locale_IsLoaded(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxLocale *arg1 = (wxLocale *) 0 ;


@@ -14507,82 +16664,307 @@ SWIGINTERN PyObject *_wrap_Locale_GetLanguageName(PyObject *SWIGUNUSEDPARM(self)
   arg1 = static_cast< int >(val1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg1 = static_cast< int >(val1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = wxLocale::GetLanguageName(arg1);
+    result = wxLocale::GetLanguageName(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Locale_FindLanguageInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxString *arg1 = 0 ;
+  wxLanguageInfo *result = 0 ;
+  bool temp1 = false ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "locale", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_FindLanguageInfo",kwnames,&obj0)) SWIG_fail;
+  {
+    arg1 = wxString_in_helper(obj0);
+    if (arg1 == NULL) SWIG_fail;
+    temp1 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxLanguageInfo *)wxLocale::FindLanguageInfo((wxString const &)*arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxLanguageInfo, 0 |  0 );
+  {
+    if (temp1)
+    delete arg1;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp1)
+    delete arg1;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Locale_AddLanguage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxLanguageInfo *arg1 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "info", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_AddLanguage",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxLanguageInfo,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Locale_AddLanguage" "', expected argument " "1"" of type '" "wxLanguageInfo const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Locale_AddLanguage" "', expected argument " "1"" of type '" "wxLanguageInfo const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxLanguageInfo * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxLocale::AddLanguage((wxLanguageInfo const &)*arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Locale_GetString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxLocale *arg1 = (wxLocale *) 0 ;
+  wxString *arg2 = 0 ;
+  wxString const &arg3_defvalue = wxPyEmptyString ;
+  wxString *arg3 = (wxString *) &arg3_defvalue ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  bool temp3 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "szOrigString",(char *) "szDomain", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Locale_GetString",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxLocale, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Locale_GetString" "', expected argument " "1"" of type '" "wxLocale const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxLocale * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  if (obj2) {
+    {
+      arg3 = wxString_in_helper(obj2);
+      if (arg3 == NULL) SWIG_fail;
+      temp3 = true;
+    }
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxLocale const *)arg1)->GetString((wxString const &)*arg2,(wxString const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }
+  {
+    if (temp3)
+    delete arg3;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  {
+    if (temp3)
+    delete arg3;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Locale_GetName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxLocale *arg1 = (wxLocale *) 0 ;
+  wxString *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxLocale, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Locale_GetName" "', expected argument " "1"" of type '" "wxLocale const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxLocale * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxString const &_result_ref = ((wxLocale const *)arg1)->GetName();
+      result = (wxString *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
+#else
+    resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Locale_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxLocale, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *Locale_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_PyLocale(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  int arg1 = (int) -1 ;
+  int arg2 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ;
+  wxPyLocale *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "language",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyLocale",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (obj0) {
+    ecode1 = SWIG_AsVal_int(obj0, &val1);
+    if (!SWIG_IsOK(ecode1)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_PyLocale" "', expected argument " "1"" of type '" "int""'");
+    } 
+    arg1 = static_cast< int >(val1);
+  }
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_PyLocale" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPyLocale *)new_wxPyLocale(arg1,arg2);

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

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyLocale, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_Locale_FindLanguageInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_delete_PyLocale(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxString *arg1 = 0 ;
-  wxLanguageInfo *result = 0 ;
-  bool temp1 = false ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "locale", NULL 
-  };
+  wxPyLocale *arg1 = (wxPyLocale *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_FindLanguageInfo",kwnames,&obj0)) SWIG_fail;
-  {
-    arg1 = wxString_in_helper(obj0);
-    if (arg1 == NULL) SWIG_fail;
-    temp1 = true;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyLocale, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PyLocale" "', expected argument " "1"" of type '" "wxPyLocale *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxPyLocale * >(argp1);

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

-    result = (wxLanguageInfo *)wxLocale::FindLanguageInfo((wxString const &)*arg1);
+    delete arg1;
+    

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxLanguageInfo, 0 |  0 );
-  {
-    if (temp1)
-    delete arg1;
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp1)
-    delete arg1;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Locale_AddLanguage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyLocale__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxLanguageInfo *arg1 = 0 ;
+  wxPyLocale *arg1 = (wxPyLocale *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;

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

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

-    (char *) "info", NULL 
+    (char *) "self",(char *) "self",(char *) "_class", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_AddLanguage",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxLanguageInfo,  0  | 0);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLocale__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyLocale, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Locale_AddLanguage" "', expected argument " "1"" of type '" "wxLanguageInfo const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Locale_AddLanguage" "', expected argument " "1"" of type '" "wxLanguageInfo const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyLocale__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyLocale *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxLanguageInfo * >(argp1);
+  arg1 = reinterpret_cast< wxPyLocale * >(argp1);
+  arg2 = obj1;
+  arg3 = obj2;

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

-    wxLocale::AddLanguage((wxLanguageInfo const &)*arg1);
+    (arg1)->_setCallbackInfo(arg2,arg3);

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


@@ -14593,17 +16975,18 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Locale_GetString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyLocale_GetSingularString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxLocale *arg1 = (wxLocale *) 0 ;
-  wxString *arg2 = 0 ;
-  wxString const &arg3_defvalue = wxPyEmptyString ;
-  wxString *arg3 = (wxString *) &arg3_defvalue ;
-  wxString result;
+  wxPyLocale *arg1 = (wxPyLocale *) 0 ;
+  wxChar *arg2 = (wxChar *) 0 ;
+  wxChar *arg3 = (wxChar *) NULL ;
+  wxChar *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
-  bool temp3 = false ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;

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


@@ -14611,104 +16994,113 @@ SWIGINTERN PyObject *_wrap_Locale_GetString(PyObject *SWIGUNUSEDPARM(self), PyOb
     (char *) "self",(char *) "szOrigString",(char *) "szDomain", NULL 
   };
   
     (char *) "self",(char *) "szOrigString",(char *) "szDomain", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Locale_GetString",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxLocale, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyLocale_GetSingularString",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyLocale, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Locale_GetString" "', expected argument " "1"" of type '" "wxLocale const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyLocale_GetSingularString" "', expected argument " "1"" of type '" "wxPyLocale const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxLocale * >(argp1);
-  {
-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+  arg1 = reinterpret_cast< wxPyLocale * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxChar, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyLocale_GetSingularString" "', expected argument " "2"" of type '" "wxChar const *""'"); 

   }
   }

+  arg2 = reinterpret_cast< wxChar * >(argp2);

   if (obj2) {
   if (obj2) {

-    {
-      arg3 = wxString_in_helper(obj2);
-      if (arg3 == NULL) SWIG_fail;
-      temp3 = true;
+    res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxChar, 0 |  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PyLocale_GetSingularString" "', expected argument " "3"" of type '" "wxChar const *""'"); 

     }
     }

+    arg3 = reinterpret_cast< wxChar * >(argp3);

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

-    result = ((wxLocale const *)arg1)->GetString((wxString const &)*arg2,(wxString const &)*arg3);
+    result = (wxChar *)((wxPyLocale const *)arg1)->GetSingularString((wxChar const *)arg2,(wxChar const *)arg3);

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

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-  }
-  {
-    if (temp2)
-    delete arg2;
-  }
-  {
-    if (temp3)
-    delete arg3;
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxChar, 0 |  0 );

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp2)
-    delete arg2;
-  }
-  {
-    if (temp3)
-    delete arg3;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Locale_GetName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyLocale_GetPluralString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxLocale *arg1 = (wxLocale *) 0 ;
-  wxString *result = 0 ;
+  wxPyLocale *arg1 = (wxPyLocale *) 0 ;
+  wxChar *arg2 = (wxChar *) 0 ;
+  wxChar *arg3 = (wxChar *) 0 ;
+  size_t arg4 ;
+  wxChar *arg5 = (wxChar *) NULL ;
+  wxChar *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  size_t val4 ;
+  int ecode4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "szOrigString",(char *) "szOrigString2",(char *) "n",(char *) "szDomain", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxLocale, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyLocale_GetPluralString",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyLocale, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Locale_GetName" "', expected argument " "1"" of type '" "wxLocale const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyLocale_GetPluralString" "', expected argument " "1"" of type '" "wxPyLocale const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyLocale * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxChar, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyLocale_GetPluralString" "', expected argument " "2"" of type '" "wxChar const *""'"); 
+  }
+  arg2 = reinterpret_cast< wxChar * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxChar, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PyLocale_GetPluralString" "', expected argument " "3"" of type '" "wxChar const *""'"); 
+  }
+  arg3 = reinterpret_cast< wxChar * >(argp3);
+  ecode4 = SWIG_AsVal_size_t(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyLocale_GetPluralString" "', expected argument " "4"" of type '" "size_t""'");
+  } 
+  arg4 = static_cast< size_t >(val4);
+  if (obj4) {
+    res5 = SWIG_ConvertPtr(obj4, &argp5,SWIGTYPE_p_wxChar, 0 |  0 );
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "PyLocale_GetPluralString" "', expected argument " "5"" of type '" "wxChar const *""'"); 
+    }
+    arg5 = reinterpret_cast< wxChar * >(argp5);

   }
   }

-  arg1 = reinterpret_cast< wxLocale * >(argp1);

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

-    {
-      wxString const &_result_ref = ((wxLocale const *)arg1)->GetName();
-      result = (wxString *) &_result_ref;
-    }
+    result = (wxChar *)((wxPyLocale const *)arg1)->GetPluralString((wxChar const *)arg2,(wxChar const *)arg3,arg4,(wxChar const *)arg5);

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

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
-#else
-    resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
-#endif
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxChar, 0 |  0 );

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

-SWIGINTERN PyObject *Locale_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *PyLocale_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxLocale, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPyLocale, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *Locale_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *PyLocale_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 


@@ -14736,15 +17128,123 @@ SWIGINTERN PyObject *_wrap_GetTranslation__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   wxString result;
   bool temp1 = false ;
   
   wxString result;
   bool temp1 = false ;
   

-  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  {
+    arg1 = wxString_in_helper(swig_obj[0]);
+    if (arg1 == NULL) SWIG_fail;
+    temp1 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxGetTranslation((wxString const &)*arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  {
+    if (temp1)
+    delete arg1;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp1)
+    delete arg1;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetTranslation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
+  PyObject *resultobj = 0;
+  wxString *arg1 = 0 ;
+  wxString *arg2 = 0 ;
+  wxString result;
+  bool temp1 = false ;
+  bool temp2 = false ;
+  
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  {
+    arg1 = wxString_in_helper(swig_obj[0]);
+    if (arg1 == NULL) SWIG_fail;
+    temp1 = true;
+  }
+  {
+    arg2 = wxString_in_helper(swig_obj[1]);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxGetTranslation((wxString const &)*arg1,(wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  {
+    if (temp1)
+    delete arg1;
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp1)
+    delete arg1;
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetTranslation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
+  PyObject *resultobj = 0;
+  wxString *arg1 = 0 ;
+  wxString *arg2 = 0 ;
+  size_t arg3 ;
+  wxString result;
+  bool temp1 = false ;
+  bool temp2 = false ;
+  size_t val3 ;
+  int ecode3 = 0 ;
+  
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;

   {
     arg1 = wxString_in_helper(swig_obj[0]);
     if (arg1 == NULL) SWIG_fail;
     temp1 = true;
   }
   {
     arg1 = wxString_in_helper(swig_obj[0]);
     if (arg1 == NULL) SWIG_fail;
     temp1 = true;
   }

+  {
+    arg2 = wxString_in_helper(swig_obj[1]);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "GetTranslation" "', expected argument " "3"" of type '" "size_t""'");
+  } 
+  arg3 = static_cast< size_t >(val3);

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

-    result = wxGetTranslation((wxString const &)*arg1);
+    result = wxGetTranslation((wxString const &)*arg1,(wxString const &)*arg2,arg3);

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


@@ -14759,28 +17259,38 @@ SWIGINTERN PyObject *_wrap_GetTranslation__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
     if (temp1)
     delete arg1;
   }
     if (temp1)
     delete arg1;
   }

+  {
+    if (temp2)
+    delete arg2;
+  }

   return resultobj;
 fail:
   {
     if (temp1)
     delete arg1;
   }
   return resultobj;
 fail:
   {
     if (temp1)
     delete arg1;
   }

+  {
+    if (temp2)
+    delete arg2;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_GetTranslation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_GetTranslation__SWIG_3(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   wxString *arg1 = 0 ;
   wxString *arg2 = 0 ;
   size_t arg3 ;
   PyObject *resultobj = 0;
   wxString *arg1 = 0 ;
   wxString *arg2 = 0 ;
   size_t arg3 ;

+  wxString *arg4 = 0 ;

   wxString result;
   bool temp1 = false ;
   bool temp2 = false ;
   size_t val3 ;
   int ecode3 = 0 ;
   wxString result;
   bool temp1 = false ;
   bool temp2 = false ;
   size_t val3 ;
   int ecode3 = 0 ;

+  bool temp4 = false ;

   
   

-  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;

   {
     arg1 = wxString_in_helper(swig_obj[0]);
     if (arg1 == NULL) SWIG_fail;
   {
     arg1 = wxString_in_helper(swig_obj[0]);
     if (arg1 == NULL) SWIG_fail;


@@ -14796,9 +17306,14 @@ SWIGINTERN PyObject *_wrap_GetTranslation__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "GetTranslation" "', expected argument " "3"" of type '" "size_t""'");
   } 
   arg3 = static_cast< size_t >(val3);
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "GetTranslation" "', expected argument " "3"" of type '" "size_t""'");
   } 
   arg3 = static_cast< size_t >(val3);

+  {
+    arg4 = wxString_in_helper(swig_obj[3]);
+    if (arg4 == NULL) SWIG_fail;
+    temp4 = true;
+  }

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

-    result = wxGetTranslation((wxString const &)*arg1,(wxString const &)*arg2,arg3);
+    result = wxGetTranslation((wxString const &)*arg1,(wxString const &)*arg2,arg3,(wxString const &)*arg4);

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


@@ -14817,6 +17332,10 @@ SWIGINTERN PyObject *_wrap_GetTranslation__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
     if (temp2)
     delete arg2;
   }
     if (temp2)
     delete arg2;
   }

+  {
+    if (temp4)
+    delete arg4;
+  }

   return resultobj;
 fail:
   {
   return resultobj;
 fail:
   {


@@ -14827,22 +17346,32 @@ fail:
     if (temp2)
     delete arg2;
   }
     if (temp2)
     delete arg2;
   }

+  {
+    if (temp4)
+    delete arg4;
+  }

   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_GetTranslation(PyObject *self, PyObject *args) {
   int argc;
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_GetTranslation(PyObject *self, PyObject *args) {
   int argc;

-  PyObject *argv[4];
+  PyObject *argv[5];

   
   

-  if (!(argc = SWIG_Python_UnpackTuple(args,"GetTranslation",0,3,argv))) SWIG_fail;
+  if (!(argc = SWIG_Python_UnpackTuple(args,"GetTranslation",0,4,argv))) SWIG_fail;

   --argc;
   if (argc == 1) {
     return _wrap_GetTranslation__SWIG_0(self, argc, argv);
   }
   --argc;
   if (argc == 1) {
     return _wrap_GetTranslation__SWIG_0(self, argc, argv);
   }

-  if (argc == 3) {
+  if (argc == 2) {

     return _wrap_GetTranslation__SWIG_1(self, argc, argv);
   }
     return _wrap_GetTranslation__SWIG_1(self, argc, argv);
   }

+  if (argc == 3) {
+    return _wrap_GetTranslation__SWIG_2(self, argc, argv);
+  }
+  if (argc == 4) {
+    return _wrap_GetTranslation__SWIG_3(self, argc, argv);
+  }

   
 fail:
   SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'GetTranslation'");
   
 fail:
   SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'GetTranslation'");


@@ -20229,7 +22758,230 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_DC_SetDeviceOrigin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_DC_SetDeviceOrigin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxDC *arg1 = (wxDC *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "x",(char *) "y", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetDeviceOrigin",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_SetDeviceOrigin" "', expected argument " "1"" of type '" "wxDC *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDC * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DC_SetDeviceOrigin" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DC_SetDeviceOrigin" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetDeviceOrigin(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DC_SetDeviceOriginPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxDC *arg1 = (wxDC *) 0 ;
+  wxPoint *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxPoint temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "point", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetDeviceOriginPoint",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_SetDeviceOriginPoint" "', expected argument " "1"" of type '" "wxDC *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDC * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxDC_SetDeviceOriginPoint(arg1,(wxPoint const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DC_SetAxisOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxDC *arg1 = (wxDC *) 0 ;
+  bool arg2 ;
+  bool arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "xLeftRight",(char *) "yBottomUp", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetAxisOrientation",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_SetAxisOrientation" "', expected argument " "1"" of type '" "wxDC *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDC * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DC_SetAxisOrientation" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DC_SetAxisOrientation" "', expected argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetAxisOrientation(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DC_GetLogicalFunction(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxDC *arg1 = (wxDC *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_GetLogicalFunction" "', expected argument " "1"" of type '" "wxDC const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDC * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxDC const *)arg1)->GetLogicalFunction();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DC_SetLogicalFunction(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxDC *arg1 = (wxDC *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "function", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetLogicalFunction",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_SetLogicalFunction" "', expected argument " "1"" of type '" "wxDC *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDC * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DC_SetLogicalFunction" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetLogicalFunction(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DC_ComputeScaleAndOrigin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxDC *arg1 = (wxDC *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_ComputeScaleAndOrigin" "', expected argument " "1"" of type '" "wxDC *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDC * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->ComputeScaleAndOrigin();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DC_CalcBoundingBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;
   int arg2 ;
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;
   int arg2 ;


@@ -20247,25 +22999,25 @@ SWIGINTERN PyObject *_wrap_DC_SetDeviceOrigin(PyObject *SWIGUNUSEDPARM(self), Py
     (char *) "self",(char *) "x",(char *) "y", NULL 
   };
   
     (char *) "self",(char *) "x",(char *) "y", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetDeviceOrigin",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CalcBoundingBox",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_SetDeviceOrigin" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_CalcBoundingBox" "', expected argument " "1"" of type '" "wxDC *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DC_SetDeviceOrigin" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DC_CalcBoundingBox" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DC_SetDeviceOrigin" "', expected argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DC_CalcBoundingBox" "', expected argument " "3"" of type '" "int""'");

   } 
   arg3 = static_cast< int >(val3);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   } 
   arg3 = static_cast< int >(val3);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetDeviceOrigin(arg2,arg3);
+    (arg1)->CalcBoundingBox(arg2,arg3);

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


@@ -20276,7 +23028,7 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_DC_SetDeviceOriginPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_DC_CalcBoundingBoxPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;
   wxPoint *arg2 = 0 ;
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;
   wxPoint *arg2 = 0 ;


@@ -20289,10 +23041,10 @@ SWIGINTERN PyObject *_wrap_DC_SetDeviceOriginPoint(PyObject *SWIGUNUSEDPARM(self
     (char *) "self",(char *) "point", NULL 
   };
   
     (char *) "self",(char *) "point", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetDeviceOriginPoint",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_CalcBoundingBoxPoint",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_SetDeviceOriginPoint" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_CalcBoundingBoxPoint" "', expected argument " "1"" of type '" "wxDC *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   {


@@ -20301,7 +23053,7 @@ SWIGINTERN PyObject *_wrap_DC_SetDeviceOriginPoint(PyObject *SWIGUNUSEDPARM(self
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    wxDC_SetDeviceOriginPoint(arg1,(wxPoint const &)*arg2);
+    wxDC_CalcBoundingBoxPoint(arg1,(wxPoint const &)*arg2);

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


@@ -20312,43 +23064,23 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_DC_SetAxisOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_DC_ResetBoundingBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

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

-  bool arg2 ;
-  bool arg3 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  bool val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "xLeftRight",(char *) "yBottomUp", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetAxisOrientation",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_SetAxisOrientation" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_ResetBoundingBox" "', expected argument " "1"" of type '" "wxDC *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DC_SetAxisOrientation" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);
-  ecode3 = SWIG_AsVal_bool(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DC_SetAxisOrientation" "', expected argument " "3"" of type '" "bool""'");
-  } 
-  arg3 = static_cast< bool >(val3);

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

-    (arg1)->SetAxisOrientation(arg2,arg3);
+    (arg1)->ResetBoundingBox();

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


@@ -20359,7 +23091,7 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_DC_GetLogicalFunction(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DC_MinX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;
   int result;
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;
   int result;


@@ -20371,12 +23103,12 @@ SWIGINTERN PyObject *_wrap_DC_GetLogicalFunction(PyObject *SWIGUNUSEDPARM(self),
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_GetLogicalFunction" "', expected argument " "1"" of type '" "wxDC const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_MinX" "', expected argument " "1"" of type '" "wxDC const *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (int)((wxDC const *)arg1)->GetLogicalFunction();
+    result = (int)((wxDC const *)arg1)->MinX();

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


@@ -20387,47 +23119,38 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_DC_SetLogicalFunction(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_DC_MaxX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

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

-  int arg2 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "function", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetLogicalFunction",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_SetLogicalFunction" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_MaxX" "', expected argument " "1"" of type '" "wxDC const *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);

-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DC_SetLogicalFunction" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);

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

-    (arg1)->SetLogicalFunction(arg2);
+    result = (int)((wxDC const *)arg1)->MaxX();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_DC_ComputeScaleAndOrigin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DC_MinY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

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

+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -20436,637 +23159,813 @@ SWIGINTERN PyObject *_wrap_DC_ComputeScaleAndOrigin(PyObject *SWIGUNUSEDPARM(sel
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_ComputeScaleAndOrigin" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_MinY" "', expected argument " "1"" of type '" "wxDC const *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->ComputeScaleAndOrigin();
+    result = (int)((wxDC const *)arg1)->MinY();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_DC_CalcBoundingBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_DC_MaxY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

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

-  int arg2 ;
-  int arg3 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "x",(char *) "y", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CalcBoundingBox",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_CalcBoundingBox" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_MaxY" "', expected argument " "1"" of type '" "wxDC const *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);

-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DC_CalcBoundingBox" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DC_CalcBoundingBox" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);

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

-    (arg1)->CalcBoundingBox(arg2,arg3);
+    result = (int)((wxDC const *)arg1)->MaxY();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DC_GetBoundingBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxDC *arg1 = (wxDC *) 0 ;
+  int *arg2 = (int *) 0 ;
+  int *arg3 = (int *) 0 ;
+  int *arg4 = (int *) 0 ;
+  int *arg5 = (int *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int temp2 ;
+  int res2 = SWIG_TMPOBJ ;
+  int temp3 ;
+  int res3 = SWIG_TMPOBJ ;
+  int temp4 ;
+  int res4 = SWIG_TMPOBJ ;
+  int temp5 ;
+  int res5 = SWIG_TMPOBJ ;
+  PyObject *swig_obj[1] ;
+  
+  arg2 = &temp2;
+  arg3 = &temp3;
+  arg4 = &temp4;
+  arg5 = &temp5;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_GetBoundingBox" "', expected argument " "1"" of type '" "wxDC *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDC * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxDC_GetBoundingBox(arg1,arg2,arg3,arg4,arg5);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();

+  if (SWIG_IsTmpObj(res2)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg2)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, new_flags));
+  }
+  if (SWIG_IsTmpObj(res3)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags));
+  }
+  if (SWIG_IsTmpObj(res4)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg4)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res4) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, new_flags));
+  }
+  if (SWIG_IsTmpObj(res5)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg5)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res5) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_int, new_flags));
+  }

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

-SWIGINTERN PyObject *_wrap_DC_CalcBoundingBoxPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_DC_GetHDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

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

-  wxPoint *arg2 = 0 ;
+  long result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_GetHDC" "', expected argument " "1"" of type '" "wxDC *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDC * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (long)(arg1)->GetHDC();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_long(static_cast< long >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DC__DrawPointList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxDC *arg1 = (wxDC *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  PyObject *arg4 = (PyObject *) 0 ;
+  PyObject *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint temp2 ;

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

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

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

-    (char *) "self",(char *) "point", NULL 
+    (char *) "self",(char *) "pyCoords",(char *) "pyPens",(char *) "pyBrushes", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_CalcBoundingBoxPoint",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawPointList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_CalcBoundingBoxPoint" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC__DrawPointList" "', expected argument " "1"" of type '" "wxDC *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);

-  {
-    arg2 = &temp2;
-    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
+  arg2 = obj1;
+  arg3 = obj2;
+  arg4 = obj3;

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

-    wxDC_CalcBoundingBoxPoint(arg1,(wxPoint const &)*arg2);
+    result = (PyObject *)wxDC__DrawPointList(arg1,arg2,arg3,arg4);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = result;

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

-SWIGINTERN PyObject *_wrap_DC_ResetBoundingBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DC__DrawLineList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

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

+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  PyObject *arg4 = (PyObject *) 0 ;
+  PyObject *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pyCoords",(char *) "pyPens",(char *) "pyBrushes", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawLineList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_ResetBoundingBox" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC__DrawLineList" "', expected argument " "1"" of type '" "wxDC *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);

+  arg2 = obj1;
+  arg3 = obj2;
+  arg4 = obj3;

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

-    (arg1)->ResetBoundingBox();
+    result = (PyObject *)wxDC__DrawLineList(arg1,arg2,arg3,arg4);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = result;

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

-SWIGINTERN PyObject *_wrap_DC_MinX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DC__DrawRectangleList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

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

-  int result;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  PyObject *arg4 = (PyObject *) 0 ;
+  PyObject *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pyCoords",(char *) "pyPens",(char *) "pyBrushes", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawRectangleList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_MinX" "', expected argument " "1"" of type '" "wxDC const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC__DrawRectangleList" "', expected argument " "1"" of type '" "wxDC *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);

+  arg2 = obj1;
+  arg3 = obj2;
+  arg4 = obj3;

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

-    result = (int)((wxDC const *)arg1)->MinX();
+    result = (PyObject *)wxDC__DrawRectangleList(arg1,arg2,arg3,arg4);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = result;

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

-SWIGINTERN PyObject *_wrap_DC_MaxX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DC__DrawEllipseList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

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

-  int result;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  PyObject *arg4 = (PyObject *) 0 ;
+  PyObject *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pyCoords",(char *) "pyPens",(char *) "pyBrushes", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawEllipseList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_MaxX" "', expected argument " "1"" of type '" "wxDC const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC__DrawEllipseList" "', expected argument " "1"" of type '" "wxDC *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);

+  arg2 = obj1;
+  arg3 = obj2;
+  arg4 = obj3;

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

-    result = (int)((wxDC const *)arg1)->MaxX();
+    result = (PyObject *)wxDC__DrawEllipseList(arg1,arg2,arg3,arg4);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = result;

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

-SWIGINTERN PyObject *_wrap_DC_MinY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DC__DrawPolygonList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

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

-  int result;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  PyObject *arg4 = (PyObject *) 0 ;
+  PyObject *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pyCoords",(char *) "pyPens",(char *) "pyBrushes", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawPolygonList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_MinY" "', expected argument " "1"" of type '" "wxDC const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC__DrawPolygonList" "', expected argument " "1"" of type '" "wxDC *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);

+  arg2 = obj1;
+  arg3 = obj2;
+  arg4 = obj3;

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

-    result = (int)((wxDC const *)arg1)->MinY();
+    result = (PyObject *)wxDC__DrawPolygonList(arg1,arg2,arg3,arg4);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = result;

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

-SWIGINTERN PyObject *_wrap_DC_MaxY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DC__DrawTextList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

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

-  int result;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  PyObject *arg4 = (PyObject *) 0 ;
+  PyObject *arg5 = (PyObject *) 0 ;
+  PyObject *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "textList",(char *) "pyPoints",(char *) "foregroundList",(char *) "backgroundList", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC__DrawTextList",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_MaxY" "', expected argument " "1"" of type '" "wxDC const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC__DrawTextList" "', expected argument " "1"" of type '" "wxDC *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);

+  arg2 = obj1;
+  arg3 = obj2;
+  arg4 = obj3;
+  arg5 = obj4;

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

-    result = (int)((wxDC const *)arg1)->MaxY();
+    result = (PyObject *)wxDC__DrawTextList(arg1,arg2,arg3,arg4,arg5);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = result;

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

-SWIGINTERN PyObject *_wrap_DC_GetBoundingBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *DC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxDC, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxDC *arg1 = (wxDC *) 0 ;
-  int *arg2 = (int *) 0 ;
-  int *arg3 = (int *) 0 ;
-  int *arg4 = (int *) 0 ;
-  int *arg5 = (int *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int temp2 ;
-  int res2 = SWIG_TMPOBJ ;
-  int temp3 ;
-  int res3 = SWIG_TMPOBJ ;
-  int temp4 ;
-  int res4 = SWIG_TMPOBJ ;
-  int temp5 ;
-  int res5 = SWIG_TMPOBJ ;
-  PyObject *swig_obj[1] ;
+  wxMemoryDC *result = 0 ;

   
   

-  arg2 = &temp2;
-  arg3 = &temp3;
-  arg4 = &temp4;
-  arg5 = &temp5;
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_GetBoundingBox" "', expected argument " "1"" of type '" "wxDC *""'"); 
-  }
-  arg1 = reinterpret_cast< wxDC * >(argp1);
+  if (!SWIG_Python_UnpackTuple(args,"new_MemoryDC",0,0,0)) SWIG_fail;

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    wxDC_GetBoundingBox(arg1,arg2,arg3,arg4,arg5);
+    result = (wxMemoryDC *)new wxMemoryDC();

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

-  resultobj = SWIG_Py_Void();
-  if (SWIG_IsTmpObj(res2)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg2)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, new_flags));
-  }
-  if (SWIG_IsTmpObj(res3)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags));
-  }
-  if (SWIG_IsTmpObj(res4)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg4)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res4) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, new_flags));
-  }
-  if (SWIG_IsTmpObj(res5)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg5)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res5) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_int, new_flags));
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_DC_GetHDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_MemoryDCFromDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

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

-  long result;
+  wxMemoryDC *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "oldDC", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_MemoryDCFromDC",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_GetHDC" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDCFromDC" "', expected argument " "1"" of type '" "wxDC *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (long)(arg1)->GetHDC();
+    result = (wxMemoryDC *)new wxMemoryDC(arg1);

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

-  resultobj = SWIG_From_long(static_cast< long >(result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_DC__DrawPointList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxDC *arg1 = (wxDC *) 0 ;
-  PyObject *arg2 = (PyObject *) 0 ;
-  PyObject *arg3 = (PyObject *) 0 ;
-  PyObject *arg4 = (PyObject *) 0 ;
-  PyObject *result = 0 ;
+  wxMemoryDC *arg1 = (wxMemoryDC *) 0 ;
+  wxBitmap *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  void *argp2 = 0 ;
+  int res2 = 0 ;

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

-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;

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

-    (char *) "self",(char *) "pyCoords",(char *) "pyPens",(char *) "pyBrushes", NULL 
+    (char *) "self",(char *) "bitmap", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawPointList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObject",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC__DrawPointList" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxDC * >(argp1);
-  arg2 = obj1;
-  arg3 = obj2;
-  arg4 = obj3;
+  arg1 = reinterpret_cast< wxMemoryDC * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);

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

-    result = (PyObject *)wxDC__DrawPointList(arg1,arg2,arg3,arg4);
+    (arg1)->SelectObject((wxBitmap const &)*arg2);

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

-  resultobj = result;
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_DC__DrawLineList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *MemoryDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxMemoryDC, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *MemoryDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

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

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

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "pyCoords",(char *) "pyPens",(char *) "pyBrushes", NULL 
-  };
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawLineList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC__DrawLineList" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_BufferedDC" "', expected argument " "1"" of type '" "wxDC *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);

-  arg2 = obj1;
-  arg3 = obj2;
-  arg4 = obj3;
+  if (swig_obj[1]) {
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+    }
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+    }
+    arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  }
+  if (swig_obj[2]) {
+    ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_BufferedDC" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (PyObject *)wxDC__DrawLineList(arg1,arg2,arg3,arg4);
+    result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2,arg3);

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

-  resultobj = result;
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBufferedDC, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_DC__DrawRectangleList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

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

-  PyObject *arg2 = (PyObject *) 0 ;
-  PyObject *arg3 = (PyObject *) 0 ;
-  PyObject *arg4 = (PyObject *) 0 ;
-  PyObject *result = 0 ;
+  wxSize *arg2 = 0 ;
+  int arg3 = (int) wxBUFFER_CLIENT_AREA ;
+  wxBufferedDC *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "pyCoords",(char *) "pyPens",(char *) "pyBrushes", NULL 
-  };
+  wxSize temp2 ;
+  int val3 ;
+  int ecode3 = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawRectangleList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC__DrawRectangleList" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_BufferedDC" "', expected argument " "1"" of type '" "wxDC *""'"); 

   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);

-  arg2 = obj1;
-  arg3 = obj2;
-  arg4 = obj3;

   {
   {

+    arg2 = &temp2;
+    if ( ! wxSize_helper(swig_obj[1], &arg2)) SWIG_fail;
+  }
+  if (swig_obj[2]) {
+    ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_BufferedDC" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (PyObject *)wxDC__DrawRectangleList(arg1,arg2,arg3,arg4);
+    result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2,arg3);

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

-  resultobj = result;
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBufferedDC, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_DC__DrawEllipseList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  
+  if (!(argc = SWIG_Python_UnpackTuple(args,"new_BufferedDC",0,3,argv))) SWIG_fail;
+  --argc;
+  if ((argc >= 1) && (argc <= 3)) {
+    int _v = 0;
+    if (argc > 1) {
+      {
+        int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_wxBitmap, 0);
+        _v = SWIG_CheckState(res);
+      }
+      if (!_v) goto check_1;
+    }
+    return _wrap_new_BufferedDC__SWIG_0(self, argc, argv);
+  }
+check_1:
+  
+  if ((argc >= 2) && (argc <= 3)) {
+    return _wrap_new_BufferedDC__SWIG_1(self, argc, argv);
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_BufferedDC'");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_BufferedDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxDC *arg1 = (wxDC *) 0 ;
-  PyObject *arg2 = (PyObject *) 0 ;
-  PyObject *arg3 = (PyObject *) 0 ;
-  PyObject *arg4 = (PyObject *) 0 ;
-  PyObject *result = 0 ;
+  wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "pyCoords",(char *) "pyPens",(char *) "pyBrushes", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawEllipseList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBufferedDC, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC__DrawEllipseList" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BufferedDC" "', expected argument " "1"" of type '" "wxBufferedDC *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxDC * >(argp1);
-  arg2 = obj1;
-  arg3 = obj2;
-  arg4 = obj3;
+  arg1 = reinterpret_cast< wxBufferedDC * >(argp1);

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

-    result = (PyObject *)wxDC__DrawEllipseList(arg1,arg2,arg3,arg4);
+    delete arg1;
+    

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

-  resultobj = result;
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_DC__DrawPolygonList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_BufferedDC_UnMask(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxDC *arg1 = (wxDC *) 0 ;
-  PyObject *arg2 = (PyObject *) 0 ;
-  PyObject *arg3 = (PyObject *) 0 ;
-  PyObject *arg4 = (PyObject *) 0 ;
-  PyObject *result = 0 ;
+  wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "pyCoords",(char *) "pyPens",(char *) "pyBrushes", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC__DrawPolygonList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBufferedDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC__DrawPolygonList" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BufferedDC_UnMask" "', expected argument " "1"" of type '" "wxBufferedDC *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxDC * >(argp1);
-  arg2 = obj1;
-  arg3 = obj2;
-  arg4 = obj3;
+  arg1 = reinterpret_cast< wxBufferedDC * >(argp1);

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

-    result = (PyObject *)wxDC__DrawPolygonList(arg1,arg2,arg3,arg4);
+    (arg1)->UnMask();

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

-  resultobj = result;
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_DC__DrawTextList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *BufferedDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxBufferedDC, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *BufferedDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxDC *arg1 = (wxDC *) 0 ;
-  PyObject *arg2 = (PyObject *) 0 ;
-  PyObject *arg3 = (PyObject *) 0 ;
-  PyObject *arg4 = (PyObject *) 0 ;
-  PyObject *arg5 = (PyObject *) 0 ;
-  PyObject *result = 0 ;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxBitmap const &arg2_defvalue = wxNullBitmap ;
+  wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
+  int arg3 = (int) wxBUFFER_CLIENT_AREA ;
+  wxBufferedPaintDC *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;

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

-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;

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

-    (char *) "self",(char *) "textList",(char *) "pyPoints",(char *) "foregroundList",(char *) "backgroundList", NULL 
+    (char *) "window",(char *) "buffer",(char *) "style", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC__DrawTextList",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_BufferedPaintDC",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC__DrawTextList" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_BufferedPaintDC" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  if (obj1) {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+    }
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+    }
+    arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  }
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_BufferedPaintDC" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);

   }
   }

-  arg1 = reinterpret_cast< wxDC * >(argp1);
-  arg2 = obj1;
-  arg3 = obj2;
-  arg4 = obj3;
-  arg5 = obj4;

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (PyObject *)wxDC__DrawTextList(arg1,arg2,arg3,arg4,arg5);
+    result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2,arg3);

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

-  resultobj = result;
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBufferedPaintDC, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *DC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *BufferedPaintDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxDC, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxBufferedPaintDC, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *BufferedPaintDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_ScreenDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMemoryDC *result = 0 ;
+  wxScreenDC *result = 0 ;

   
   

-  if (!SWIG_Python_UnpackTuple(args,"new_MemoryDC",0,0,0)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args,"new_ScreenDC",0,0,0)) SWIG_fail;

   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxMemoryDC *)new wxMemoryDC();
+    result = (wxScreenDC *)new wxScreenDC();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxScreenDC, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_new_MemoryDCFromDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxDC *arg1 = (wxDC *) 0 ;
-  wxMemoryDC *result = 0 ;
+  wxScreenDC *arg1 = (wxScreenDC *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  void *argp2 = 0 ;
+  int res2 = 0 ;

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

+  PyObject * obj1 = 0 ;

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

-    (char *) "oldDC", NULL 
+    (char *) "self",(char *) "window", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_MemoryDCFromDC",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScreenDC_StartDrawingOnTopWin",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxScreenDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDCFromDC" "', expected argument " "1"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ScreenDC_StartDrawingOnTopWin" "', expected argument " "1"" of type '" "wxScreenDC *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxDC * >(argp1);
+  arg1 = reinterpret_cast< wxScreenDC * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ScreenDC_StartDrawingOnTopWin" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  }
+  arg2 = reinterpret_cast< wxWindow * >(argp2);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxMemoryDC *)new wxMemoryDC(arg1);
+    result = (bool)(arg1)->StartDrawingOnTop(arg2);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_OWN |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

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

-SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ScreenDC_StartDrawingOnTop(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMemoryDC *arg1 = (wxMemoryDC *) 0 ;
-  wxBitmap *arg2 = 0 ;
+  wxScreenDC *arg1 = (wxScreenDC *) 0 ;
+  wxRect *arg2 = (wxRect *) NULL ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;


@@ -21074,328 +23973,327 @@ SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "bitmap", NULL 
+    (char *) "self",(char *) "rect", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObject",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ScreenDC_StartDrawingOnTop",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxScreenDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); 
-  }
-  arg1 = reinterpret_cast< wxMemoryDC * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ScreenDC_StartDrawingOnTop" "', expected argument " "1"" of type '" "wxScreenDC *""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  arg1 = reinterpret_cast< wxScreenDC * >(argp1);
+  if (obj1) {
+    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxRect, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ScreenDC_StartDrawingOnTop" "', expected argument " "2"" of type '" "wxRect *""'"); 
+    }
+    arg2 = reinterpret_cast< wxRect * >(argp2);

   }
   }

-  arg2 = reinterpret_cast< wxBitmap * >(argp2);

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

-    (arg1)->SelectObject((wxBitmap const &)*arg2);
+    result = (bool)(arg1)->StartDrawingOnTop(arg2);

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

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

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

-SWIGINTERN PyObject *MemoryDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxMemoryDC, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *MemoryDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ScreenDC_EndDrawingOnTop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxDC *arg1 = (wxDC *) 0 ;
-  wxBitmap const &arg2_defvalue = wxNullBitmap ;
-  wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
-  int arg3 = (int) wxBUFFER_CLIENT_AREA ;
-  wxBufferedDC *result = 0 ;
+  wxScreenDC *arg1 = (wxScreenDC *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if ((nobjs < 1) || (nobjs > 3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxScreenDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_BufferedDC" "', expected argument " "1"" of type '" "wxDC *""'"); 
-  }
-  arg1 = reinterpret_cast< wxDC * >(argp1);
-  if (swig_obj[1]) {
-    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
-    }
-    if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
-    }
-    arg2 = reinterpret_cast< wxBitmap * >(argp2);
-  }
-  if (swig_obj[2]) {
-    ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_BufferedDC" "', expected argument " "3"" of type '" "int""'");
-    } 
-    arg3 = static_cast< int >(val3);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ScreenDC_EndDrawingOnTop" "', expected argument " "1"" of type '" "wxScreenDC *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxScreenDC * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2,arg3);
+    result = (bool)(arg1)->EndDrawingOnTop();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBufferedDC, SWIG_POINTER_NEW |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

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

-SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *ScreenDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxScreenDC, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *ScreenDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_ClientDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxDC *arg1 = (wxDC *) 0 ;
-  wxSize *arg2 = 0 ;
-  int arg3 = (int) wxBUFFER_CLIENT_AREA ;
-  wxBufferedDC *result = 0 ;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxClientDC *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;
-  int val3 ;
-  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "win", NULL 
+  };

   
   

-  if ((nobjs < 2) || (nobjs > 3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_ClientDC",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_BufferedDC" "', expected argument " "1"" of type '" "wxDC *""'"); 
-  }
-  arg1 = reinterpret_cast< wxDC * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxSize_helper(swig_obj[1], &arg2)) SWIG_fail;
-  }
-  if (swig_obj[2]) {
-    ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_BufferedDC" "', expected argument " "3"" of type '" "int""'");
-    } 
-    arg3 = static_cast< int >(val3);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ClientDC" "', expected argument " "1"" of type '" "wxWindow *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxWindow * >(argp1);

   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2,arg3);
+    result = (wxClientDC *)new wxClientDC(arg1);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBufferedDC, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxClientDC, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[4];
-  
-  if (!(argc = SWIG_Python_UnpackTuple(args,"new_BufferedDC",0,3,argv))) SWIG_fail;
-  --argc;
-  if ((argc >= 1) && (argc <= 3)) {
-    int _v = 0;
-    if (argc > 1) {
-      {
-        int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_wxBitmap, 0);
-        _v = SWIG_CheckState(res);
-      }
-      if (!_v) goto check_1;
-    }
-    return _wrap_new_BufferedDC__SWIG_0(self, argc, argv);
-  }
-check_1:
-  
-  if ((argc >= 2) && (argc <= 3)) {
-    return _wrap_new_BufferedDC__SWIG_1(self, argc, argv);
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_BufferedDC'");
-  return NULL;
+SWIGINTERN PyObject *ClientDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxClientDC, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();

 }
 
 }
 

+SWIGINTERN PyObject *ClientDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}

 
 

-SWIGINTERN PyObject *_wrap_delete_BufferedDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PaintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxPaintDC *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "win", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBufferedDC, SWIG_POINTER_DISOWN |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PaintDC",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BufferedDC" "', expected argument " "1"" of type '" "wxBufferedDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PaintDC" "', expected argument " "1"" of type '" "wxWindow *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxBufferedDC * >(argp1);
+  arg1 = reinterpret_cast< wxWindow * >(argp1);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    delete arg1;
-    
+    result = (wxPaintDC *)new wxPaintDC(arg1);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPaintDC, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_BufferedDC_UnMask(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *PaintDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPaintDC, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *PaintDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_WindowDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxWindowDC *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "win", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBufferedDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_WindowDC",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BufferedDC_UnMask" "', expected argument " "1"" of type '" "wxBufferedDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_WindowDC" "', expected argument " "1"" of type '" "wxWindow *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxBufferedDC * >(argp1);
+  arg1 = reinterpret_cast< wxWindow * >(argp1);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    (arg1)->UnMask();
+    result = (wxWindowDC *)new wxWindowDC(arg1);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxWindowDC, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *BufferedDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *WindowDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxBufferedDC, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxWindowDC, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *BufferedDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *WindowDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_MirrorDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxWindow *arg1 = (wxWindow *) 0 ;
-  wxBitmap const &arg2_defvalue = wxNullBitmap ;
-  wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
-  int arg3 = (int) wxBUFFER_CLIENT_AREA ;
-  wxBufferedPaintDC *result = 0 ;
+  wxDC *arg1 = 0 ;
+  bool arg2 ;
+  wxMirrorDC *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;

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

-  PyObject * obj2 = 0 ;

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

-    (char *) "window",(char *) "buffer",(char *) "style", NULL 
+    (char *) "dc",(char *) "mirror", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_BufferedPaintDC",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_MirrorDC",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxDC,  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_BufferedPaintDC" "', expected argument " "1"" of type '" "wxWindow *""'"); 
-  }
-  arg1 = reinterpret_cast< wxWindow * >(argp1);
-  if (obj1) {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
-    }
-    if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
-    }
-    arg2 = reinterpret_cast< wxBitmap * >(argp2);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MirrorDC" "', expected argument " "1"" of type '" "wxDC &""'"); 

   }
   }

-  if (obj2) {
-    ecode3 = SWIG_AsVal_int(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_BufferedPaintDC" "', expected argument " "3"" of type '" "int""'");
-    } 
-    arg3 = static_cast< int >(val3);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MirrorDC" "', expected argument " "1"" of type '" "wxDC &""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxDC * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_MirrorDC" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2,arg3);
+    result = (wxMirrorDC *)new wxMirrorDC(*arg1,arg2);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBufferedPaintDC, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMirrorDC, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *BufferedPaintDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *MirrorDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxBufferedPaintDC, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxMirrorDC, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *BufferedPaintDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *MirrorDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_ScreenDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PostScriptDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxScreenDC *result = 0 ;
+  wxPrintData *arg1 = 0 ;
+  wxPostScriptDC *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "printData", NULL 
+  };

   
   

-  if (!SWIG_Python_UnpackTuple(args,"new_ScreenDC",0,0,0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PostScriptDC",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxPrintData,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PostScriptDC" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PostScriptDC" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxScreenDC *)new wxScreenDC();
+    result = (wxPostScriptDC *)new wxPostScriptDC((wxPrintData const &)*arg1);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxScreenDC, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPostScriptDC, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PostScriptDC_GetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxScreenDC *arg1 = (wxScreenDC *) 0 ;
-  wxWindow *arg2 = (wxWindow *) 0 ;
-  bool result;
+  wxPostScriptDC *arg1 = (wxPostScriptDC *) 0 ;
+  wxPrintData *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPostScriptDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PostScriptDC_GetPrintData" "', expected argument " "1"" of type '" "wxPostScriptDC *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPostScriptDC * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxPrintData &_result_ref = (arg1)->GetPrintData();
+      result = (wxPrintData *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintData, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PostScriptDC_SetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPostScriptDC *arg1 = (wxPostScriptDC *) 0 ;
+  wxPrintData *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;


@@ -21403,518 +24301,623 @@ SWIGINTERN PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "window", NULL 
+    (char *) "self",(char *) "data", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScreenDC_StartDrawingOnTopWin",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxScreenDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PostScriptDC_SetPrintData",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPostScriptDC, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ScreenDC_StartDrawingOnTopWin" "', expected argument " "1"" of type '" "wxScreenDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PostScriptDC_SetPrintData" "', expected argument " "1"" of type '" "wxPostScriptDC *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxScreenDC * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  arg1 = reinterpret_cast< wxPostScriptDC * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxPrintData,  0  | 0);

   if (!SWIG_IsOK(res2)) {
   if (!SWIG_IsOK(res2)) {

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ScreenDC_StartDrawingOnTopWin" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PostScriptDC_SetPrintData" "', expected argument " "2"" of type '" "wxPrintData const &""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PostScriptDC_SetPrintData" "', expected argument " "2"" of type '" "wxPrintData const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxPrintData * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetPrintData((wxPrintData const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PostScriptDC_SetResolution(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "ppi", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PostScriptDC_SetResolution",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "PostScriptDC_SetResolution" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxPostScriptDC::SetResolution(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PostScriptDC_GetResolution(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int result;
+  
+  if (!SWIG_Python_UnpackTuple(args,"PostScriptDC_GetResolution",0,0,0)) SWIG_fail;

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

-    result = (bool)(arg1)->StartDrawingOnTop(arg2);
+    result = (int)wxPostScriptDC::GetResolution();

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_ScreenDC_StartDrawingOnTop(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *PostScriptDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPostScriptDC, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *PostScriptDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_MetaFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxScreenDC *arg1 = (wxScreenDC *) 0 ;
-  wxRect *arg2 = (wxRect *) NULL ;
-  bool result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  wxString const &arg1_defvalue = wxPyEmptyString ;
+  wxString *arg1 = (wxString *) &arg1_defvalue ;
+  wxMetaFile *result = 0 ;
+  bool temp1 = false ;

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

-  PyObject * obj1 = 0 ;

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

-    (char *) "self",(char *) "rect", NULL 
+    (char *) "filename", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ScreenDC_StartDrawingOnTop",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxScreenDC, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ScreenDC_StartDrawingOnTop" "', expected argument " "1"" of type '" "wxScreenDC *""'"); 
-  }
-  arg1 = reinterpret_cast< wxScreenDC * >(argp1);
-  if (obj1) {
-    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxRect, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ScreenDC_StartDrawingOnTop" "', expected argument " "2"" of type '" "wxRect *""'"); 
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MetaFile",kwnames,&obj0)) SWIG_fail;
+  if (obj0) {
+    {
+      arg1 = wxString_in_helper(obj0);
+      if (arg1 == NULL) SWIG_fail;
+      temp1 = true;

     }
     }

-    arg2 = reinterpret_cast< wxRect * >(argp2);

   }
   {
   }
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (bool)(arg1)->StartDrawingOnTop(arg2);
+    result = (wxMetaFile *)new wxMetaFile((wxString const &)*arg1);

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

+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMetaFile, SWIG_POINTER_NEW |  0 );

   {
   {

-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    if (temp1)
+    delete arg1;

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

+  {
+    if (temp1)
+    delete arg1;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_ScreenDC_EndDrawingOnTop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_MetaFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxScreenDC *arg1 = (wxScreenDC *) 0 ;
-  bool result;
+  wxMetaFile *arg1 = (wxMetaFile *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxScreenDC, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFile, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ScreenDC_EndDrawingOnTop" "', expected argument " "1"" of type '" "wxScreenDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MetaFile" "', expected argument " "1"" of type '" "wxMetaFile *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxScreenDC * >(argp1);
+  arg1 = reinterpret_cast< wxMetaFile * >(argp1);

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

-    result = (bool)(arg1)->EndDrawingOnTop();
+    delete arg1;
+    

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

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

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

-SWIGINTERN PyObject *ScreenDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxScreenDC, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *ScreenDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_ClientDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_MetaFile_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxWindow *arg1 = (wxWindow *) 0 ;
-  wxClientDC *result = 0 ;
+  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "win", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_ClientDC",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFile, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ClientDC" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFile_Ok" "', expected argument " "1"" of type '" "wxMetaFile *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  arg1 = reinterpret_cast< wxMetaFile * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxClientDC *)new wxClientDC(arg1);
+    result = (bool)(arg1)->Ok();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxClientDC, SWIG_POINTER_NEW |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

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

-SWIGINTERN PyObject *ClientDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxClientDC, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *ClientDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_PaintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_MetaFile_SetClipboard(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxWindow *arg1 = (wxWindow *) 0 ;
-  wxPaintDC *result = 0 ;
+  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
+  int arg2 = (int) 0 ;
+  int arg3 = (int) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;

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

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

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

-    (char *) "win", NULL 
+    (char *) "self",(char *) "width",(char *) "height", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PaintDC",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:MetaFile_SetClipboard",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMetaFile, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PaintDC" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFile_SetClipboard" "', expected argument " "1"" of type '" "wxMetaFile *""'"); 
+  }
+  arg1 = reinterpret_cast< wxMetaFile * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MetaFile_SetClipboard" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "MetaFile_SetClipboard" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);

   }
   }

-  arg1 = reinterpret_cast< wxWindow * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxPaintDC *)new wxPaintDC(arg1);
+    result = (bool)(arg1)->SetClipboard(arg2,arg3);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPaintDC, SWIG_POINTER_NEW |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

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

-SWIGINTERN PyObject *PaintDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPaintDC, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *PaintDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_WindowDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_MetaFile_GetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxWindow *arg1 = (wxWindow *) 0 ;
-  wxWindowDC *result = 0 ;
+  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
+  wxSize result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "win", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_WindowDC",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFile, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_WindowDC" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFile_GetSize" "', expected argument " "1"" of type '" "wxMetaFile *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  arg1 = reinterpret_cast< wxMetaFile * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxWindowDC *)new wxWindowDC(arg1);
+    result = (arg1)->GetSize();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxWindowDC, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *WindowDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxWindowDC, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *WindowDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_MirrorDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_MetaFile_GetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxDC *arg1 = 0 ;
-  bool arg2 ;
-  wxMirrorDC *result = 0 ;
+  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "dc",(char *) "mirror", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_MirrorDC",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxDC,  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MirrorDC" "', expected argument " "1"" of type '" "wxDC &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MirrorDC" "', expected argument " "1"" of type '" "wxDC &""'"); 
-  }
-  arg1 = reinterpret_cast< wxDC * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_MirrorDC" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFile, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFile_GetWidth" "', expected argument " "1"" of type '" "wxMetaFile *""'"); 
+  }
+  arg1 = reinterpret_cast< wxMetaFile * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxMirrorDC *)new wxMirrorDC(*arg1,arg2);
+    result = (int)(arg1)->GetWidth();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMirrorDC, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *MirrorDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxMirrorDC, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *MirrorDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_PostScriptDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_MetaFile_GetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = 0 ;
-  wxPostScriptDC *result = 0 ;
+  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "printData", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PostScriptDC",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxPrintData,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFile, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PostScriptDC" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PostScriptDC" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFile_GetHeight" "', expected argument " "1"" of type '" "wxMetaFile *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  arg1 = reinterpret_cast< wxMetaFile * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxPostScriptDC *)new wxPostScriptDC((wxPrintData const &)*arg1);
+    result = (int)(arg1)->GetHeight();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPostScriptDC, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_PostScriptDC_GetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MetaFile_GetFileName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPostScriptDC *arg1 = (wxPostScriptDC *) 0 ;
-  wxPrintData *result = 0 ;
+  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
+  wxString *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPostScriptDC, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFile, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PostScriptDC_GetPrintData" "', expected argument " "1"" of type '" "wxPostScriptDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFile_GetFileName" "', expected argument " "1"" of type '" "wxMetaFile const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPostScriptDC * >(argp1);
+  arg1 = reinterpret_cast< wxMetaFile * >(argp1);

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

-      wxPrintData &_result_ref = (arg1)->GetPrintData();
-      result = (wxPrintData *) &_result_ref;
+      wxString const &_result_ref = ((wxMetaFile const *)arg1)->GetFileName();
+      result = (wxString *) &_result_ref;

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintData, 0 |  0 );
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
+#else
+    resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
+#endif
+  }

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

-SWIGINTERN PyObject *_wrap_PostScriptDC_SetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *MetaFile_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxMetaFile, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *MetaFile_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_MetaFileDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPostScriptDC *arg1 = (wxPostScriptDC *) 0 ;
-  wxPrintData *arg2 = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  wxString const &arg1_defvalue = wxPyEmptyString ;
+  wxString *arg1 = (wxString *) &arg1_defvalue ;
+  int arg2 = (int) 0 ;
+  int arg3 = (int) 0 ;
+  wxString const &arg4_defvalue = wxPyEmptyString ;
+  wxString *arg4 = (wxString *) &arg4_defvalue ;
+  wxMetaFileDC *result = 0 ;
+  bool temp1 = false ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  bool temp4 = false ;

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

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

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

-    (char *) "self",(char *) "data", NULL 
+    (char *) "filename",(char *) "width",(char *) "height",(char *) "description", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PostScriptDC_SetPrintData",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPostScriptDC, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PostScriptDC_SetPrintData" "', expected argument " "1"" of type '" "wxPostScriptDC *""'"); 
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_MetaFileDC",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (obj0) {
+    {
+      arg1 = wxString_in_helper(obj0);
+      if (arg1 == NULL) SWIG_fail;
+      temp1 = true;
+    }

   }
   }

-  arg1 = reinterpret_cast< wxPostScriptDC * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxPrintData,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PostScriptDC_SetPrintData" "', expected argument " "2"" of type '" "wxPrintData const &""'"); 
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_MetaFileDC" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PostScriptDC_SetPrintData" "', expected argument " "2"" of type '" "wxPrintData const &""'"); 
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_MetaFileDC" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }
+  if (obj3) {
+    {
+      arg4 = wxString_in_helper(obj3);
+      if (arg4 == NULL) SWIG_fail;
+      temp4 = true;
+    }

   }
   }

-  arg2 = reinterpret_cast< wxPrintData * >(argp2);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    (arg1)->SetPrintData((wxPrintData const &)*arg2);
+    result = (wxMetaFileDC *)new wxMetaFileDC((wxString const &)*arg1,arg2,arg3,(wxString const &)*arg4);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMetaFileDC, SWIG_POINTER_NEW |  0 );
+  {
+    if (temp1)
+    delete arg1;
+  }
+  {
+    if (temp4)
+    delete arg4;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp1)
+    delete arg1;
+  }
+  {
+    if (temp4)
+    delete arg4;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PostScriptDC_SetResolution(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_MetaFileDC_Close(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  int arg1 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "ppi", NULL 
-  };
+  wxMetaFileDC *arg1 = (wxMetaFileDC *) 0 ;
+  wxMetaFile *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PostScriptDC_SetResolution",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "PostScriptDC_SetResolution" "', expected argument " "1"" of type '" "int""'");
-  } 
-  arg1 = static_cast< int >(val1);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFileDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFileDC_Close" "', expected argument " "1"" of type '" "wxMetaFileDC *""'"); 
+  }
+  arg1 = reinterpret_cast< wxMetaFileDC * >(argp1);

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

-    wxPostScriptDC::SetResolution(arg1);
+    result = (wxMetaFile *)(arg1)->Close();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMetaFile, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_PostScriptDC_GetResolution(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *MetaFileDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxMetaFileDC, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *MetaFileDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_PrinterDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  int result;
+  wxPrintData *arg1 = 0 ;
+  wxPrinterDC *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "printData", NULL 
+  };

   
   

-  if (!SWIG_Python_UnpackTuple(args,"PostScriptDC_GetResolution",0,0,0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PrinterDC",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxPrintData,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PrinterDC" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PrinterDC" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (int)wxPostScriptDC::GetResolution();
+    result = (wxPrinterDC *)new wxPrinterDC((wxPrintData const &)*arg1);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrinterDC, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *PostScriptDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *PrinterDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPostScriptDC, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPrinterDC, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *PostScriptDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *PrinterDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_MetaFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_ImageList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxString const &arg1_defvalue = wxPyEmptyString ;
-  wxString *arg1 = (wxString *) &arg1_defvalue ;
-  wxMetaFile *result = 0 ;
-  bool temp1 = false ;
+  int arg1 ;
+  int arg2 ;
+  int arg3 = (int) true ;
+  int arg4 = (int) 1 ;
+  wxImageList *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;

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

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

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

-    (char *) "filename", NULL 
+    (char *) "width",(char *) "height",(char *) "mask",(char *) "initialCount", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MetaFile",kwnames,&obj0)) SWIG_fail;
-  if (obj0) {
-    {
-      arg1 = wxString_in_helper(obj0);
-      if (arg1 == NULL) SWIG_fail;
-      temp1 = true;
-    }
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_ImageList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ImageList" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ImageList" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ImageList" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }
+  if (obj3) {
+    ecode4 = SWIG_AsVal_int(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ImageList" "', expected argument " "4"" of type '" "int""'");
+    } 
+    arg4 = static_cast< int >(val4);

   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxMetaFile *)new wxMetaFile((wxString const &)*arg1);
+    result = (wxImageList *)new wxImageList(arg1,arg2,arg3,arg4);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMetaFile, SWIG_POINTER_NEW |  0 );

   {
   {

-    if (temp1)
-    delete arg1;
+    resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); 

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

-  {
-    if (temp1)
-    delete arg1;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_MetaFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ImageList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
+  wxImageList *arg1 = (wxImageList *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFile, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxImageList, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MetaFile" "', expected argument " "1"" of type '" "wxMetaFile *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ImageList" "', expected argument " "1"" of type '" "wxImageList *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxMetaFile * >(argp1);
+  arg1 = reinterpret_cast< wxImageList * >(argp1);

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


@@ -21929,136 +24932,144 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_MetaFile_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ImageList_Add(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
-  bool result;
+  wxImageList *arg1 = (wxImageList *) 0 ;
+  wxBitmap *arg2 = 0 ;
+  wxBitmap const &arg3_defvalue = wxNullBitmap ;
+  wxBitmap *arg3 = (wxBitmap *) &arg3_defvalue ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "bitmap",(char *) "mask", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFile, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ImageList_Add",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFile_Ok" "', expected argument " "1"" of type '" "wxMetaFile *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_Add" "', expected argument " "1"" of type '" "wxImageList *""'"); 
+  }
+  arg1 = reinterpret_cast< wxImageList * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ImageList_Add" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_Add" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  if (obj2) {
+    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxBitmap,  0  | 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ImageList_Add" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+    }
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_Add" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+    }
+    arg3 = reinterpret_cast< wxBitmap * >(argp3);

   }
   }

-  arg1 = reinterpret_cast< wxMetaFile * >(argp1);

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

-    result = (bool)(arg1)->Ok();
+    result = (int)(arg1)->Add((wxBitmap const &)*arg2,(wxBitmap const &)*arg3);

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_MetaFile_SetClipboard(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ImageList_AddWithColourMask(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
-  int arg2 = (int) 0 ;
-  int arg3 = (int) 0 ;
-  bool result;
+  wxImageList *arg1 = (wxImageList *) 0 ;
+  wxBitmap *arg2 = 0 ;
+  wxColour *arg3 = 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  wxColour temp3 ;

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

-    (char *) "self",(char *) "width",(char *) "height", NULL 
+    (char *) "self",(char *) "bitmap",(char *) "maskColour", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:MetaFile_SetClipboard",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMetaFile, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageList_AddWithColourMask",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFile_SetClipboard" "', expected argument " "1"" of type '" "wxMetaFile *""'"); 
-  }
-  arg1 = reinterpret_cast< wxMetaFile * >(argp1);
-  if (obj1) {
-    ecode2 = SWIG_AsVal_int(obj1, &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MetaFile_SetClipboard" "', expected argument " "2"" of type '" "int""'");
-    } 
-    arg2 = static_cast< int >(val2);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_AddWithColourMask" "', expected argument " "1"" of type '" "wxImageList *""'"); 

   }
   }

-  if (obj2) {
-    ecode3 = SWIG_AsVal_int(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "MetaFile_SetClipboard" "', expected argument " "3"" of type '" "int""'");
-    } 
-    arg3 = static_cast< int >(val3);
+  arg1 = reinterpret_cast< wxImageList * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ImageList_AddWithColourMask" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 

   }
   }

-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->SetClipboard(arg2,arg3);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_AddWithColourMask" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 

   }
   }

+  arg2 = reinterpret_cast< wxBitmap * >(argp2);

   {
   {

-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_MetaFile_GetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
-  wxSize result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFile, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFile_GetSize" "', expected argument " "1"" of type '" "wxMetaFile *""'"); 
+    arg3 = &temp3;
+    if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;

   }
   }

-  arg1 = reinterpret_cast< wxMetaFile * >(argp1);

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

-    result = (arg1)->GetSize();
+    result = (int)(arg1)->Add((wxBitmap const &)*arg2,(wxColour const &)*arg3);

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

-  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_MetaFile_GetWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ImageList_AddIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
+  wxImageList *arg1 = (wxImageList *) 0 ;
+  wxIcon *arg2 = 0 ;

   int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "icon", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFile, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_AddIcon",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFile_GetWidth" "', expected argument " "1"" of type '" "wxMetaFile *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_AddIcon" "', expected argument " "1"" of type '" "wxImageList *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxMetaFile * >(argp1);
+  arg1 = reinterpret_cast< wxImageList * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxIcon,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ImageList_AddIcon" "', expected argument " "2"" of type '" "wxIcon const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_AddIcon" "', expected argument " "2"" of type '" "wxIcon const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxIcon * >(argp2);

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

-    result = (int)(arg1)->GetWidth();
+    result = (int)(arg1)->Add((wxIcon const &)*arg2);

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


@@ -22069,305 +25080,307 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_MetaFile_GetHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ImageList_GetBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
-  int result;
+  wxImageList *arg1 = (wxImageList *) 0 ;
+  int arg2 ;
+  SwigValueWrapper<wxBitmap > result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "index", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFile, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_GetBitmap",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFile_GetHeight" "', expected argument " "1"" of type '" "wxMetaFile *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_GetBitmap" "', expected argument " "1"" of type '" "wxImageList const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxMetaFile * >(argp1);
+  arg1 = reinterpret_cast< wxImageList * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ImageList_GetBitmap" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

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

-    result = (int)(arg1)->GetHeight();
+    result = ((wxImageList const *)arg1)->GetBitmap(arg2);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_NewPointerObj((new wxBitmap(static_cast< const wxBitmap& >(result))), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_MetaFile_GetFileName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ImageList_GetIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMetaFile *arg1 = (wxMetaFile *) 0 ;
-  wxString *result = 0 ;
+  wxImageList *arg1 = (wxImageList *) 0 ;
+  int arg2 ;
+  wxIcon result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "index", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFile, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_GetIcon",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFile_GetFileName" "', expected argument " "1"" of type '" "wxMetaFile const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_GetIcon" "', expected argument " "1"" of type '" "wxImageList const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxMetaFile * >(argp1);
+  arg1 = reinterpret_cast< wxImageList * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ImageList_GetIcon" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

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

-    {
-      wxString const &_result_ref = ((wxMetaFile const *)arg1)->GetFileName();
-      result = (wxString *) &_result_ref;
-    }
+    result = ((wxImageList const *)arg1)->GetIcon(arg2);

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

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
-#else
-    resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
-#endif
-  }
+  resultobj = SWIG_NewPointerObj((new wxIcon(static_cast< const wxIcon& >(result))), SWIGTYPE_p_wxIcon, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *MetaFile_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxMetaFile, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *MetaFile_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_MetaFileDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ImageList_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxString const &arg1_defvalue = wxPyEmptyString ;
-  wxString *arg1 = (wxString *) &arg1_defvalue ;
-  int arg2 = (int) 0 ;
-  int arg3 = (int) 0 ;
-  wxString const &arg4_defvalue = wxPyEmptyString ;
-  wxString *arg4 = (wxString *) &arg4_defvalue ;
-  wxMetaFileDC *result = 0 ;
-  bool temp1 = false ;
+  wxImageList *arg1 = (wxImageList *) 0 ;
+  int arg2 ;
+  wxBitmap *arg3 = 0 ;
+  wxBitmap const &arg4_defvalue = wxNullBitmap ;
+  wxBitmap *arg4 = (wxBitmap *) &arg4_defvalue ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;

   int val2 ;
   int ecode2 = 0 ;
   int val2 ;
   int ecode2 = 0 ;

-  int val3 ;
-  int ecode3 = 0 ;
-  bool temp4 = false ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;

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

-    (char *) "filename",(char *) "width",(char *) "height",(char *) "description", NULL 
+    (char *) "self",(char *) "index",(char *) "bitmap",(char *) "mask", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_MetaFileDC",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  if (obj0) {
-    {
-      arg1 = wxString_in_helper(obj0);
-      if (arg1 == NULL) SWIG_fail;
-      temp1 = true;
-    }
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ImageList_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_Replace" "', expected argument " "1"" of type '" "wxImageList *""'"); 

   }
   }

-  if (obj1) {
-    ecode2 = SWIG_AsVal_int(obj1, &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_MetaFileDC" "', expected argument " "2"" of type '" "int""'");
-    } 
-    arg2 = static_cast< int >(val2);
+  arg1 = reinterpret_cast< wxImageList * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ImageList_Replace" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ImageList_Replace" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 

   }
   }

-  if (obj2) {
-    ecode3 = SWIG_AsVal_int(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_MetaFileDC" "', expected argument " "3"" of type '" "int""'");
-    } 
-    arg3 = static_cast< int >(val3);
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_Replace" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 

   }
   }

+  arg3 = reinterpret_cast< wxBitmap * >(argp3);

   if (obj3) {
   if (obj3) {

-    {
-      arg4 = wxString_in_helper(obj3);
-      if (arg4 == NULL) SWIG_fail;
-      temp4 = true;
+    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxBitmap,  0  | 0);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ImageList_Replace" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+    }
+    if (!argp4) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_Replace" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 

     }
     }

+    arg4 = reinterpret_cast< wxBitmap * >(argp4);

   }
   {
   }
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxMetaFileDC *)new wxMetaFileDC((wxString const &)*arg1,arg2,arg3,(wxString const &)*arg4);
+    result = (bool)(arg1)->Replace(arg2,(wxBitmap const &)*arg3,(wxBitmap const &)*arg4);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMetaFileDC, SWIG_POINTER_NEW |  0 );
-  {
-    if (temp1)
-    delete arg1;
-  }

   {
   {

-    if (temp4)
-    delete arg4;
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

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

-  {
-    if (temp1)
-    delete arg1;
-  }
-  {
-    if (temp4)
-    delete arg4;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_MetaFileDC_Close(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ImageList_Draw(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMetaFileDC *arg1 = (wxMetaFileDC *) 0 ;
-  wxMetaFile *result = 0 ;
+  wxImageList *arg1 = (wxImageList *) 0 ;
+  int arg2 ;
+  wxDC *arg3 = 0 ;
+  int arg4 ;
+  int arg5 ;
+  int arg6 = (int) wxIMAGELIST_DRAW_NORMAL ;
+  bool arg7 = (bool) (bool)false ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
+  bool val7 ;
+  int ecode7 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "index",(char *) "dc",(char *) "x",(char *) "x",(char *) "flags",(char *) "solidBackground", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMetaFileDC, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:ImageList_Draw",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MetaFileDC_Close" "', expected argument " "1"" of type '" "wxMetaFileDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_Draw" "', expected argument " "1"" of type '" "wxImageList *""'"); 
+  }
+  arg1 = reinterpret_cast< wxImageList * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ImageList_Draw" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ImageList_Draw" "', expected argument " "3"" of type '" "wxDC &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_Draw" "', expected argument " "3"" of type '" "wxDC &""'"); 
+  }
+  arg3 = reinterpret_cast< wxDC * >(argp3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "ImageList_Draw" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "ImageList_Draw" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
+  if (obj5) {
+    ecode6 = SWIG_AsVal_int(obj5, &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "ImageList_Draw" "', expected argument " "6"" of type '" "int""'");
+    } 
+    arg6 = static_cast< int >(val6);
+  }
+  if (obj6) {
+    ecode7 = SWIG_AsVal_bool(obj6, &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "ImageList_Draw" "', expected argument " "7"" of type '" "bool""'");
+    } 
+    arg7 = static_cast< bool >(val7);

   }
   }

-  arg1 = reinterpret_cast< wxMetaFileDC * >(argp1);

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

-    result = (wxMetaFile *)(arg1)->Close();
+    result = (bool)(arg1)->Draw(arg2,*arg3,arg4,arg5,arg6,arg7);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMetaFile, 0 |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

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

-SWIGINTERN PyObject *MetaFileDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxMetaFileDC, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *MetaFileDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_PrinterDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ImageList_GetImageCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = 0 ;
-  wxPrinterDC *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "printData", NULL 
-  };
+  wxImageList *arg1 = (wxImageList *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PrinterDC",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxPrintData,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PrinterDC" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PrinterDC" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_GetImageCount" "', expected argument " "1"" of type '" "wxImageList *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  arg1 = reinterpret_cast< wxImageList * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxPrinterDC *)new wxPrinterDC((wxPrintData const &)*arg1);
+    result = (int)(arg1)->GetImageCount();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrinterDC, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *PrinterDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPrinterDC, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *PrinterDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_ImageList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ImageList_Remove(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  int arg1 ;
+  wxImageList *arg1 = (wxImageList *) 0 ;

   int arg2 ;
   int arg2 ;

-  int arg3 = (int) true ;
-  int arg4 = (int) 1 ;
-  wxImageList *result = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;

   int val2 ;
   int ecode2 = 0 ;
   int val2 ;
   int ecode2 = 0 ;

-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;

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

-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;

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

-    (char *) "width",(char *) "height",(char *) "mask",(char *) "initialCount", NULL 
+    (char *) "self",(char *) "index", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_ImageList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ImageList" "', expected argument " "1"" of type '" "int""'");
-  } 
-  arg1 = static_cast< int >(val1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_Remove",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_Remove" "', expected argument " "1"" of type '" "wxImageList *""'"); 
+  }
+  arg1 = reinterpret_cast< wxImageList * >(argp1);

   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ImageList" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ImageList_Remove" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   } 
   arg2 = static_cast< int >(val2);

-  if (obj2) {
-    ecode3 = SWIG_AsVal_int(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ImageList" "', expected argument " "3"" of type '" "int""'");
-    } 
-    arg3 = static_cast< int >(val3);
-  }
-  if (obj3) {
-    ecode4 = SWIG_AsVal_int(obj3, &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ImageList" "', expected argument " "4"" of type '" "int""'");
-    } 
-    arg4 = static_cast< int >(val4);
-  }

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxImageList *)new wxImageList(arg1,arg2,arg3,arg4);
+    result = (bool)(arg1)->Remove(arg2);

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

-    resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); 
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

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


@@ -22375,454 +25388,314 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_ImageList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ImageList_RemoveAll(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxImageList *arg1 = (wxImageList *) 0 ;
   PyObject *resultobj = 0;
   wxImageList *arg1 = (wxImageList *) 0 ;

+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxImageList, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ImageList" "', expected argument " "1"" of type '" "wxImageList *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_RemoveAll" "', expected argument " "1"" of type '" "wxImageList *""'"); 

   }
   arg1 = reinterpret_cast< wxImageList * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxImageList * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    delete arg1;
-    
+    result = (bool)(arg1)->RemoveAll();

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

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

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

-SWIGINTERN PyObject *_wrap_ImageList_Add(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ImageList_GetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxImageList *arg1 = (wxImageList *) 0 ;
   PyObject *resultobj = 0;
   wxImageList *arg1 = (wxImageList *) 0 ;

-  wxBitmap *arg2 = 0 ;
-  wxBitmap const &arg3_defvalue = wxNullBitmap ;
-  wxBitmap *arg3 = (wxBitmap *) &arg3_defvalue ;
-  int result;
+  int arg2 ;
+  int *arg3 = 0 ;
+  int *arg4 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int temp3 ;
+  int res3 = SWIG_TMPOBJ ;
+  int temp4 ;
+  int res4 = SWIG_TMPOBJ ;

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

-  PyObject * obj2 = 0 ;

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

-    (char *) "self",(char *) "bitmap",(char *) "mask", NULL 
+    (char *) "self",(char *) "index", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ImageList_Add",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  arg3 = &temp3;
+  arg4 = &temp4;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_GetSize",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_Add" "', expected argument " "1"" of type '" "wxImageList *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_GetSize" "', expected argument " "1"" of type '" "wxImageList *""'"); 

   }
   arg1 = reinterpret_cast< wxImageList * >(argp1);
   }
   arg1 = reinterpret_cast< wxImageList * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ImageList_Add" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_Add" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
-  }
-  arg2 = reinterpret_cast< wxBitmap * >(argp2);
-  if (obj2) {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxBitmap,  0  | 0);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ImageList_Add" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
-    }
-    if (!argp3) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_Add" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
-    }
-    arg3 = reinterpret_cast< wxBitmap * >(argp3);
-  }
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ImageList_GetSize" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

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

-    result = (int)(arg1)->Add((wxBitmap const &)*arg2,(wxBitmap const &)*arg3);
+    (arg1)->GetSize(arg2,*arg3,*arg4);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsTmpObj(res3)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags));
+  }
+  if (SWIG_IsTmpObj(res4)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg4)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res4) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, new_flags));
+  }

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

-SWIGINTERN PyObject *_wrap_ImageList_AddWithColourMask(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *ImageList_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxImageList, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *ImageList_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_StockGDI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxImageList *arg1 = (wxImageList *) 0 ;
-  wxBitmap *arg2 = 0 ;
-  wxColour *arg3 = 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  wxColour temp3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "bitmap",(char *) "maskColour", NULL 
-  };
+  wxStockGDI *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageList_AddWithColourMask",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_AddWithColourMask" "', expected argument " "1"" of type '" "wxImageList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxImageList * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ImageList_AddWithColourMask" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_AddWithColourMask" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
-  }
-  arg2 = reinterpret_cast< wxBitmap * >(argp2);
-  {
-    arg3 = &temp3;
-    if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
-  }
+  if (!SWIG_Python_UnpackTuple(args,"new_StockGDI",0,0,0)) SWIG_fail;

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

-    result = (int)(arg1)->Add((wxBitmap const &)*arg2,(wxColour const &)*arg3);
+    result = (wxStockGDI *)new wxStockGDI();

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxStockGDI, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_ImageList_AddIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_delete_StockGDI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxImageList *arg1 = (wxImageList *) 0 ;
-  wxIcon *arg2 = 0 ;
-  int result;
+  wxStockGDI *arg1 = (wxStockGDI *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "icon", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_AddIcon",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStockGDI, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_AddIcon" "', expected argument " "1"" of type '" "wxImageList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxImageList * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxIcon,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ImageList_AddIcon" "', expected argument " "2"" of type '" "wxIcon const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StockGDI" "', expected argument " "1"" of type '" "wxStockGDI *""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_AddIcon" "', expected argument " "2"" of type '" "wxIcon const &""'"); 
+  arg1 = reinterpret_cast< wxStockGDI * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

-  arg2 = reinterpret_cast< wxIcon * >(argp2);
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StockGDI_DeleteAll(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  
+  if (!SWIG_Python_UnpackTuple(args,"StockGDI_DeleteAll",0,0,0)) SWIG_fail;

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

-    result = (int)(arg1)->Add((wxIcon const &)*arg2);
+    wxStockGDI::DeleteAll();

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_ImageList_GetBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_StockGDI_instance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxImageList *arg1 = (wxImageList *) 0 ;
-  int arg2 ;
-  SwigValueWrapper<wxBitmap > result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "index", NULL 
-  };
+  wxStockGDI *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_GetBitmap",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_GetBitmap" "', expected argument " "1"" of type '" "wxImageList const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxImageList * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ImageList_GetBitmap" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
+  if (!SWIG_Python_UnpackTuple(args,"StockGDI_instance",0,0,0)) SWIG_fail;

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

-    result = ((wxImageList const *)arg1)->GetBitmap(arg2);
+    {
+      wxStockGDI &_result_ref = wxStockGDI::instance();
+      result = (wxStockGDI *) &_result_ref;
+    }

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

-  resultobj = SWIG_NewPointerObj((new wxBitmap(static_cast< const wxBitmap& >(result))), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxStockGDI, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_ImageList_GetIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_StockGDI_GetBrush(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxImageList *arg1 = (wxImageList *) 0 ;
-  int arg2 ;
-  wxIcon result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  wxStockGDI::Item arg1 ;
+  wxBrush *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;

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

-  PyObject * obj1 = 0 ;

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

-    (char *) "self",(char *) "index", NULL 
+    (char *) "item", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_GetIcon",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_GetIcon" "', expected argument " "1"" of type '" "wxImageList const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxImageList * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ImageList_GetIcon" "', expected argument " "2"" of type '" "int""'");
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StockGDI_GetBrush",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "StockGDI_GetBrush" "', expected argument " "1"" of type '" "wxStockGDI::Item""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
+  arg1 = static_cast< wxStockGDI::Item >(val1);

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

-    result = ((wxImageList const *)arg1)->GetIcon(arg2);
+    result = (wxBrush *)wxStockGDI::GetBrush(arg1);

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

-  resultobj = SWIG_NewPointerObj((new wxIcon(static_cast< const wxIcon& >(result))), SWIGTYPE_p_wxIcon, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBrush, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_ImageList_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_StockGDI_GetColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxImageList *arg1 = (wxImageList *) 0 ;
-  int arg2 ;
-  wxBitmap *arg3 = 0 ;
-  wxBitmap const &arg4_defvalue = wxNullBitmap ;
-  wxBitmap *arg4 = (wxBitmap *) &arg4_defvalue ;
-  bool result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
+  wxStockGDI::Item arg1 ;
+  wxColour *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;

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

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

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

-    (char *) "self",(char *) "index",(char *) "bitmap",(char *) "mask", NULL 
+    (char *) "item", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ImageList_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_Replace" "', expected argument " "1"" of type '" "wxImageList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxImageList * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ImageList_Replace" "', expected argument " "2"" of type '" "int""'");
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StockGDI_GetColour",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "StockGDI_GetColour" "', expected argument " "1"" of type '" "wxStockGDI::Item""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxBitmap,  0  | 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ImageList_Replace" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
-  }
-  if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_Replace" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
-  }
-  arg3 = reinterpret_cast< wxBitmap * >(argp3);
-  if (obj3) {
-    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxBitmap,  0  | 0);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ImageList_Replace" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
-    }
-    if (!argp4) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_Replace" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
-    }
-    arg4 = reinterpret_cast< wxBitmap * >(argp4);
-  }
+  arg1 = static_cast< wxStockGDI::Item >(val1);

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

-    result = (bool)(arg1)->Replace(arg2,(wxBitmap const &)*arg3,(wxBitmap const &)*arg4);
+    result = (wxColour *)wxStockGDI::GetColour(arg1);

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_ImageList_Draw(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_StockGDI_GetCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxImageList *arg1 = (wxImageList *) 0 ;
-  int arg2 ;
-  wxDC *arg3 = 0 ;
-  int arg4 ;
-  int arg5 ;
-  int arg6 = (int) wxIMAGELIST_DRAW_NORMAL ;
-  bool arg7 = (bool) (bool)false ;
-  bool result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  bool val7 ;
-  int ecode7 = 0 ;
+  wxStockGDI::Item arg1 ;
+  wxCursor *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;

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

-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
-  PyObject * obj6 = 0 ;

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

-    (char *) "self",(char *) "index",(char *) "dc",(char *) "x",(char *) "x",(char *) "flags",(char *) "solidBackground", NULL 
+    (char *) "item", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:ImageList_Draw",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_Draw" "', expected argument " "1"" of type '" "wxImageList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxImageList * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ImageList_Draw" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC,  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ImageList_Draw" "', expected argument " "3"" of type '" "wxDC &""'"); 
-  }
-  if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_Draw" "', expected argument " "3"" of type '" "wxDC &""'"); 
-  }
-  arg3 = reinterpret_cast< wxDC * >(argp3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "ImageList_Draw" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
-  ecode5 = SWIG_AsVal_int(obj4, &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "ImageList_Draw" "', expected argument " "5"" of type '" "int""'");
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StockGDI_GetCursor",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "StockGDI_GetCursor" "', expected argument " "1"" of type '" "wxStockGDI::Item""'");

   } 
   } 

-  arg5 = static_cast< int >(val5);
-  if (obj5) {
-    ecode6 = SWIG_AsVal_int(obj5, &val6);
-    if (!SWIG_IsOK(ecode6)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "ImageList_Draw" "', expected argument " "6"" of type '" "int""'");
-    } 
-    arg6 = static_cast< int >(val6);
-  }
-  if (obj6) {
-    ecode7 = SWIG_AsVal_bool(obj6, &val7);
-    if (!SWIG_IsOK(ecode7)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "ImageList_Draw" "', expected argument " "7"" of type '" "bool""'");
-    } 
-    arg7 = static_cast< bool >(val7);
-  }
+  arg1 = static_cast< wxStockGDI::Item >(val1);

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

-    result = (bool)(arg1)->Draw(arg2,*arg3,arg4,arg5,arg6,arg7);
+    result = (wxCursor *)wxStockGDI::GetCursor(arg1);

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxCursor, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_ImageList_GetImageCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StockGDI_GetPen(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxImageList *arg1 = (wxImageList *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_GetImageCount" "', expected argument " "1"" of type '" "wxImageList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxImageList * >(argp1);
+  wxStockGDI::Item arg1 ;
+  wxPen *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "item", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StockGDI_GetPen",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "StockGDI_GetPen" "', expected argument " "1"" of type '" "wxStockGDI::Item""'");
+  } 
+  arg1 = static_cast< wxStockGDI::Item >(val1);

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

-    result = (int)(arg1)->GetImageCount();
+    result = (wxPen *)wxStockGDI::GetPen(arg1);

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

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPen, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_ImageList_Remove(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_StockGDI_GetFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxImageList *arg1 = (wxImageList *) 0 ;
-  int arg2 ;
-  bool result;
+  wxStockGDI *arg1 = (wxStockGDI *) 0 ;
+  wxStockGDI::Item arg2 ;
+  wxFont *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;


@@ -22830,170 +25703,296 @@ SWIGINTERN PyObject *_wrap_ImageList_Remove(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "index", NULL 
+    (char *) "self",(char *) "item", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_Remove",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StockGDI_GetFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxStockGDI, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_Remove" "', expected argument " "1"" of type '" "wxImageList *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StockGDI_GetFont" "', expected argument " "1"" of type '" "wxStockGDI *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxImageList * >(argp1);
+  arg1 = reinterpret_cast< wxStockGDI * >(argp1);

   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ImageList_Remove" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StockGDI_GetFont" "', expected argument " "2"" of type '" "wxStockGDI::Item""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
+  arg2 = static_cast< wxStockGDI::Item >(val2);

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

-    result = (bool)(arg1)->Remove(arg2);
+    result = (wxFont *)(arg1)->GetFont(arg2);

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_ImageList_RemoveAll(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *StockGDI_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxStockGDI, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *StockGDI_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN int NullBitmap_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable NullBitmap is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *NullBitmap_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullBitmap), SWIGTYPE_p_wxBitmap,  0 );
+  return pyobj;
+}
+
+
+SWIGINTERN int NullIcon_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable NullIcon is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *NullIcon_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullIcon), SWIGTYPE_p_wxIcon,  0 );
+  return pyobj;
+}
+
+
+SWIGINTERN int NullCursor_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable NullCursor is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *NullCursor_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullCursor), SWIGTYPE_p_wxCursor,  0 );
+  return pyobj;
+}
+
+
+SWIGINTERN int NullPen_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable NullPen is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *NullPen_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullPen), SWIGTYPE_p_wxPen,  0 );
+  return pyobj;
+}
+
+
+SWIGINTERN int NullBrush_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable NullBrush is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *NullBrush_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullBrush), SWIGTYPE_p_wxBrush,  0 );
+  return pyobj;
+}
+
+
+SWIGINTERN int NullPalette_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable NullPalette is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *NullPalette_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullPalette), SWIGTYPE_p_wxPalette,  0 );
+  return pyobj;
+}
+
+
+SWIGINTERN int NullFont_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable NullFont is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *NullFont_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullFont), SWIGTYPE_p_wxFont,  0 );
+  return pyobj;
+}
+
+
+SWIGINTERN int NullColour_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable NullColour is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *NullColour_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullColour), SWIGTYPE_p_wxColour,  0 );
+  return pyobj;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GDIObjListBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxImageList *arg1 = (wxImageList *) 0 ;
-  bool result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  wxGDIObjListBase *result = 0 ;

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_RemoveAll" "', expected argument " "1"" of type '" "wxImageList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxImageList * >(argp1);
+  if (!SWIG_Python_UnpackTuple(args,"new_GDIObjListBase",0,0,0)) SWIG_fail;

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

-    result = (bool)(arg1)->RemoveAll();
+    result = (wxGDIObjListBase *)new wxGDIObjListBase();

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

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGDIObjListBase, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_ImageList_GetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_delete_GDIObjListBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxImageList *arg1 = (wxImageList *) 0 ;
-  int arg2 ;
-  int *arg3 = 0 ;
-  int *arg4 = 0 ;
+  wxGDIObjListBase *arg1 = (wxGDIObjListBase *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  int temp3 ;
-  int res3 = SWIG_TMPOBJ ;
-  int temp4 ;
-  int res4 = SWIG_TMPOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "index", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  arg3 = &temp3;
-  arg4 = &temp4;
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_GetSize",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGDIObjListBase, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_GetSize" "', expected argument " "1"" of type '" "wxImageList *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GDIObjListBase" "', expected argument " "1"" of type '" "wxGDIObjListBase *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxImageList * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ImageList_GetSize" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
+  arg1 = reinterpret_cast< wxGDIObjListBase * >(argp1);

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

-    (arg1)->GetSize(arg2,*arg3,*arg4);
+    delete arg1;
+    

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();

-  if (SWIG_IsTmpObj(res3)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags));
-  }
-  if (SWIG_IsTmpObj(res4)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg4)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res4) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, new_flags));
-  }

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

-SWIGINTERN PyObject *ImageList_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *GDIObjListBase_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxImageList, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxGDIObjListBase, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *ImageList_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *GDIObjListBase_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_StockGDI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PenList_FindOrCreatePen(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxStockGDI *result = 0 ;
+  wxPenList *arg1 = (wxPenList *) 0 ;
+  wxColour *arg2 = 0 ;
+  int arg3 ;
+  int arg4 ;
+  wxPen *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxColour temp2 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "colour",(char *) "width",(char *) "style", NULL 
+  };

   
   

-  if (!SWIG_Python_UnpackTuple(args,"new_StockGDI",0,0,0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PenList_FindOrCreatePen",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPenList, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PenList_FindOrCreatePen" "', expected argument " "1"" of type '" "wxPenList *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPenList * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+  }
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PenList_FindOrCreatePen" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PenList_FindOrCreatePen" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);

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

-    result = (wxStockGDI *)new wxStockGDI();
+    result = (wxPen *)(arg1)->FindOrCreatePen((wxColour const &)*arg2,arg3,arg4);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxStockGDI, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPen, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_delete_StockGDI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PenList_AddPen(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxStockGDI *arg1 = (wxStockGDI *) 0 ;
+  wxPenList *arg1 = (wxPenList *) 0 ;
+  wxPen *arg2 = (wxPen *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pen", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStockGDI, SWIG_POINTER_DISOWN |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_AddPen",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPenList, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StockGDI" "', expected argument " "1"" of type '" "wxStockGDI *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PenList_AddPen" "', expected argument " "1"" of type '" "wxPenList *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxStockGDI * >(argp1);
+  arg1 = reinterpret_cast< wxPenList * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxPen, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PenList_AddPen" "', expected argument " "2"" of type '" "wxPen *""'"); 
+  }
+  arg2 = reinterpret_cast< wxPen * >(argp2);

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

-    delete arg1;
-    
+    (arg1)->AddPen(arg2);

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


@@ -23004,13 +26003,34 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_StockGDI_DeleteAll(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PenList_RemovePen(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

+  wxPenList *arg1 = (wxPenList *) 0 ;
+  wxPen *arg2 = (wxPen *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pen", NULL 
+  };

   
   

-  if (!SWIG_Python_UnpackTuple(args,"StockGDI_DeleteAll",0,0,0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_RemovePen",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPenList, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PenList_RemovePen" "', expected argument " "1"" of type '" "wxPenList *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPenList * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxPen, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PenList_RemovePen" "', expected argument " "2"" of type '" "wxPen *""'"); 
+  }
+  arg2 = reinterpret_cast< wxPen * >(argp2);

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

-    wxStockGDI::DeleteAll();
+    (arg1)->RemovePen(arg2);

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


@@ -23021,341 +26041,367 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_StockGDI_instance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *PenList_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPenList, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxStockGDI *result = 0 ;
+  wxBrushList *arg1 = (wxBrushList *) 0 ;
+  wxColour *arg2 = 0 ;
+  int arg3 = (int) wxSOLID ;
+  wxBrush *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxColour temp2 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "colour",(char *) "style", NULL 
+  };

   
   

-  if (!SWIG_Python_UnpackTuple(args,"StockGDI_instance",0,0,0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBrushList, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BrushList_FindOrCreateBrush" "', expected argument " "1"" of type '" "wxBrushList *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBrushList * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+  }
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "BrushList_FindOrCreateBrush" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }

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

-    {
-      wxStockGDI &_result_ref = wxStockGDI::instance();
-      result = (wxStockGDI *) &_result_ref;
-    }
+    result = (wxBrush *)(arg1)->FindOrCreateBrush((wxColour const &)*arg2,arg3);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxStockGDI, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBrush, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_StockGDI_GetBrush(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_BrushList_AddBrush(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxStockGDI::Item arg1 ;
-  wxBrush *result = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
+  wxBrushList *arg1 = (wxBrushList *) 0 ;
+  wxBrush *arg2 = (wxBrush *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;

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

+  PyObject * obj1 = 0 ;

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

-    (char *) "item", NULL 
+    (char *) "self",(char *) "brush", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StockGDI_GetBrush",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "StockGDI_GetBrush" "', expected argument " "1"" of type '" "wxStockGDI::Item""'");
-  } 
-  arg1 = static_cast< wxStockGDI::Item >(val1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_AddBrush",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBrushList, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BrushList_AddBrush" "', expected argument " "1"" of type '" "wxBrushList *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBrushList * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxBrush, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BrushList_AddBrush" "', expected argument " "2"" of type '" "wxBrush *""'"); 
+  }
+  arg2 = reinterpret_cast< wxBrush * >(argp2);

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

-    result = (wxBrush *)wxStockGDI::GetBrush(arg1);
+    (arg1)->AddBrush(arg2);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBrush, 0 |  0 );
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_StockGDI_GetColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_BrushList_RemoveBrush(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxStockGDI::Item arg1 ;
-  wxColour *result = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
+  wxBrushList *arg1 = (wxBrushList *) 0 ;
+  wxBrush *arg2 = (wxBrush *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;

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

+  PyObject * obj1 = 0 ;

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

-    (char *) "item", NULL 
+    (char *) "self",(char *) "brush", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StockGDI_GetColour",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "StockGDI_GetColour" "', expected argument " "1"" of type '" "wxStockGDI::Item""'");
-  } 
-  arg1 = static_cast< wxStockGDI::Item >(val1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_RemoveBrush",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBrushList, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BrushList_RemoveBrush" "', expected argument " "1"" of type '" "wxBrushList *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBrushList * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxBrush, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BrushList_RemoveBrush" "', expected argument " "2"" of type '" "wxBrush *""'"); 
+  }
+  arg2 = reinterpret_cast< wxBrush * >(argp2);

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

-    result = (wxColour *)wxStockGDI::GetColour(arg1);
+    (arg1)->RemoveBrush(arg2);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 |  0 );
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_StockGDI_GetCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *BrushList_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxBrushList, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_FontList_FindOrCreateFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxStockGDI::Item arg1 ;
-  wxCursor *result = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
+  wxFontList *arg1 = (wxFontList *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
+  bool arg6 = (bool) false ;
+  wxString const &arg7_defvalue = wxPyEmptyString ;
+  wxString *arg7 = (wxString *) &arg7_defvalue ;
+  wxFontEncoding arg8 = (wxFontEncoding) wxFONTENCODING_DEFAULT ;
+  wxFont *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  bool val6 ;
+  int ecode6 = 0 ;
+  bool temp7 = false ;
+  int val8 ;
+  int ecode8 = 0 ;

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

+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;

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

-    (char *) "item", NULL 
+    (char *) "self",(char *) "point_size",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "facename",(char *) "encoding", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StockGDI_GetCursor",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "StockGDI_GetCursor" "', expected argument " "1"" of type '" "wxStockGDI::Item""'");
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:FontList_FindOrCreateFont",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontList, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontList_FindOrCreateFont" "', expected argument " "1"" of type '" "wxFontList *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFontList * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FontList_FindOrCreateFont" "', expected argument " "2"" of type '" "int""'");

   } 
   } 

-  arg1 = static_cast< wxStockGDI::Item >(val1);
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FontList_FindOrCreateFont" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FontList_FindOrCreateFont" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "FontList_FindOrCreateFont" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
+  if (obj5) {
+    ecode6 = SWIG_AsVal_bool(obj5, &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "FontList_FindOrCreateFont" "', expected argument " "6"" of type '" "bool""'");
+    } 
+    arg6 = static_cast< bool >(val6);
+  }
+  if (obj6) {
+    {
+      arg7 = wxString_in_helper(obj6);
+      if (arg7 == NULL) SWIG_fail;
+      temp7 = true;
+    }
+  }
+  if (obj7) {
+    ecode8 = SWIG_AsVal_int(obj7, &val8);
+    if (!SWIG_IsOK(ecode8)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "FontList_FindOrCreateFont" "', expected argument " "8"" of type '" "wxFontEncoding""'");
+    } 
+    arg8 = static_cast< wxFontEncoding >(val8);
+  }

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

-    result = (wxCursor *)wxStockGDI::GetCursor(arg1);
+    result = (wxFont *)(arg1)->FindOrCreateFont(arg2,arg3,arg4,arg5,arg6,(wxString const &)*arg7,arg8);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxCursor, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 |  0 );
+  {
+    if (temp7)
+    delete arg7;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp7)
+    delete arg7;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_StockGDI_GetPen(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_FontList_AddFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxStockGDI::Item arg1 ;
-  wxPen *result = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
+  wxFontList *arg1 = (wxFontList *) 0 ;
+  wxFont *arg2 = (wxFont *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;

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

+  PyObject * obj1 = 0 ;

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

-    (char *) "item", NULL 
+    (char *) "self",(char *) "font", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StockGDI_GetPen",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "StockGDI_GetPen" "', expected argument " "1"" of type '" "wxStockGDI::Item""'");
-  } 
-  arg1 = static_cast< wxStockGDI::Item >(val1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_AddFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontList, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontList_AddFont" "', expected argument " "1"" of type '" "wxFontList *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFontList * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FontList_AddFont" "', expected argument " "2"" of type '" "wxFont *""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);

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

-    result = (wxPen *)wxStockGDI::GetPen(arg1);
+    (arg1)->AddFont(arg2);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPen, 0 |  0 );
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_StockGDI_GetFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_FontList_RemoveFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxStockGDI *arg1 = (wxStockGDI *) 0 ;
-  wxStockGDI::Item arg2 ;
-  wxFont *result = 0 ;
+  wxFontList *arg1 = (wxFontList *) 0 ;
+  wxFont *arg2 = (wxFont *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;

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

-    (char *) "self",(char *) "item", NULL 
+    (char *) "self",(char *) "font", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StockGDI_GetFont",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxStockGDI, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_RemoveFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontList, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StockGDI_GetFont" "', expected argument " "1"" of type '" "wxStockGDI *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontList_RemoveFont" "', expected argument " "1"" of type '" "wxFontList *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxStockGDI * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StockGDI_GetFont" "', expected argument " "2"" of type '" "wxStockGDI::Item""'");
-  } 
-  arg2 = static_cast< wxStockGDI::Item >(val2);
+  arg1 = reinterpret_cast< wxFontList * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FontList_RemoveFont" "', expected argument " "2"" of type '" "wxFont *""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);

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

-    result = (wxFont *)(arg1)->GetFont(arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *StockGDI_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxStockGDI, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *StockGDI_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN int NullBitmap_set(PyObject *) {
-  SWIG_Error(SWIG_AttributeError,"Variable NullBitmap is read-only.");
-  return 1;
-}
-
-
-SWIGINTERN PyObject *NullBitmap_get(void) {
-  PyObject *pyobj = 0;
-  
-  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullBitmap), SWIGTYPE_p_wxBitmap,  0 );
-  return pyobj;
-}
-
-
-SWIGINTERN int NullIcon_set(PyObject *) {
-  SWIG_Error(SWIG_AttributeError,"Variable NullIcon is read-only.");
-  return 1;
-}
-
-
-SWIGINTERN PyObject *NullIcon_get(void) {
-  PyObject *pyobj = 0;
-  
-  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullIcon), SWIGTYPE_p_wxIcon,  0 );
-  return pyobj;
-}
-
-
-SWIGINTERN int NullCursor_set(PyObject *) {
-  SWIG_Error(SWIG_AttributeError,"Variable NullCursor is read-only.");
-  return 1;
-}
-
-
-SWIGINTERN PyObject *NullCursor_get(void) {
-  PyObject *pyobj = 0;
-  
-  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullCursor), SWIGTYPE_p_wxCursor,  0 );
-  return pyobj;
-}
-
-
-SWIGINTERN int NullPen_set(PyObject *) {
-  SWIG_Error(SWIG_AttributeError,"Variable NullPen is read-only.");
-  return 1;
-}
-
-
-SWIGINTERN PyObject *NullPen_get(void) {
-  PyObject *pyobj = 0;
-  
-  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullPen), SWIGTYPE_p_wxPen,  0 );
-  return pyobj;
-}
-
-
-SWIGINTERN int NullBrush_set(PyObject *) {
-  SWIG_Error(SWIG_AttributeError,"Variable NullBrush is read-only.");
-  return 1;
-}
-
-
-SWIGINTERN PyObject *NullBrush_get(void) {
-  PyObject *pyobj = 0;
-  
-  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullBrush), SWIGTYPE_p_wxBrush,  0 );
-  return pyobj;
-}
-
-
-SWIGINTERN int NullPalette_set(PyObject *) {
-  SWIG_Error(SWIG_AttributeError,"Variable NullPalette is read-only.");
-  return 1;
-}
-
-
-SWIGINTERN PyObject *NullPalette_get(void) {
-  PyObject *pyobj = 0;
-  
-  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullPalette), SWIGTYPE_p_wxPalette,  0 );
-  return pyobj;
-}
-
-
-SWIGINTERN int NullFont_set(PyObject *) {
-  SWIG_Error(SWIG_AttributeError,"Variable NullFont is read-only.");
-  return 1;
-}
-
-
-SWIGINTERN PyObject *NullFont_get(void) {
-  PyObject *pyobj = 0;
-  
-  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullFont), SWIGTYPE_p_wxFont,  0 );
-  return pyobj;
-}
-
-
-SWIGINTERN int NullColour_set(PyObject *) {
-  SWIG_Error(SWIG_AttributeError,"Variable NullColour is read-only.");
-  return 1;
+    (arg1)->RemoveFont(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;

 }
 
 
 }
 
 

-SWIGINTERN PyObject *NullColour_get(void) {
-  PyObject *pyobj = 0;
-  
-  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullColour), SWIGTYPE_p_wxColour,  0 );
-  return pyobj;
+SWIGINTERN PyObject *FontList_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxFontList, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();

 }
 
 }
 

-
-SWIGINTERN PyObject *_wrap_new_GDIObjListBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ColourDatabase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxGDIObjListBase *result = 0 ;
+  wxColourDatabase *result = 0 ;

   
   

-  if (!SWIG_Python_UnpackTuple(args,"new_GDIObjListBase",0,0,0)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args,"new_ColourDatabase",0,0,0)) SWIG_fail;

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxGDIObjListBase *)new wxGDIObjListBase();
+    result = (wxColourDatabase *)new wxColourDatabase();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGDIObjListBase, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColourDatabase, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_delete_GDIObjListBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ColourDatabase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxGDIObjListBase *arg1 = (wxGDIObjListBase *) 0 ;
+  wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGDIObjListBase, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxColourDatabase, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GDIObjListBase" "', expected argument " "1"" of type '" "wxGDIObjListBase *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ColourDatabase" "', expected argument " "1"" of type '" "wxColourDatabase *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxGDIObjListBase * >(argp1);
+  arg1 = reinterpret_cast< wxColourDatabase * >(argp1);

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


@@ -23370,459 +26416,486 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *GDIObjListBase_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxGDIObjListBase, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
+SWIGINTERN PyObject *_wrap_ColourDatabase_Find(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
+  wxString *arg2 = 0 ;
+  wxColour result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "name", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_Find",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColourDatabase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ColourDatabase_Find" "', expected argument " "1"" of type '" "wxColourDatabase const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxColourDatabase * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxColourDatabase const *)arg1)->Find((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;

 }
 
 }
 

-SWIGINTERN PyObject *GDIObjListBase_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}

 
 

-SWIGINTERN PyObject *_wrap_PenList_FindOrCreatePen(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ColourDatabase_FindName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPenList *arg1 = (wxPenList *) 0 ;
+  wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;

   wxColour *arg2 = 0 ;
   wxColour *arg2 = 0 ;

+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxColour temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "colour", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_FindName",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColourDatabase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ColourDatabase_FindName" "', expected argument " "1"" of type '" "wxColourDatabase const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxColourDatabase * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxColourDatabase const *)arg1)->FindName((wxColour const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ColourDatabase_AddColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
+  wxString *arg2 = 0 ;
+  wxColour *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  wxColour temp3 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "name",(char *) "colour", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourDatabase_AddColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColourDatabase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ColourDatabase_AddColour" "', expected argument " "1"" of type '" "wxColourDatabase *""'"); 
+  }
+  arg1 = reinterpret_cast< wxColourDatabase * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    arg3 = &temp3;
+    if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->AddColour((wxString const &)*arg2,(wxColour const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ColourDatabase_Append(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
+  wxString *arg2 = 0 ;

   int arg3 ;
   int arg4 ;
   int arg3 ;
   int arg4 ;

-  wxPen *result = 0 ;
+  int arg5 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxColour temp2 ;
+  bool temp2 = false ;

   int val3 ;
   int ecode3 = 0 ;
   int val4 ;
   int ecode4 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
   int val4 ;
   int ecode4 = 0 ;

+  int val5 ;
+  int ecode5 = 0 ;

   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 *) "colour",(char *) "width",(char *) "style", NULL 
+    (char *) "self",(char *) "name",(char *) "red",(char *) "green",(char *) "blue", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PenList_FindOrCreatePen",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPenList, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:ColourDatabase_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColourDatabase, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PenList_FindOrCreatePen" "', expected argument " "1"" of type '" "wxPenList *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ColourDatabase_Append" "', expected argument " "1"" of type '" "wxColourDatabase *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPenList * >(argp1);
+  arg1 = reinterpret_cast< wxColourDatabase * >(argp1);

   {
   {

-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;

   }
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
   }
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PenList_FindOrCreatePen" "', expected argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ColourDatabase_Append" "', expected argument " "3"" of type '" "int""'");

   } 
   arg3 = static_cast< int >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
   } 
   arg3 = static_cast< int >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PenList_FindOrCreatePen" "', expected argument " "4"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "ColourDatabase_Append" "', expected argument " "4"" of type '" "int""'");

   } 
   arg4 = static_cast< int >(val4);
   } 
   arg4 = static_cast< int >(val4);

+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "ColourDatabase_Append" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);

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

-    result = (wxPen *)(arg1)->FindOrCreatePen((wxColour const &)*arg2,arg3,arg4);
+    wxColourDatabase_Append(arg1,(wxString const &)*arg2,arg3,arg4,arg5);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPen, 0 |  0 );
+  resultobj = SWIG_Py_Void();
+  {
+    if (temp2)
+    delete arg2;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp2)
+    delete arg2;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PenList_AddPen(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxPenList *arg1 = (wxPenList *) 0 ;
-  wxPen *arg2 = (wxPen *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "pen", NULL 
-  };
+SWIGINTERN PyObject *ColourDatabase_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxColourDatabase, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *ColourDatabase_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap__wxPyInitTheFontList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFontList *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_AddPen",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPenList, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PenList_AddPen" "', expected argument " "1"" of type '" "wxPenList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPenList * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxPen, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PenList_AddPen" "', expected argument " "2"" of type '" "wxPen *""'"); 
-  }
-  arg2 = reinterpret_cast< wxPen * >(argp2);
+  if (!SWIG_Python_UnpackTuple(args,"_wxPyInitTheFontList",0,0,0)) SWIG_fail;

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

-    (arg1)->AddPen(arg2);
+    result = (wxFontList *)_wxPyInitTheFontList();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFontList, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_PenList_RemovePen(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap__wxPyInitThePenList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPenList *arg1 = (wxPenList *) 0 ;
-  wxPen *arg2 = (wxPen *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "pen", NULL 
-  };
+  wxPenList *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_RemovePen",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPenList, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PenList_RemovePen" "', expected argument " "1"" of type '" "wxPenList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPenList * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxPen, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PenList_RemovePen" "', expected argument " "2"" of type '" "wxPen *""'"); 
-  }
-  arg2 = reinterpret_cast< wxPen * >(argp2);
+  if (!SWIG_Python_UnpackTuple(args,"_wxPyInitThePenList",0,0,0)) SWIG_fail;

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

-    (arg1)->RemovePen(arg2);
+    result = (wxPenList *)_wxPyInitThePenList();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPenList, 0 |  0 );

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

-SWIGINTERN PyObject *PenList_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPenList, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap__wxPyInitTheBrushList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxBrushList *arg1 = (wxBrushList *) 0 ;
-  wxColour *arg2 = 0 ;
-  int arg3 = (int) wxSOLID ;
-  wxBrush *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  wxColour temp2 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "colour",(char *) "style", NULL 
-  };
+  wxBrushList *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBrushList, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BrushList_FindOrCreateBrush" "', expected argument " "1"" of type '" "wxBrushList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxBrushList * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-  }
-  if (obj2) {
-    ecode3 = SWIG_AsVal_int(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "BrushList_FindOrCreateBrush" "', expected argument " "3"" of type '" "int""'");
-    } 
-    arg3 = static_cast< int >(val3);
-  }
+  if (!SWIG_Python_UnpackTuple(args,"_wxPyInitTheBrushList",0,0,0)) SWIG_fail;

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

-    result = (wxBrush *)(arg1)->FindOrCreateBrush((wxColour const &)*arg2,arg3);
+    result = (wxBrushList *)_wxPyInitTheBrushList();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBrush, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBrushList, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_BrushList_AddBrush(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap__wxPyInitTheColourDatabase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxBrushList *arg1 = (wxBrushList *) 0 ;
-  wxBrush *arg2 = (wxBrush *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "brush", NULL 
-  };
+  wxColourDatabase *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_AddBrush",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBrushList, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BrushList_AddBrush" "', expected argument " "1"" of type '" "wxBrushList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxBrushList * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxBrush, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BrushList_AddBrush" "', expected argument " "2"" of type '" "wxBrush *""'"); 
-  }
-  arg2 = reinterpret_cast< wxBrush * >(argp2);
+  if (!SWIG_Python_UnpackTuple(args,"_wxPyInitTheColourDatabase",0,0,0)) SWIG_fail;

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

-    (arg1)->AddBrush(arg2);
+    result = (wxColourDatabase *)_wxPyInitTheColourDatabase();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColourDatabase, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_BrushList_RemoveBrush(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_Effects(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxBrushList *arg1 = (wxBrushList *) 0 ;
-  wxBrush *arg2 = (wxBrush *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "brush", NULL 
-  };
+  wxEffects *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_RemoveBrush",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBrushList, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BrushList_RemoveBrush" "', expected argument " "1"" of type '" "wxBrushList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxBrushList * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxBrush, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BrushList_RemoveBrush" "', expected argument " "2"" of type '" "wxBrush *""'"); 
-  }
-  arg2 = reinterpret_cast< wxBrush * >(argp2);
+  if (!SWIG_Python_UnpackTuple(args,"new_Effects",0,0,0)) SWIG_fail;

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

-    (arg1)->RemoveBrush(arg2);
+    result = (wxEffects *)new wxEffects();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxEffects, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *BrushList_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxBrushList, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_FontList_FindOrCreateFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Effects_GetHighlightColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontList *arg1 = (wxFontList *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  bool arg6 = (bool) false ;
-  wxString const &arg7_defvalue = wxPyEmptyString ;
-  wxString *arg7 = (wxString *) &arg7_defvalue ;
-  wxFontEncoding arg8 = (wxFontEncoding) wxFONTENCODING_DEFAULT ;
-  wxFont *result = 0 ;
+  wxEffects *arg1 = (wxEffects *) 0 ;
+  wxColour result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  bool val6 ;
-  int ecode6 = 0 ;
-  bool temp7 = false ;
-  int val8 ;
-  int ecode8 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
-  PyObject * obj6 = 0 ;
-  PyObject * obj7 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "point_size",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "facename",(char *) "encoding", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:FontList_FindOrCreateFont",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontList, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontList_FindOrCreateFont" "', expected argument " "1"" of type '" "wxFontList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFontList * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FontList_FindOrCreateFont" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FontList_FindOrCreateFont" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FontList_FindOrCreateFont" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
-  ecode5 = SWIG_AsVal_int(obj4, &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "FontList_FindOrCreateFont" "', expected argument " "5"" of type '" "int""'");
-  } 
-  arg5 = static_cast< int >(val5);
-  if (obj5) {
-    ecode6 = SWIG_AsVal_bool(obj5, &val6);
-    if (!SWIG_IsOK(ecode6)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "FontList_FindOrCreateFont" "', expected argument " "6"" of type '" "bool""'");
-    } 
-    arg6 = static_cast< bool >(val6);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_GetHighlightColour" "', expected argument " "1"" of type '" "wxEffects const *""'"); 

   }
   }

-  if (obj6) {
-    {
-      arg7 = wxString_in_helper(obj6);
-      if (arg7 == NULL) SWIG_fail;
-      temp7 = true;
-    }
+  arg1 = reinterpret_cast< wxEffects * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxEffects const *)arg1)->GetHighlightColour();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

-  if (obj7) {
-    ecode8 = SWIG_AsVal_int(obj7, &val8);
-    if (!SWIG_IsOK(ecode8)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "FontList_FindOrCreateFont" "', expected argument " "8"" of type '" "wxFontEncoding""'");
-    } 
-    arg8 = static_cast< wxFontEncoding >(val8);
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Effects_GetLightShadow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxEffects *arg1 = (wxEffects *) 0 ;
+  wxColour result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_GetLightShadow" "', expected argument " "1"" of type '" "wxEffects const *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxEffects * >(argp1);

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

-    result = (wxFont *)(arg1)->FindOrCreateFont(arg2,arg3,arg4,arg5,arg6,(wxString const &)*arg7,arg8);
+    result = ((wxEffects const *)arg1)->GetLightShadow();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 |  0 );
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Effects_GetFaceColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxEffects *arg1 = (wxEffects *) 0 ;
+  wxColour result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_GetFaceColour" "', expected argument " "1"" of type '" "wxEffects const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxEffects * >(argp1);

   {
   {

-    if (temp7)
-    delete arg7;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxEffects const *)arg1)->GetFaceColour();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return resultobj;
 fail:

+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Effects_GetMediumShadow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxEffects *arg1 = (wxEffects *) 0 ;
+  wxColour result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_GetMediumShadow" "', expected argument " "1"" of type '" "wxEffects const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxEffects * >(argp1);

   {
   {

-    if (temp7)
-    delete arg7;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxEffects const *)arg1)->GetMediumShadow();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_FontList_AddFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Effects_GetDarkShadow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontList *arg1 = (wxFontList *) 0 ;
-  wxFont *arg2 = (wxFont *) 0 ;
+  wxEffects *arg1 = (wxEffects *) 0 ;
+  wxColour result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "font", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_AddFont",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontList, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontList_AddFont" "', expected argument " "1"" of type '" "wxFontList *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFontList * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FontList_AddFont" "', expected argument " "2"" of type '" "wxFont *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_GetDarkShadow" "', expected argument " "1"" of type '" "wxEffects const *""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  arg1 = reinterpret_cast< wxEffects * >(argp1);

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

-    (arg1)->AddFont(arg2);
+    result = ((wxEffects const *)arg1)->GetDarkShadow();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );

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

-SWIGINTERN PyObject *_wrap_FontList_RemoveFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Effects_SetHighlightColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxFontList *arg1 = (wxFontList *) 0 ;
-  wxFont *arg2 = (wxFont *) 0 ;
+  wxEffects *arg1 = (wxEffects *) 0 ;
+  wxColour *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  wxColour temp2 ;

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

-    (char *) "self",(char *) "font", NULL 
+    (char *) "self",(char *) "c", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_RemoveFont",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontList, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetHighlightColour",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontList_RemoveFont" "', expected argument " "1"" of type '" "wxFontList *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_SetHighlightColour" "', expected argument " "1"" of type '" "wxEffects *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxFontList * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FontList_RemoveFont" "', expected argument " "2"" of type '" "wxFont *""'"); 
+  arg1 = reinterpret_cast< wxEffects * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);

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

-    (arg1)->RemoveFont(arg2);
+    (arg1)->SetHighlightColour((wxColour const &)*arg2);

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


@@ -23833,50 +26906,68 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *FontList_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxFontList, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_new_ColourDatabase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Effects_SetLightShadow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxColourDatabase *result = 0 ;
+  wxEffects *arg1 = (wxEffects *) 0 ;
+  wxColour *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxColour temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "c", NULL 
+  };

   
   

-  if (!SWIG_Python_UnpackTuple(args,"new_ColourDatabase",0,0,0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetLightShadow",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_SetLightShadow" "', expected argument " "1"" of type '" "wxEffects *""'"); 
+  }
+  arg1 = reinterpret_cast< wxEffects * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+  }

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

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

-    result = (wxColourDatabase *)new wxColourDatabase();
+    (arg1)->SetLightShadow((wxColour const &)*arg2);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColourDatabase, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_delete_ColourDatabase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Effects_SetFaceColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
+  wxEffects *arg1 = (wxEffects *) 0 ;
+  wxColour *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  wxColour temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "c", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxColourDatabase, SWIG_POINTER_DISOWN |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetFaceColour",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ColourDatabase" "', expected argument " "1"" of type '" "wxColourDatabase *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_SetFaceColour" "', expected argument " "1"" of type '" "wxEffects *""'"); 
+  }
+  arg1 = reinterpret_cast< wxEffects * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;

   }
   }

-  arg1 = reinterpret_cast< wxColourDatabase * >(argp1);

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

-    delete arg1;
-    
+    (arg1)->SetFaceColour((wxColour const &)*arg2);

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


@@ -23887,522 +26978,467 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_ColourDatabase_Find(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Effects_SetMediumShadow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
-  wxString *arg2 = 0 ;
-  wxColour result;
+  wxEffects *arg1 = (wxEffects *) 0 ;
+  wxColour *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
+  wxColour temp2 ;

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

-    (char *) "self",(char *) "name", NULL 
+    (char *) "self",(char *) "c", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_Find",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColourDatabase, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetMediumShadow",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ColourDatabase_Find" "', expected argument " "1"" of type '" "wxColourDatabase const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_SetMediumShadow" "', expected argument " "1"" of type '" "wxEffects *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxColourDatabase * >(argp1);
+  arg1 = reinterpret_cast< wxEffects * >(argp1);

   {
   {

-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    arg2 = &temp2;
+    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;

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

-    result = ((wxColourDatabase const *)arg1)->Find((wxString const &)*arg2);
+    (arg1)->SetMediumShadow((wxColour const &)*arg2);

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

-  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
-  {
-    if (temp2)
-    delete arg2;
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_ColourDatabase_FindName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Effects_SetDarkShadow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
+  wxEffects *arg1 = (wxEffects *) 0 ;

   wxColour *arg2 = 0 ;
   wxColour *arg2 = 0 ;

-  wxString result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   wxColour temp2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxColour temp2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "colour", NULL 
+    (char *) "self",(char *) "c", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_FindName",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColourDatabase, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetDarkShadow",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ColourDatabase_FindName" "', expected argument " "1"" of type '" "wxColourDatabase const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_SetDarkShadow" "', expected argument " "1"" of type '" "wxEffects *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxColourDatabase * >(argp1);
+  arg1 = reinterpret_cast< wxEffects * >(argp1);

   {
     arg2 = &temp2;
     if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     arg2 = &temp2;
     if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = ((wxColourDatabase const *)arg1)->FindName((wxColour const &)*arg2);
+    (arg1)->SetDarkShadow((wxColour const &)*arg2);

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

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-  }
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_ColourDatabase_AddColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Effects_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
-  wxString *arg2 = 0 ;
+  wxEffects *arg1 = (wxEffects *) 0 ;
+  wxColour *arg2 = 0 ;

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

+  wxColour *arg4 = 0 ;
+  wxColour *arg5 = 0 ;
+  wxColour *arg6 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
+  wxColour temp2 ;

   wxColour temp3 ;
   wxColour temp3 ;

+  wxColour temp4 ;
+  wxColour temp5 ;
+  wxColour temp6 ;

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

+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;

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

-    (char *) "self",(char *) "name",(char *) "colour", NULL 
+    (char *) "self",(char *) "highlightColour",(char *) "lightShadow",(char *) "faceColour",(char *) "mediumShadow",(char *) "darkShadow", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourDatabase_AddColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColourDatabase, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Effects_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ColourDatabase_AddColour" "', expected argument " "1"" of type '" "wxColourDatabase *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_Set" "', expected argument " "1"" of type '" "wxEffects *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxColourDatabase * >(argp1);
+  arg1 = reinterpret_cast< wxEffects * >(argp1);

   {
   {

-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    arg2 = &temp2;
+    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;

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

+  {
+    arg4 = &temp4;
+    if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail;
+  }
+  {
+    arg5 = &temp5;
+    if ( ! wxColour_helper(obj4, &arg5)) SWIG_fail;
+  }
+  {
+    arg6 = &temp6;
+    if ( ! wxColour_helper(obj5, &arg6)) SWIG_fail;
+  }

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

-    (arg1)->AddColour((wxString const &)*arg2,(wxColour const &)*arg3);
+    (arg1)->Set((wxColour const &)*arg2,(wxColour const &)*arg3,(wxColour const &)*arg4,(wxColour const &)*arg5,(wxColour const &)*arg6);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();

-  {
-    if (temp2)
-    delete arg2;
-  }

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_ColourDatabase_Append(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
-  wxString *arg2 = 0 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
+  wxEffects *arg1 = (wxEffects *) 0 ;
+  wxDC *arg2 = 0 ;
+  wxRect *arg3 = 0 ;
+  int arg4 = (int) 1 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
-  int val3 ;
-  int ecode3 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  wxRect temp3 ;

   int val4 ;
   int ecode4 = 0 ;
   int val4 ;
   int ecode4 = 0 ;

-  int val5 ;
-  int ecode5 = 0 ;

   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 *) "name",(char *) "red",(char *) "green",(char *) "blue", NULL 
+    (char *) "self",(char *) "dc",(char *) "rect",(char *) "borderSize", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:ColourDatabase_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColourDatabase, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Effects_DrawSunkenEdge",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ColourDatabase_Append" "', expected argument " "1"" of type '" "wxColourDatabase *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_DrawSunkenEdge" "', expected argument " "1"" of type '" "wxEffects *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxColourDatabase * >(argp1);
-  {
-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+  arg1 = reinterpret_cast< wxEffects * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Effects_DrawSunkenEdge" "', expected argument " "2"" of type '" "wxDC &""'"); 

   }
   }

-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ColourDatabase_Append" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "ColourDatabase_Append" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
-  ecode5 = SWIG_AsVal_int(obj4, &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "ColourDatabase_Append" "', expected argument " "5"" of type '" "int""'");
-  } 
-  arg5 = static_cast< int >(val5);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxColourDatabase_Append(arg1,(wxString const &)*arg2,arg3,arg4,arg5);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Effects_DrawSunkenEdge" "', expected argument " "2"" of type '" "wxDC &""'"); 

   }
   }

-  resultobj = SWIG_Py_Void();
+  arg2 = reinterpret_cast< wxDC * >(argp2);

   {
   {

-    if (temp2)
-    delete arg2;
+    arg3 = &temp3;
+    if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;

   }
   }

-  return resultobj;
-fail:
-  {
-    if (temp2)
-    delete arg2;
+  if (obj3) {
+    ecode4 = SWIG_AsVal_int(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Effects_DrawSunkenEdge" "', expected argument " "4"" of type '" "int""'");
+    } 
+    arg4 = static_cast< int >(val4);

   }
   }

-  return NULL;
-}
-
-
-SWIGINTERN PyObject *ColourDatabase_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxColourDatabase, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *ColourDatabase_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap__wxPyInitTheFontList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxFontList *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"_wxPyInitTheFontList",0,0,0)) SWIG_fail;

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

-    result = (wxFontList *)_wxPyInitTheFontList();
+    (arg1)->DrawSunkenEdge(*arg2,(wxRect const &)*arg3,arg4);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFontList, 0 |  0 );
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap__wxPyInitThePenList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Effects_TileBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPenList *result = 0 ;
+  wxEffects *arg1 = (wxEffects *) 0 ;
+  wxRect *arg2 = 0 ;
+  wxDC *arg3 = 0 ;
+  wxBitmap *arg4 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxRect temp2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "rect",(char *) "dc",(char *) "bitmap", NULL 
+  };

   
   

-  if (!SWIG_Python_UnpackTuple(args,"_wxPyInitThePenList",0,0,0)) SWIG_fail;
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxPenList *)_wxPyInitThePenList();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Effects_TileBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_TileBitmap" "', expected argument " "1"" of type '" "wxEffects *""'"); 

   }
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPenList, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap__wxPyInitTheBrushList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxBrushList *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"_wxPyInitTheBrushList",0,0,0)) SWIG_fail;
+  arg1 = reinterpret_cast< wxEffects * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxBrushList *)_wxPyInitTheBrushList();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    arg2 = &temp2;
+    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;

   }
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBrushList, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap__wxPyInitTheColourDatabase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxColourDatabase *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"_wxPyInitTheColourDatabase",0,0,0)) SWIG_fail;
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxColourDatabase *)_wxPyInitTheColourDatabase();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Effects_TileBitmap" "', expected argument " "3"" of type '" "wxDC &""'"); 

   }
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColourDatabase, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_Effects(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxEffects *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"new_Effects",0,0,0)) SWIG_fail;
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Effects_TileBitmap" "', expected argument " "3"" of type '" "wxDC &""'"); 
+  }
+  arg3 = reinterpret_cast< wxDC * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxBitmap,  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Effects_TileBitmap" "', expected argument " "4"" of type '" "wxBitmap &""'"); 
+  }
+  if (!argp4) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Effects_TileBitmap" "', expected argument " "4"" of type '" "wxBitmap &""'"); 
+  }
+  arg4 = reinterpret_cast< wxBitmap * >(argp4);

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

-    result = (wxEffects *)new wxEffects();
+    result = (bool)(arg1)->TileBitmap((wxRect const &)*arg2,*arg3,*arg4);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxEffects, SWIG_POINTER_NEW |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

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

-SWIGINTERN PyObject *_wrap_Effects_GetHighlightColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *Effects_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxEffects, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *Effects_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_SplitterRenderParams(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxColour result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  int arg1 ;
+  int arg2 ;
+  bool arg3 ;
+  wxSplitterRenderParams *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "widthSash_",(char *) "border_",(char *) "isSens_", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_GetHighlightColour" "', expected argument " "1"" of type '" "wxEffects const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxEffects * >(argp1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_SplitterRenderParams",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SplitterRenderParams" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_SplitterRenderParams" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_SplitterRenderParams" "', expected argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);

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

-    result = ((wxEffects const *)arg1)->GetHighlightColour();
+    result = (wxSplitterRenderParams *)new wxSplitterRenderParams(arg1,arg2,arg3);

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

-  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSplitterRenderParams, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_Effects_GetLightShadow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_SplitterRenderParams(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxColour result;
+  wxSplitterRenderParams *arg1 = (wxSplitterRenderParams *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSplitterRenderParams, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_GetLightShadow" "', expected argument " "1"" of type '" "wxEffects const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SplitterRenderParams" "', expected argument " "1"" of type '" "wxSplitterRenderParams *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxEffects * >(argp1);
+  arg1 = reinterpret_cast< wxSplitterRenderParams * >(argp1);

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

-    result = ((wxEffects const *)arg1)->GetLightShadow();
+    delete arg1;
+    

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

-  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_Effects_GetFaceColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SplitterRenderParams_widthSash_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxColour result;
+  wxSplitterRenderParams *arg1 = (wxSplitterRenderParams *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSplitterRenderParams, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_GetFaceColour" "', expected argument " "1"" of type '" "wxEffects const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxEffects * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = ((wxEffects const *)arg1)->GetFaceColour();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SplitterRenderParams_widthSash_get" "', expected argument " "1"" of type '" "wxSplitterRenderParams *""'"); 

   }
   }

-  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
+  arg1 = reinterpret_cast< wxSplitterRenderParams * >(argp1);
+  result = (int)(int) ((arg1)->widthSash);
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_Effects_GetMediumShadow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SplitterRenderParams_border_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxColour result;
+  wxSplitterRenderParams *arg1 = (wxSplitterRenderParams *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSplitterRenderParams, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_GetMediumShadow" "', expected argument " "1"" of type '" "wxEffects const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxEffects * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = ((wxEffects const *)arg1)->GetMediumShadow();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SplitterRenderParams_border_get" "', expected argument " "1"" of type '" "wxSplitterRenderParams *""'"); 

   }
   }

-  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
+  arg1 = reinterpret_cast< wxSplitterRenderParams * >(argp1);
+  result = (int)(int) ((arg1)->border);
+  resultobj = SWIG_From_int(static_cast< int >(result));

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

-SWIGINTERN PyObject *_wrap_Effects_GetDarkShadow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SplitterRenderParams_isHotSensitive_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxColour result;
+  wxSplitterRenderParams *arg1 = (wxSplitterRenderParams *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSplitterRenderParams, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_GetDarkShadow" "', expected argument " "1"" of type '" "wxEffects const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxEffects * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = ((wxEffects const *)arg1)->GetDarkShadow();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SplitterRenderParams_isHotSensitive_get" "', expected argument " "1"" of type '" "wxSplitterRenderParams *""'"); 

   }
   }

-  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
+  arg1 = reinterpret_cast< wxSplitterRenderParams * >(argp1);
+  result = (bool)(bool) ((arg1)->isHotSensitive);
+  resultobj = SWIG_From_bool(static_cast< bool >(result));

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

-SWIGINTERN PyObject *_wrap_Effects_SetHighlightColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *SplitterRenderParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxSplitterRenderParams, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *SplitterRenderParams_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_HeaderButtonParams(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxColour *arg2 = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  wxColour temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "c", NULL 
-  };
+  wxHeaderButtonParams *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetHighlightColour",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_SetHighlightColour" "', expected argument " "1"" of type '" "wxEffects *""'"); 
-  }
-  arg1 = reinterpret_cast< wxEffects * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-  }
+  if (!SWIG_Python_UnpackTuple(args,"new_HeaderButtonParams",0,0,0)) SWIG_fail;

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

-    (arg1)->SetHighlightColour((wxColour const &)*arg2);
+    result = (wxHeaderButtonParams *)new wxHeaderButtonParams();

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHeaderButtonParams, SWIG_POINTER_NEW |  0 );

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

-SWIGINTERN PyObject *_wrap_Effects_SetLightShadow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_delete_HeaderButtonParams(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxColour *arg2 = 0 ;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxColour temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "c", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetLightShadow",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_SetLightShadow" "', expected argument " "1"" of type '" "wxEffects *""'"); 
-  }
-  arg1 = reinterpret_cast< wxEffects * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_HeaderButtonParams" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);

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

-    (arg1)->SetLightShadow((wxColour const &)*arg2);
+    delete arg1;
+    

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


@@ -24413,107 +27449,78 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Effects_SetFaceColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_arrowColour_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxColour *arg2 = 0 ;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  wxColour *arg2 = (wxColour *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   wxColour temp2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxColour temp2 ;

-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "c", NULL 
-  };
+  PyObject *swig_obj[2] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetFaceColour",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_arrowColour_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_SetFaceColour" "', expected argument " "1"" of type '" "wxEffects *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_arrowColour_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxEffects * >(argp1);
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);

   {
     arg2 = &temp2;
   {
     arg2 = &temp2;

-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetFaceColour((wxColour const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    if ( ! wxColour_helper(swig_obj[1], &arg2)) SWIG_fail;

   }
   }

+  if (arg1) (arg1)->m_arrowColour = *arg2;
+  

   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
   return NULL;
 }
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
   return NULL;
 }

-
-
-SWIGINTERN PyObject *_wrap_Effects_SetMediumShadow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxColour *arg2 = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  wxColour temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "c", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetMediumShadow",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_SetMediumShadow" "', expected argument " "1"" of type '" "wxEffects *""'"); 
-  }
-  arg1 = reinterpret_cast< wxEffects * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetMediumShadow((wxColour const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+
+
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_arrowColour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  wxColour *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_arrowColour_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 

   }
   }

-  resultobj = SWIG_Py_Void();
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);
+  result = (wxColour *)& ((arg1)->m_arrowColour);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_Effects_SetDarkShadow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_selectionColour_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxColour *arg2 = 0 ;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  wxColour *arg2 = (wxColour *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   wxColour temp2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxColour temp2 ;

-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "c", NULL 
-  };
+  PyObject *swig_obj[2] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Effects_SetDarkShadow",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_selectionColour_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_SetDarkShadow" "', expected argument " "1"" of type '" "wxEffects *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_selectionColour_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxEffects * >(argp1);
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);

   {
     arg2 = &temp2;
   {
     arg2 = &temp2;

-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetDarkShadow((wxColour const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    if ( ! wxColour_helper(swig_obj[1], &arg2)) SWIG_fail;

   }
   }

+  if (arg1) (arg1)->m_selectionColour = *arg2;
+  

   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:


@@ -24521,185 +27528,88 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Effects_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_selectionColour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxColour *arg2 = 0 ;
-  wxColour *arg3 = 0 ;
-  wxColour *arg4 = 0 ;
-  wxColour *arg5 = 0 ;
-  wxColour *arg6 = 0 ;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  wxColour *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxColour temp2 ;
-  wxColour temp3 ;
-  wxColour temp4 ;
-  wxColour temp5 ;
-  wxColour temp6 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "highlightColour",(char *) "lightShadow",(char *) "faceColour",(char *) "mediumShadow",(char *) "darkShadow", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Effects_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_Set" "', expected argument " "1"" of type '" "wxEffects *""'"); 
-  }
-  arg1 = reinterpret_cast< wxEffects * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    arg3 = &temp3;
-    if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
-  }
-  {
-    arg4 = &temp4;
-    if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail;
-  }
-  {
-    arg5 = &temp5;
-    if ( ! wxColour_helper(obj4, &arg5)) SWIG_fail;
-  }
-  {
-    arg6 = &temp6;
-    if ( ! wxColour_helper(obj5, &arg6)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->Set((wxColour const &)*arg2,(wxColour const &)*arg3,(wxColour const &)*arg4,(wxColour const &)*arg5,(wxColour const &)*arg6);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_selectionColour_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 

   }
   }

-  resultobj = SWIG_Py_Void();
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);
+  result = (wxColour *)& ((arg1)->m_selectionColour);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelText_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxDC *arg2 = 0 ;
-  wxRect *arg3 = 0 ;
-  int arg4 = (int) 1 ;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  wxString *arg2 = (wxString *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  wxRect temp3 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "dc",(char *) "rect",(char *) "borderSize", NULL 
-  };
+  bool temp2 = false ;
+  PyObject *swig_obj[2] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Effects_DrawSunkenEdge",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelText_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_DrawSunkenEdge" "', expected argument " "1"" of type '" "wxEffects *""'"); 
-  }
-  arg1 = reinterpret_cast< wxEffects * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC,  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Effects_DrawSunkenEdge" "', expected argument " "2"" of type '" "wxDC &""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Effects_DrawSunkenEdge" "', expected argument " "2"" of type '" "wxDC &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelText_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxDC * >(argp2);
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);

   {
   {

-    arg3 = &temp3;
-    if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;
-  }
-  if (obj3) {
-    ecode4 = SWIG_AsVal_int(obj3, &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Effects_DrawSunkenEdge" "', expected argument " "4"" of type '" "int""'");
-    } 
-    arg4 = static_cast< int >(val4);
+    arg2 = wxString_in_helper(swig_obj[1]);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;

   }
   }

+  if (arg1) (arg1)->m_labelText = *arg2;
+  
+  resultobj = SWIG_Py_Void();

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->DrawSunkenEdge(*arg2,(wxRect const &)*arg3,arg4);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    if (temp2)
+    delete arg2;

   }
   }

-  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp2)
+    delete arg2;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Effects_TileBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelText_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxEffects *arg1 = (wxEffects *) 0 ;
-  wxRect *arg2 = 0 ;
-  wxDC *arg3 = 0 ;
-  wxBitmap *arg4 = 0 ;
-  bool result;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  wxString *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRect temp2 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "rect",(char *) "dc",(char *) "bitmap", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Effects_TileBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxEffects, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Effects_TileBitmap" "', expected argument " "1"" of type '" "wxEffects *""'"); 
-  }
-  arg1 = reinterpret_cast< wxEffects * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
-  }
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC,  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Effects_TileBitmap" "', expected argument " "3"" of type '" "wxDC &""'"); 
-  }
-  if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Effects_TileBitmap" "', expected argument " "3"" of type '" "wxDC &""'"); 
-  }
-  arg3 = reinterpret_cast< wxDC * >(argp3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxBitmap,  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Effects_TileBitmap" "', expected argument " "4"" of type '" "wxBitmap &""'"); 
-  }
-  if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Effects_TileBitmap" "', expected argument " "4"" of type '" "wxBitmap &""'"); 
-  }
-  arg4 = reinterpret_cast< wxBitmap * >(argp4);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->TileBitmap((wxRect const &)*arg2,*arg3,*arg4);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelText_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);
+  result = (wxString *)& ((arg1)->m_labelText);

   {
   {

-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
+#else
+    resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
+#endif

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


@@ -24707,86 +27617,80 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *Effects_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxEffects, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *Effects_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_SplitterRenderParams(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelFont_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  int arg1 ;
-  int arg2 ;
-  bool arg3 ;
-  wxSplitterRenderParams *result = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  bool val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "widthSash_",(char *) "border_",(char *) "isSens_", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_SplitterRenderParams",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SplitterRenderParams" "', expected argument " "1"" of type '" "int""'");
-  } 
-  arg1 = static_cast< int >(val1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_SplitterRenderParams" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_bool(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_SplitterRenderParams" "', expected argument " "3"" of type '" "bool""'");
-  } 
-  arg3 = static_cast< bool >(val3);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxSplitterRenderParams *)new wxSplitterRenderParams(arg1,arg2,arg3);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  wxFont *arg2 = (wxFont *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject *swig_obj[2] ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelFont_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelFont_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 

   }
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSplitterRenderParams, SWIG_POINTER_NEW |  0 );
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxFont, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HeaderButtonParams_m_labelFont_set" "', expected argument " "2"" of type '" "wxFont *""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);
+  if (arg1) (arg1)->m_labelFont = *arg2;
+  
+  resultobj = SWIG_Py_Void();

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

-SWIGINTERN PyObject *_wrap_delete_SplitterRenderParams(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelFont_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxSplitterRenderParams *arg1 = (wxSplitterRenderParams *) 0 ;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  wxFont *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSplitterRenderParams, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SplitterRenderParams" "', expected argument " "1"" of type '" "wxSplitterRenderParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelFont_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxSplitterRenderParams * >(argp1);
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);
+  result = (wxFont *)& ((arg1)->m_labelFont);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelColour_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  wxColour *arg2 = (wxColour *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxColour temp2 ;
+  PyObject *swig_obj[2] ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelColour_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelColour_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    delete arg1;
-    
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    arg2 = &temp2;
+    if ( ! wxColour_helper(swig_obj[1], &arg2)) SWIG_fail;

   }
   }

+  if (arg1) (arg1)->m_labelColour = *arg2;
+  

   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:


@@ -24794,83 +27698,143 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_SplitterRenderParams_widthSash_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelColour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxSplitterRenderParams *arg1 = (wxSplitterRenderParams *) 0 ;
-  int result;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  wxColour *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSplitterRenderParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SplitterRenderParams_widthSash_get" "', expected argument " "1"" of type '" "wxSplitterRenderParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelColour_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxSplitterRenderParams * >(argp1);
-  result = (int)(int) ((arg1)->widthSash);
-  resultobj = SWIG_From_int(static_cast< int >(result));
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);
+  result = (wxColour *)& ((arg1)->m_labelColour);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 |  0 );

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

-SWIGINTERN PyObject *_wrap_SplitterRenderParams_border_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelBitmap_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxSplitterRenderParams *arg1 = (wxSplitterRenderParams *) 0 ;
-  int result;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  wxBitmap *arg2 = (wxBitmap *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject *swig_obj[2] ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelBitmap_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelBitmap_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxBitmap, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HeaderButtonParams_m_labelBitmap_set" "', expected argument " "2"" of type '" "wxBitmap *""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  if (arg1) (arg1)->m_labelBitmap = *arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelBitmap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  wxBitmap *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSplitterRenderParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SplitterRenderParams_border_get" "', expected argument " "1"" of type '" "wxSplitterRenderParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelBitmap_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxSplitterRenderParams * >(argp1);
-  result = (int)(int) ((arg1)->border);
-  resultobj = SWIG_From_int(static_cast< int >(result));
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);
+  result = (wxBitmap *)& ((arg1)->m_labelBitmap);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBitmap, 0 |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_SplitterRenderParams_isHotSensitive_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelAlignment_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxSplitterRenderParams *arg1 = (wxSplitterRenderParams *) 0 ;
-  bool result;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject *swig_obj[2] ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelAlignment_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelAlignment_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HeaderButtonParams_m_labelAlignment_set" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  if (arg1) (arg1)->m_labelAlignment = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelAlignment_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSplitterRenderParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SplitterRenderParams_isHotSensitive_get" "', expected argument " "1"" of type '" "wxSplitterRenderParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelAlignment_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxSplitterRenderParams * >(argp1);
-  result = (bool)(bool) ((arg1)->isHotSensitive);
-  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1);
+  result = (int) ((arg1)->m_labelAlignment);
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *SplitterRenderParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *HeaderButtonParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxSplitterRenderParams, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxHeaderButtonParams, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *SplitterRenderParams_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *HeaderButtonParams_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 


@@ -25040,6 +28004,8 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP
   wxDC *arg3 = 0 ;
   wxRect *arg4 = 0 ;
   int arg5 = (int) 0 ;
   wxDC *arg3 = 0 ;
   wxRect *arg4 = 0 ;
   int arg5 = (int) 0 ;

+  wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ;
+  wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;


@@ -25049,16 +28015,22 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP
   wxRect temp4 ;
   int val5 ;
   int ecode5 = 0 ;
   wxRect temp4 ;
   int val5 ;
   int ecode5 = 0 ;

+  int val6 ;
+  int ecode6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;

+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;

   char *  kwnames[] = {
   char *  kwnames[] = {

-    (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags", NULL 
+    (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags",(char *) "sortArrow",(char *) "params", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:RendererNative_DrawHeaderButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:RendererNative_DrawHeaderButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "1"" of type '" "wxRendererNative *""'"); 
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "1"" of type '" "wxRendererNative *""'"); 


@@ -25088,9 +28060,113 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP
     } 
     arg5 = static_cast< int >(val5);
   }
     } 
     arg5 = static_cast< int >(val5);
   }

+  if (obj5) {
+    ecode6 = SWIG_AsVal_int(obj5, &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "6"" of type '" "wxHeaderSortIconType""'");
+    } 
+    arg6 = static_cast< wxHeaderSortIconType >(val6);
+  }
+  if (obj6) {
+    res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "7"" of type '" "wxHeaderButtonParams *""'"); 
+    }
+    arg7 = reinterpret_cast< wxHeaderButtonParams * >(argp7);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->DrawHeaderButton(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButtonContents(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxRendererNative *arg1 = (wxRendererNative *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  wxDC *arg3 = 0 ;
+  wxRect *arg4 = 0 ;
+  int arg5 = (int) 0 ;
+  wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ;
+  wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  wxRect temp4 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags",(char *) "sortArrow",(char *) "params", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:RendererNative_DrawHeaderButtonContents",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "1"" of type '" "wxRendererNative *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRendererNative * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  }
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "3"" of type '" "wxDC &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "3"" of type '" "wxDC &""'"); 
+  }
+  arg3 = reinterpret_cast< wxDC * >(argp3);
+  {
+    arg4 = &temp4;
+    if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
+  }
+  if (obj4) {
+    ecode5 = SWIG_AsVal_int(obj4, &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "5"" of type '" "int""'");
+    } 
+    arg5 = static_cast< int >(val5);
+  }
+  if (obj5) {
+    ecode6 = SWIG_AsVal_int(obj5, &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "6"" of type '" "wxHeaderSortIconType""'");
+    } 
+    arg6 = static_cast< wxHeaderSortIconType >(val6);
+  }
+  if (obj6) {
+    res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxHeaderButtonParams, 0 |  0 );
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "7"" of type '" "wxHeaderButtonParams *""'"); 
+    }
+    arg7 = reinterpret_cast< wxHeaderButtonParams * >(argp7);
+  }

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->DrawHeaderButton(arg2,*arg3,(wxRect const &)*arg4,arg5);
+    (arg1)->DrawHeaderButtonContents(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -25101,6 +28177,45 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_RendererNative_GetHeaderButtonHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxRendererNative *arg1 = (wxRendererNative *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "win", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RendererNative_GetHeaderButtonHeight",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_GetHeaderButtonHeight" "', expected argument " "1"" of type '" "wxRendererNative *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRendererNative * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_GetHeaderButtonHeight" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  }
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)(arg1)->GetHeaderButtonHeight(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_RendererNative_DrawTreeItemButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRendererNative *arg1 = (wxRendererNative *) 0 ;
 SWIGINTERN PyObject *_wrap_RendererNative_DrawTreeItemButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRendererNative *arg1 = (wxRendererNative *) 0 ;


@@ -28983,6 +32098,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Colour_Red", (PyCFunction)_wrap_Colour_Red, METH_O, NULL},
         { (char *)"Colour_Green", (PyCFunction)_wrap_Colour_Green, METH_O, NULL},
         { (char *)"Colour_Blue", (PyCFunction)_wrap_Colour_Blue, METH_O, NULL},
         { (char *)"Colour_Red", (PyCFunction)_wrap_Colour_Red, METH_O, NULL},
         { (char *)"Colour_Green", (PyCFunction)_wrap_Colour_Green, METH_O, NULL},
         { (char *)"Colour_Blue", (PyCFunction)_wrap_Colour_Blue, METH_O, NULL},

+        { (char *)"Colour_Alpha", (PyCFunction)_wrap_Colour_Alpha, METH_O, NULL},

         { (char *)"Colour_Ok", (PyCFunction)_wrap_Colour_Ok, METH_O, NULL},
         { (char *)"Colour_Set", (PyCFunction) _wrap_Colour_Set, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Colour_SetRGB", (PyCFunction) _wrap_Colour_SetRGB, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Colour_Ok", (PyCFunction)_wrap_Colour_Ok, METH_O, NULL},
         { (char *)"Colour_Set", (PyCFunction) _wrap_Colour_Set, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Colour_SetRGB", (PyCFunction) _wrap_Colour_SetRGB, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -28991,7 +32107,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Colour_GetPixel", (PyCFunction)_wrap_Colour_GetPixel, METH_O, NULL},
         { (char *)"Colour___eq__", (PyCFunction) _wrap_Colour___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Colour___ne__", (PyCFunction) _wrap_Colour___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Colour_GetPixel", (PyCFunction)_wrap_Colour_GetPixel, METH_O, NULL},
         { (char *)"Colour___eq__", (PyCFunction) _wrap_Colour___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Colour___ne__", (PyCFunction) _wrap_Colour___ne__, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"Colour_Get", (PyCFunction)_wrap_Colour_Get, METH_O, NULL},
+        { (char *)"Colour_Get", (PyCFunction) _wrap_Colour_Get, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"Colour_GetRGB", (PyCFunction)_wrap_Colour_GetRGB, METH_O, NULL},
         { (char *)"Colour_swigregister", Colour_swigregister, METH_VARARGS, NULL},
         { (char *)"Colour_swiginit", Colour_swiginit, METH_VARARGS, NULL},
         { (char *)"Colour_GetRGB", (PyCFunction)_wrap_Colour_GetRGB, METH_O, NULL},
         { (char *)"Colour_swigregister", Colour_swigregister, METH_VARARGS, NULL},
         { (char *)"Colour_swiginit", Colour_swiginit, METH_VARARGS, NULL},


@@ -29072,6 +32188,55 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS, NULL},
         { (char *)"Bitmap_swiginit", Bitmap_swiginit, METH_VARARGS, NULL},
         { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS, NULL},
         { (char *)"Bitmap_swiginit", Bitmap_swiginit, METH_VARARGS, NULL},

+        { (char *)"_BitmapFromBufferAlpha", (PyCFunction) _wrap__BitmapFromBufferAlpha, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"_BitmapFromBuffer", (PyCFunction) _wrap__BitmapFromBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"_BitmapFromBufferRGBA", (PyCFunction) _wrap__BitmapFromBufferRGBA, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PixelDataBase_GetOrigin", (PyCFunction)_wrap_PixelDataBase_GetOrigin, METH_O, NULL},
+        { (char *)"PixelDataBase_GetWidth", (PyCFunction)_wrap_PixelDataBase_GetWidth, METH_O, NULL},
+        { (char *)"PixelDataBase_GetHeight", (PyCFunction)_wrap_PixelDataBase_GetHeight, METH_O, NULL},
+        { (char *)"PixelDataBase_GetSize", (PyCFunction)_wrap_PixelDataBase_GetSize, METH_O, NULL},
+        { (char *)"PixelDataBase_GetRowStride", (PyCFunction)_wrap_PixelDataBase_GetRowStride, METH_O, NULL},
+        { (char *)"PixelDataBase_swigregister", PixelDataBase_swigregister, METH_VARARGS, NULL},
+        { (char *)"new_NativePixelData", _wrap_new_NativePixelData, METH_VARARGS, NULL},
+        { (char *)"delete_NativePixelData", (PyCFunction)_wrap_delete_NativePixelData, METH_O, NULL},
+        { (char *)"NativePixelData_GetPixels", (PyCFunction)_wrap_NativePixelData_GetPixels, METH_O, NULL},
+        { (char *)"NativePixelData_UseAlpha", (PyCFunction)_wrap_NativePixelData_UseAlpha, METH_O, NULL},
+        { (char *)"NativePixelData___nonzero__", (PyCFunction)_wrap_NativePixelData___nonzero__, METH_O, NULL},
+        { (char *)"NativePixelData_swigregister", NativePixelData_swigregister, METH_VARARGS, NULL},
+        { (char *)"NativePixelData_swiginit", NativePixelData_swiginit, METH_VARARGS, NULL},
+        { (char *)"new_NativePixelData_Accessor", _wrap_new_NativePixelData_Accessor, METH_VARARGS, NULL},
+        { (char *)"delete_NativePixelData_Accessor", (PyCFunction)_wrap_delete_NativePixelData_Accessor, METH_O, NULL},
+        { (char *)"NativePixelData_Accessor_Reset", (PyCFunction) _wrap_NativePixelData_Accessor_Reset, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NativePixelData_Accessor_IsOk", (PyCFunction)_wrap_NativePixelData_Accessor_IsOk, METH_O, NULL},
+        { (char *)"NativePixelData_Accessor_nextPixel", (PyCFunction)_wrap_NativePixelData_Accessor_nextPixel, METH_O, NULL},
+        { (char *)"NativePixelData_Accessor_Offset", (PyCFunction) _wrap_NativePixelData_Accessor_Offset, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NativePixelData_Accessor_OffsetX", (PyCFunction) _wrap_NativePixelData_Accessor_OffsetX, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NativePixelData_Accessor_OffsetY", (PyCFunction) _wrap_NativePixelData_Accessor_OffsetY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NativePixelData_Accessor_MoveTo", (PyCFunction) _wrap_NativePixelData_Accessor_MoveTo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NativePixelData_Accessor_Set", (PyCFunction) _wrap_NativePixelData_Accessor_Set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"NativePixelData_Accessor_Get", (PyCFunction)_wrap_NativePixelData_Accessor_Get, METH_O, NULL},
+        { (char *)"NativePixelData_Accessor_swigregister", NativePixelData_Accessor_swigregister, METH_VARARGS, NULL},
+        { (char *)"NativePixelData_Accessor_swiginit", NativePixelData_Accessor_swiginit, METH_VARARGS, NULL},
+        { (char *)"new_AlphaPixelData", _wrap_new_AlphaPixelData, METH_VARARGS, NULL},
+        { (char *)"delete_AlphaPixelData", (PyCFunction)_wrap_delete_AlphaPixelData, METH_O, NULL},
+        { (char *)"AlphaPixelData_GetPixels", (PyCFunction)_wrap_AlphaPixelData_GetPixels, METH_O, NULL},
+        { (char *)"AlphaPixelData_UseAlpha", (PyCFunction)_wrap_AlphaPixelData_UseAlpha, METH_O, NULL},
+        { (char *)"AlphaPixelData___nonzero__", (PyCFunction)_wrap_AlphaPixelData___nonzero__, METH_O, NULL},
+        { (char *)"AlphaPixelData_swigregister", AlphaPixelData_swigregister, METH_VARARGS, NULL},
+        { (char *)"AlphaPixelData_swiginit", AlphaPixelData_swiginit, METH_VARARGS, NULL},
+        { (char *)"new_AlphaPixelData_Accessor", _wrap_new_AlphaPixelData_Accessor, METH_VARARGS, NULL},
+        { (char *)"delete_AlphaPixelData_Accessor", (PyCFunction)_wrap_delete_AlphaPixelData_Accessor, METH_O, NULL},
+        { (char *)"AlphaPixelData_Accessor_Reset", (PyCFunction) _wrap_AlphaPixelData_Accessor_Reset, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AlphaPixelData_Accessor_IsOk", (PyCFunction)_wrap_AlphaPixelData_Accessor_IsOk, METH_O, NULL},
+        { (char *)"AlphaPixelData_Accessor_nextPixel", (PyCFunction)_wrap_AlphaPixelData_Accessor_nextPixel, METH_O, NULL},
+        { (char *)"AlphaPixelData_Accessor_Offset", (PyCFunction) _wrap_AlphaPixelData_Accessor_Offset, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AlphaPixelData_Accessor_OffsetX", (PyCFunction) _wrap_AlphaPixelData_Accessor_OffsetX, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AlphaPixelData_Accessor_OffsetY", (PyCFunction) _wrap_AlphaPixelData_Accessor_OffsetY, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AlphaPixelData_Accessor_MoveTo", (PyCFunction) _wrap_AlphaPixelData_Accessor_MoveTo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AlphaPixelData_Accessor_Set", (PyCFunction) _wrap_AlphaPixelData_Accessor_Set, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"AlphaPixelData_Accessor_Get", (PyCFunction)_wrap_AlphaPixelData_Accessor_Get, METH_O, NULL},
+        { (char *)"AlphaPixelData_Accessor_swigregister", AlphaPixelData_Accessor_swigregister, METH_VARARGS, NULL},
+        { (char *)"AlphaPixelData_Accessor_swiginit", AlphaPixelData_Accessor_swiginit, METH_VARARGS, NULL},

         { (char *)"new_Mask", (PyCFunction) _wrap_new_Mask, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_Mask", (PyCFunction)_wrap_delete_Mask, METH_O, NULL},
         { (char *)"Mask_swigregister", Mask_swigregister, METH_VARARGS, NULL},
         { (char *)"new_Mask", (PyCFunction) _wrap_new_Mask, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_Mask", (PyCFunction)_wrap_delete_Mask, METH_O, NULL},
         { (char *)"Mask_swigregister", Mask_swigregister, METH_VARARGS, NULL},


@@ -29306,6 +32471,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Locale_GetCanonicalName", (PyCFunction)_wrap_Locale_GetCanonicalName, METH_O, NULL},
         { (char *)"Locale_AddCatalogLookupPathPrefix", (PyCFunction) _wrap_Locale_AddCatalogLookupPathPrefix, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Locale_AddCatalog", (PyCFunction) _wrap_Locale_AddCatalog, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Locale_GetCanonicalName", (PyCFunction)_wrap_Locale_GetCanonicalName, METH_O, NULL},
         { (char *)"Locale_AddCatalogLookupPathPrefix", (PyCFunction) _wrap_Locale_AddCatalogLookupPathPrefix, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Locale_AddCatalog", (PyCFunction) _wrap_Locale_AddCatalog, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"Locale_IsAvailable", (PyCFunction) _wrap_Locale_IsAvailable, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"Locale_IsLoaded", (PyCFunction) _wrap_Locale_IsLoaded, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Locale_GetLanguageInfo", (PyCFunction) _wrap_Locale_GetLanguageInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Locale_GetLanguageName", (PyCFunction) _wrap_Locale_GetLanguageName, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Locale_IsLoaded", (PyCFunction) _wrap_Locale_IsLoaded, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Locale_GetLanguageInfo", (PyCFunction) _wrap_Locale_GetLanguageInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Locale_GetLanguageName", (PyCFunction) _wrap_Locale_GetLanguageName, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -29315,6 +32481,13 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Locale_GetName", (PyCFunction)_wrap_Locale_GetName, METH_O, NULL},
         { (char *)"Locale_swigregister", Locale_swigregister, METH_VARARGS, NULL},
         { (char *)"Locale_swiginit", Locale_swiginit, METH_VARARGS, NULL},
         { (char *)"Locale_GetName", (PyCFunction)_wrap_Locale_GetName, METH_O, NULL},
         { (char *)"Locale_swigregister", Locale_swigregister, METH_VARARGS, NULL},
         { (char *)"Locale_swiginit", Locale_swiginit, METH_VARARGS, NULL},

+        { (char *)"new_PyLocale", (PyCFunction) _wrap_new_PyLocale, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"delete_PyLocale", (PyCFunction)_wrap_delete_PyLocale, METH_O, NULL},
+        { (char *)"PyLocale__setCallbackInfo", (PyCFunction) _wrap_PyLocale__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLocale_GetSingularString", (PyCFunction) _wrap_PyLocale_GetSingularString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLocale_GetPluralString", (PyCFunction) _wrap_PyLocale_GetPluralString, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"PyLocale_swigregister", PyLocale_swigregister, METH_VARARGS, NULL},
+        { (char *)"PyLocale_swiginit", PyLocale_swiginit, METH_VARARGS, NULL},

         { (char *)"GetLocale", (PyCFunction)_wrap_GetLocale, METH_NOARGS, NULL},
         { (char *)"GetTranslation", _wrap_GetTranslation, METH_VARARGS, NULL},
         { (char *)"new_EncodingConverter", (PyCFunction)_wrap_new_EncodingConverter, METH_NOARGS, NULL},
         { (char *)"GetLocale", (PyCFunction)_wrap_GetLocale, METH_NOARGS, NULL},
         { (char *)"GetTranslation", _wrap_GetTranslation, METH_VARARGS, NULL},
         { (char *)"new_EncodingConverter", (PyCFunction)_wrap_new_EncodingConverter, METH_NOARGS, NULL},


@@ -29587,6 +32760,24 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"SplitterRenderParams_isHotSensitive_get", (PyCFunction)_wrap_SplitterRenderParams_isHotSensitive_get, METH_O, NULL},
         { (char *)"SplitterRenderParams_swigregister", SplitterRenderParams_swigregister, METH_VARARGS, NULL},
         { (char *)"SplitterRenderParams_swiginit", SplitterRenderParams_swiginit, METH_VARARGS, NULL},
         { (char *)"SplitterRenderParams_isHotSensitive_get", (PyCFunction)_wrap_SplitterRenderParams_isHotSensitive_get, METH_O, NULL},
         { (char *)"SplitterRenderParams_swigregister", SplitterRenderParams_swigregister, METH_VARARGS, NULL},
         { (char *)"SplitterRenderParams_swiginit", SplitterRenderParams_swiginit, METH_VARARGS, NULL},

+        { (char *)"new_HeaderButtonParams", (PyCFunction)_wrap_new_HeaderButtonParams, METH_NOARGS, NULL},
+        { (char *)"delete_HeaderButtonParams", (PyCFunction)_wrap_delete_HeaderButtonParams, METH_O, NULL},
+        { (char *)"HeaderButtonParams_m_arrowColour_set", _wrap_HeaderButtonParams_m_arrowColour_set, METH_VARARGS, NULL},
+        { (char *)"HeaderButtonParams_m_arrowColour_get", (PyCFunction)_wrap_HeaderButtonParams_m_arrowColour_get, METH_O, NULL},
+        { (char *)"HeaderButtonParams_m_selectionColour_set", _wrap_HeaderButtonParams_m_selectionColour_set, METH_VARARGS, NULL},
+        { (char *)"HeaderButtonParams_m_selectionColour_get", (PyCFunction)_wrap_HeaderButtonParams_m_selectionColour_get, METH_O, NULL},
+        { (char *)"HeaderButtonParams_m_labelText_set", _wrap_HeaderButtonParams_m_labelText_set, METH_VARARGS, NULL},
+        { (char *)"HeaderButtonParams_m_labelText_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelText_get, METH_O, NULL},
+        { (char *)"HeaderButtonParams_m_labelFont_set", _wrap_HeaderButtonParams_m_labelFont_set, METH_VARARGS, NULL},
+        { (char *)"HeaderButtonParams_m_labelFont_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelFont_get, METH_O, NULL},
+        { (char *)"HeaderButtonParams_m_labelColour_set", _wrap_HeaderButtonParams_m_labelColour_set, METH_VARARGS, NULL},
+        { (char *)"HeaderButtonParams_m_labelColour_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelColour_get, METH_O, NULL},
+        { (char *)"HeaderButtonParams_m_labelBitmap_set", _wrap_HeaderButtonParams_m_labelBitmap_set, METH_VARARGS, NULL},
+        { (char *)"HeaderButtonParams_m_labelBitmap_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelBitmap_get, METH_O, NULL},
+        { (char *)"HeaderButtonParams_m_labelAlignment_set", _wrap_HeaderButtonParams_m_labelAlignment_set, METH_VARARGS, NULL},
+        { (char *)"HeaderButtonParams_m_labelAlignment_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelAlignment_get, METH_O, NULL},
+        { (char *)"HeaderButtonParams_swigregister", HeaderButtonParams_swigregister, METH_VARARGS, NULL},
+        { (char *)"HeaderButtonParams_swiginit", HeaderButtonParams_swiginit, METH_VARARGS, NULL},

         { (char *)"new_RendererVersion", (PyCFunction) _wrap_new_RendererVersion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_RendererVersion", (PyCFunction)_wrap_delete_RendererVersion, METH_O, NULL},
         { (char *)"RendererVersion_IsCompatible", (PyCFunction) _wrap_RendererVersion_IsCompatible, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_RendererVersion", (PyCFunction) _wrap_new_RendererVersion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_RendererVersion", (PyCFunction)_wrap_delete_RendererVersion, METH_O, NULL},
         { (char *)"RendererVersion_IsCompatible", (PyCFunction) _wrap_RendererVersion_IsCompatible, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -29595,6 +32786,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"RendererVersion_swigregister", RendererVersion_swigregister, METH_VARARGS, NULL},
         { (char *)"RendererVersion_swiginit", RendererVersion_swiginit, METH_VARARGS, NULL},
         { (char *)"RendererNative_DrawHeaderButton", (PyCFunction) _wrap_RendererNative_DrawHeaderButton, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"RendererVersion_swigregister", RendererVersion_swigregister, METH_VARARGS, NULL},
         { (char *)"RendererVersion_swiginit", RendererVersion_swiginit, METH_VARARGS, NULL},
         { (char *)"RendererNative_DrawHeaderButton", (PyCFunction) _wrap_RendererNative_DrawHeaderButton, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"RendererNative_DrawHeaderButtonContents", (PyCFunction) _wrap_RendererNative_DrawHeaderButtonContents, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"RendererNative_GetHeaderButtonHeight", (PyCFunction) _wrap_RendererNative_GetHeaderButtonHeight, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"RendererNative_DrawTreeItemButton", (PyCFunction) _wrap_RendererNative_DrawTreeItemButton, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"RendererNative_DrawSplitterBorder", (PyCFunction) _wrap_RendererNative_DrawSplitterBorder, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"RendererNative_DrawSplitterSash", (PyCFunction) _wrap_RendererNative_DrawSplitterSash, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"RendererNative_DrawTreeItemButton", (PyCFunction) _wrap_RendererNative_DrawTreeItemButton, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"RendererNative_DrawSplitterBorder", (PyCFunction) _wrap_RendererNative_DrawSplitterBorder, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"RendererNative_DrawSplitterSash", (PyCFunction) _wrap_RendererNative_DrawSplitterSash, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -29688,6 +32881,9 @@ static void *_p_wxBufferedDCTo_p_wxMemoryDC(void *x) {
 static void *_p_wxBufferedPaintDCTo_p_wxMemoryDC(void *x) {
     return (void *)((wxMemoryDC *) (wxBufferedDC *) ((wxBufferedPaintDC *) x));
 }
 static void *_p_wxBufferedPaintDCTo_p_wxMemoryDC(void *x) {
     return (void *)((wxMemoryDC *) (wxBufferedDC *) ((wxBufferedPaintDC *) x));
 }

+static void *_p_wxPyLocaleTo_p_wxLocale(void *x) {
+    return (void *)((wxLocale *)  ((wxPyLocale *) x));
+}

 static void *_p_wxIconTo_p_wxGDIObject(void *x) {
     return (void *)((wxGDIObject *)  ((wxIcon *) x));
 }
 static void *_p_wxIconTo_p_wxGDIObject(void *x) {
     return (void *)((wxGDIObject *)  ((wxIcon *) x));
 }


@@ -29766,12 +32962,12 @@ static void *_p_wxPenTo_p_wxObject(void *x) {
 static void *_p_wxRegionIteratorTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxRegionIterator *) x));
 }
 static void *_p_wxRegionIteratorTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxRegionIterator *) x));
 }

-static void *_p_wxGBSizerItemTo_p_wxObject(void *x) {
-    return (void *)((wxObject *) (wxSizerItem *) ((wxGBSizerItem *) x));
-}

 static void *_p_wxSizerItemTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxSizerItem *) x));
 }
 static void *_p_wxSizerItemTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxSizerItem *) x));
 }

+static void *_p_wxGBSizerItemTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxSizerItem *) ((wxGBSizerItem *) x));
+}

 static void *_p_wxScrollEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxScrollEvent *) x));
 }
 static void *_p_wxScrollEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxScrollEvent *) x));
 }


@@ -29949,6 +33145,9 @@ static void *_p_wxTIFFHandlerTo_p_wxObject(void *x) {
 static void *_p_wxEvtHandlerTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxEvtHandler *) x));
 }
 static void *_p_wxEvtHandlerTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxEvtHandler *) x));
 }

+static void *_p_wxMouseCaptureLostEventTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvent *) ((wxMouseCaptureLostEvent *) x));
+}

 static void *_p_wxBufferedPaintDCTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x));
 }
 static void *_p_wxBufferedPaintDCTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x));
 }


@@ -30084,6 +33283,13 @@ static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) {
 static void *_p_wxMenuBarTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *)  ((wxMenuBar *) x));
 }
 static void *_p_wxMenuBarTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *)  ((wxMenuBar *) x));
 }

+static void *_p_wxNativePixelDataTo_p_wxPixelDataBase(void *x) {
+    return (void *)((wxPixelDataBase *)  ((wxNativePixelData *) x));
+}
+static void *_p_wxAlphaPixelDataTo_p_wxPixelDataBase(void *x) {
+    return (void *)((wxPixelDataBase *)  ((wxAlphaPixelData *) x));
+}
+static swig_type_info _swigt__p_buffer = {"_p_buffer", "buffer *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_double = {"_p_double", "double *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_double = {"_p_double", "double *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0};


@@ -30091,11 +33297,14 @@ static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|byte *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|wxUIntPtr *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|byte *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|wxUIntPtr *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxAlphaPixelData = {"_p_wxAlphaPixelData", "wxAlphaPixelData *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_wxAlphaPixelData_Accessor = {"_p_wxAlphaPixelData_Accessor", "wxAlphaPixelData_Accessor *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxBitmap = {"_p_wxBitmap", "wxBitmap *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBrush = {"_p_wxBrush", "wxBrush *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBrushList = {"_p_wxBrushList", "wxBrushList *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBufferedDC = {"_p_wxBufferedDC", "wxBufferedDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBufferedPaintDC = {"_p_wxBufferedPaintDC", "wxBufferedPaintDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBitmap = {"_p_wxBitmap", "wxBitmap *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBrush = {"_p_wxBrush", "wxBrush *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBrushList = {"_p_wxBrushList", "wxBrushList *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBufferedDC = {"_p_wxBufferedDC", "wxBufferedDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBufferedPaintDC = {"_p_wxBufferedPaintDC", "wxBufferedPaintDC *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxChar = {"_p_wxChar", "wxChar *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxClientDC = {"_p_wxClientDC", "wxClientDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxColourDatabase = {"_p_wxColourDatabase", "wxColourDatabase *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxClientDC = {"_p_wxClientDC", "wxClientDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxColourDatabase = {"_p_wxColourDatabase", "wxColourDatabase *", 0, 0, (void*)0, 0};


@@ -30110,6 +33319,7 @@ static swig_type_info _swigt__p_wxFontList = {"_p_wxFontList", "wxFontList *", 0
 static swig_type_info _swigt__p_wxFontMapper = {"_p_wxFontMapper", "wxFontMapper *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxGDIObjListBase = {"_p_wxGDIObjListBase", "wxGDIObjListBase *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxGDIObject = {"_p_wxGDIObject", "wxGDIObject *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFontMapper = {"_p_wxFontMapper", "wxFontMapper *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxGDIObjListBase = {"_p_wxGDIObjListBase", "wxGDIObjListBase *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxGDIObject = {"_p_wxGDIObject", "wxGDIObject *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHeaderButtonParams = {"_p_wxHeaderButtonParams", "wxHeaderButtonParams *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIconLocation = {"_p_wxIconLocation", "wxIconLocation *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIconLocation = {"_p_wxIconLocation", "wxIconLocation *", 0, 0, (void*)0, 0};


@@ -30124,10 +33334,12 @@ static swig_type_info _swigt__p_wxMetaFileDC = {"_p_wxMetaFileDC", "wxMetaFileDC
 static swig_type_info _swigt__p_wxMirrorDC = {"_p_wxMirrorDC", "wxMirrorDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxNativeEncodingInfo = {"_p_wxNativeEncodingInfo", "wxNativeEncodingInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxNativeFontInfo = {"_p_wxNativeFontInfo", "wxNativeFontInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMirrorDC = {"_p_wxMirrorDC", "wxMirrorDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxNativeEncodingInfo = {"_p_wxNativeEncodingInfo", "wxNativeEncodingInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxNativeFontInfo = {"_p_wxNativeFontInfo", "wxNativeFontInfo *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxNativePixelData = {"_p_wxNativePixelData", "wxNativePixelData *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_wxNativePixelData_Accessor = {"_p_wxNativePixelData_Accessor", "wxNativePixelData_Accessor *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxObject = {"_p_wxObject", "wxObject *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxLayoutConstraints = {"_p_wxLayoutConstraints", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxObject = {"_p_wxObject", "wxObject *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxLayoutConstraints = {"_p_wxLayoutConstraints", 0, 0, 0, 0, 0};

-static swig_type_info _swigt__p_wxGBSizerItem = {"_p_wxGBSizerItem", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxSizerItem = {"_p_wxSizerItem", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxSizerItem = {"_p_wxSizerItem", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxGBSizerItem = {"_p_wxGBSizerItem", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxScrollEvent = {"_p_wxScrollEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxIndividualLayoutConstraint = {"_p_wxIndividualLayoutConstraint", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxStaticBoxSizer = {"_p_wxStaticBoxSizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxScrollEvent = {"_p_wxScrollEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxIndividualLayoutConstraint = {"_p_wxIndividualLayoutConstraint", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxStaticBoxSizer = {"_p_wxStaticBoxSizer", 0, 0, 0, 0, 0};


@@ -30178,6 +33390,7 @@ static swig_type_info _swigt__p_wxGIFHandler = {"_p_wxGIFHandler", 0, 0, 0, 0, 0
 static swig_type_info _swigt__p_wxPCXHandler = {"_p_wxPCXHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPNMHandler = {"_p_wxPNMHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPCXHandler = {"_p_wxPCXHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPNMHandler = {"_p_wxPNMHandler", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxMouseCaptureLostEvent = {"_p_wxMouseCaptureLostEvent", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxStdDialogButtonSizer = {"_p_wxStdDialogButtonSizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxAcceleratorTable = {"_p_wxAcceleratorTable", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxScrollWinEvent = {"_p_wxScrollWinEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxStdDialogButtonSizer = {"_p_wxStdDialogButtonSizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxAcceleratorTable = {"_p_wxAcceleratorTable", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxScrollWinEvent = {"_p_wxScrollWinEvent", 0, 0, 0, 0, 0};


@@ -30205,12 +33418,14 @@ static swig_type_info _swigt__p_wxPalette = {"_p_wxPalette", "wxPalette *", 0, 0
 static swig_type_info _swigt__p_wxPaperSize = {"_p_wxPaperSize", "enum wxPaperSize *|wxPaperSize *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPen = {"_p_wxPen", "wxPen *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPenList = {"_p_wxPenList", "wxPenList *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPaperSize = {"_p_wxPaperSize", "enum wxPaperSize *|wxPaperSize *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPen = {"_p_wxPen", "wxPen *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPenList = {"_p_wxPenList", "wxPenList *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxPixelDataBase = {"_p_wxPixelDataBase", "wxPixelDataBase *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxPoint = {"_p_wxPoint", "wxPoint *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPostScriptDC = {"_p_wxPostScriptDC", "wxPostScriptDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPrintData = {"_p_wxPrintData", "wxPrintData *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPrinterDC = {"_p_wxPrinterDC", "wxPrinterDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPseudoDC = {"_p_wxPseudoDC", "wxPseudoDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPyFontEnumerator = {"_p_wxPyFontEnumerator", "wxPyFontEnumerator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPoint = {"_p_wxPoint", "wxPoint *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPostScriptDC = {"_p_wxPostScriptDC", "wxPostScriptDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPrintData = {"_p_wxPrintData", "wxPrintData *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPrinterDC = {"_p_wxPrinterDC", "wxPrinterDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPseudoDC = {"_p_wxPseudoDC", "wxPseudoDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxPyFontEnumerator = {"_p_wxPyFontEnumerator", "wxPyFontEnumerator *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxPyLocale = {"_p_wxPyLocale", "wxPyLocale *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxRect = {"_p_wxRect", "wxRect *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxRegion = {"_p_wxRegion", "wxRegion *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxRegionIterator = {"_p_wxRegionIterator", "wxRegionIterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxRect = {"_p_wxRect", "wxRect *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxRegion = {"_p_wxRegion", "wxRegion *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxRegionIterator = {"_p_wxRegionIterator", "wxRegionIterator *", 0, 0, (void*)0, 0};


@@ -30225,6 +33440,7 @@ static swig_type_info _swigt__p_wxWindow = {"_p_wxWindow", "wxWindow *", 0, 0, (
 static swig_type_info _swigt__p_wxWindowDC = {"_p_wxWindowDC", "wxWindowDC *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
 static swig_type_info _swigt__p_wxWindowDC = {"_p_wxWindowDC", "wxWindowDC *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {

+  &_swigt__p_buffer,

   &_swigt__p_char,
   &_swigt__p_double,
   &_swigt__p_form_ops_t,
   &_swigt__p_char,
   &_swigt__p_double,
   &_swigt__p_form_ops_t,


@@ -30235,6 +33451,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxANIHandler,
   &_swigt__p_wxAcceleratorTable,
   &_swigt__p_wxActivateEvent,
   &_swigt__p_wxANIHandler,
   &_swigt__p_wxAcceleratorTable,
   &_swigt__p_wxActivateEvent,

+  &_swigt__p_wxAlphaPixelData,
+  &_swigt__p_wxAlphaPixelData_Accessor,

   &_swigt__p_wxBMPHandler,
   &_swigt__p_wxBitmap,
   &_swigt__p_wxBoxSizer,
   &_swigt__p_wxBMPHandler,
   &_swigt__p_wxBitmap,
   &_swigt__p_wxBoxSizer,


@@ -30243,6 +33461,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxBufferedDC,
   &_swigt__p_wxBufferedPaintDC,
   &_swigt__p_wxCURHandler,
   &_swigt__p_wxBufferedDC,
   &_swigt__p_wxBufferedPaintDC,
   &_swigt__p_wxCURHandler,

+  &_swigt__p_wxChar,

   &_swigt__p_wxChildFocusEvent,
   &_swigt__p_wxClientDC,
   &_swigt__p_wxClipboardTextEvent,
   &_swigt__p_wxChildFocusEvent,
   &_swigt__p_wxClientDC,
   &_swigt__p_wxClipboardTextEvent,


@@ -30278,6 +33497,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxGIFHandler,
   &_swigt__p_wxGridBagSizer,
   &_swigt__p_wxGridSizer,
   &_swigt__p_wxGIFHandler,
   &_swigt__p_wxGridBagSizer,
   &_swigt__p_wxGridSizer,

+  &_swigt__p_wxHeaderButtonParams,

   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIcon,
   &_swigt__p_wxIconBundle,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIcon,
   &_swigt__p_wxIconBundle,


@@ -30305,10 +33525,13 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxMetaFileDC,
   &_swigt__p_wxMirrorDC,
   &_swigt__p_wxMouseCaptureChangedEvent,
   &_swigt__p_wxMetaFileDC,
   &_swigt__p_wxMirrorDC,
   &_swigt__p_wxMouseCaptureChangedEvent,

+  &_swigt__p_wxMouseCaptureLostEvent,

   &_swigt__p_wxMouseEvent,
   &_swigt__p_wxMoveEvent,
   &_swigt__p_wxNativeEncodingInfo,
   &_swigt__p_wxNativeFontInfo,
   &_swigt__p_wxMouseEvent,
   &_swigt__p_wxMoveEvent,
   &_swigt__p_wxNativeEncodingInfo,
   &_swigt__p_wxNativeFontInfo,

+  &_swigt__p_wxNativePixelData,
+  &_swigt__p_wxNativePixelData_Accessor,

   &_swigt__p_wxNavigationKeyEvent,
   &_swigt__p_wxNcPaintEvent,
   &_swigt__p_wxNotifyEvent,
   &_swigt__p_wxNavigationKeyEvent,
   &_swigt__p_wxNcPaintEvent,
   &_swigt__p_wxNotifyEvent,


@@ -30323,6 +33546,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxPaperSize,
   &_swigt__p_wxPen,
   &_swigt__p_wxPenList,
   &_swigt__p_wxPaperSize,
   &_swigt__p_wxPen,
   &_swigt__p_wxPenList,

+  &_swigt__p_wxPixelDataBase,

   &_swigt__p_wxPoint,
   &_swigt__p_wxPostScriptDC,
   &_swigt__p_wxPrintData,
   &_swigt__p_wxPoint,
   &_swigt__p_wxPostScriptDC,
   &_swigt__p_wxPrintData,


@@ -30333,6 +33557,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxPyEvent,
   &_swigt__p_wxPyFontEnumerator,
   &_swigt__p_wxPyImageHandler,
   &_swigt__p_wxPyEvent,
   &_swigt__p_wxPyFontEnumerator,
   &_swigt__p_wxPyImageHandler,

+  &_swigt__p_wxPyLocale,

   &_swigt__p_wxPySizer,
   &_swigt__p_wxPyValidator,
   &_swigt__p_wxQueryNewPaletteEvent,
   &_swigt__p_wxPySizer,
   &_swigt__p_wxPyValidator,
   &_swigt__p_wxQueryNewPaletteEvent,


@@ -30366,6 +33591,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxXPMHandler,
 };
 
   &_swigt__p_wxXPMHandler,
 };
 

+static swig_cast_info _swigc__p_buffer[] = {  {&_swigt__p_buffer, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_double[] = {  {&_swigt__p_double, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_form_ops_t[] = {  {&_swigt__p_form_ops_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_double[] = {  {&_swigt__p_double, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_form_ops_t[] = {  {&_swigt__p_form_ops_t, 0, 0, 0},{0, 0, 0, 0}};


@@ -30373,11 +33599,14 @@ static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0
 static swig_cast_info _swigc__p_unsigned_char[] = {  {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_long[] = {  {&_swigt__p_unsigned_long, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_char[] = {  {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_long[] = {  {&_swigt__p_unsigned_long, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxAlphaPixelData[] = {  {&_swigt__p_wxAlphaPixelData, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxAlphaPixelData_Accessor[] = {  {&_swigt__p_wxAlphaPixelData_Accessor, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxBitmap[] = {  {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBrush[] = {  {&_swigt__p_wxBrush, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBrushList[] = {  {&_swigt__p_wxBrushList, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBufferedDC[] = {  {&_swigt__p_wxBufferedDC, 0, 0, 0},  {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxBufferedDC, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBufferedPaintDC[] = {  {&_swigt__p_wxBufferedPaintDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBitmap[] = {  {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBrush[] = {  {&_swigt__p_wxBrush, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBrushList[] = {  {&_swigt__p_wxBrushList, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBufferedDC[] = {  {&_swigt__p_wxBufferedDC, 0, 0, 0},  {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxBufferedDC, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBufferedPaintDC[] = {  {&_swigt__p_wxBufferedPaintDC, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxChar[] = {  {&_swigt__p_wxChar, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxClientDC[] = {  {&_swigt__p_wxClientDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxColour[] = {  {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxColourDatabase[] = {  {&_swigt__p_wxColourDatabase, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxClientDC[] = {  {&_swigt__p_wxClientDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxColour[] = {  {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxColourDatabase[] = {  {&_swigt__p_wxColourDatabase, 0, 0, 0},{0, 0, 0, 0}};


@@ -30392,13 +33621,14 @@ static swig_cast_info _swigc__p_wxFontList[] = {  {&_swigt__p_wxFontList, 0, 0,
 static swig_cast_info _swigc__p_wxFontMapper[] = {  {&_swigt__p_wxFontMapper, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxGDIObjListBase[] = {  {&_swigt__p_wxGDIObjListBase, 0, 0, 0},  {&_swigt__p_wxBrushList, _p_wxBrushListTo_p_wxGDIObjListBase, 0, 0},  {&_swigt__p_wxFontList, _p_wxFontListTo_p_wxGDIObjListBase, 0, 0},  {&_swigt__p_wxPenList, _p_wxPenListTo_p_wxGDIObjListBase, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxGDIObject[] = {  {&_swigt__p_wxIcon, _p_wxIconTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxPen, _p_wxPenTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxFont, _p_wxFontTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxPalette, _p_wxPaletteTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxGDIObject, 0, 0, 0},  {&_swigt__p_wxCursor, _p_wxCursorTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxBitmap, _p_wxBitmapTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxRegion, _p_wxRegionTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxBrush, _p_wxBrushTo_p_wxGDIObject, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFontMapper[] = {  {&_swigt__p_wxFontMapper, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxGDIObjListBase[] = {  {&_swigt__p_wxGDIObjListBase, 0, 0, 0},  {&_swigt__p_wxBrushList, _p_wxBrushListTo_p_wxGDIObjListBase, 0, 0},  {&_swigt__p_wxFontList, _p_wxFontListTo_p_wxGDIObjListBase, 0, 0},  {&_swigt__p_wxPenList, _p_wxPenListTo_p_wxGDIObjListBase, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxGDIObject[] = {  {&_swigt__p_wxIcon, _p_wxIconTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxPen, _p_wxPenTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxFont, _p_wxFontTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxPalette, _p_wxPaletteTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxGDIObject, 0, 0, 0},  {&_swigt__p_wxCursor, _p_wxCursorTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxBitmap, _p_wxBitmapTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxRegion, _p_wxRegionTo_p_wxGDIObject, 0, 0},  {&_swigt__p_wxBrush, _p_wxBrushTo_p_wxGDIObject, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHeaderButtonParams[] = {  {&_swigt__p_wxHeaderButtonParams, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxIcon[] = {  {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIconBundle[] = {  {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIconLocation[] = {  {&_swigt__p_wxIconLocation, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxImage[] = {  {&_swigt__p_wxImage, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxImageList[] = {  {&_swigt__p_wxImageList, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxLanguageInfo[] = {  {&_swigt__p_wxLanguageInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIcon[] = {  {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIconBundle[] = {  {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIconLocation[] = {  {&_swigt__p_wxIconLocation, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxImage[] = {  {&_swigt__p_wxImage, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxImageList[] = {  {&_swigt__p_wxImageList, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxLanguageInfo[] = {  {&_swigt__p_wxLanguageInfo, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxLocale[] = {  {&_swigt__p_wxLocale, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxLocale[] = {  {&_swigt__p_wxPyLocale, _p_wxPyLocaleTo_p_wxLocale, 0, 0},  {&_swigt__p_wxLocale, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxMask[] = {  {&_swigt__p_wxMask, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMemoryDC[] = {  {&_swigt__p_wxBufferedDC, _p_wxBufferedDCTo_p_wxMemoryDC, 0, 0},  {&_swigt__p_wxMemoryDC, 0, 0, 0},  {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxMemoryDC, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMetaFile[] = {  {&_swigt__p_wxMetaFile, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMask[] = {  {&_swigt__p_wxMask, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMemoryDC[] = {  {&_swigt__p_wxBufferedDC, _p_wxBufferedDCTo_p_wxMemoryDC, 0, 0},  {&_swigt__p_wxMemoryDC, 0, 0, 0},  {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxMemoryDC, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMetaFile[] = {  {&_swigt__p_wxMetaFile, 0, 0, 0},{0, 0, 0, 0}};


@@ -30406,9 +33636,11 @@ static swig_cast_info _swigc__p_wxMetaFileDC[] = {  {&_swigt__p_wxMetaFileDC, 0,
 static swig_cast_info _swigc__p_wxMirrorDC[] = {  {&_swigt__p_wxMirrorDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNativeEncodingInfo[] = {  {&_swigt__p_wxNativeEncodingInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNativeFontInfo[] = {  {&_swigt__p_wxNativeFontInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMirrorDC[] = {  {&_swigt__p_wxMirrorDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNativeEncodingInfo[] = {  {&_swigt__p_wxNativeEncodingInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNativeFontInfo[] = {  {&_swigt__p_wxNativeFontInfo, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxNativePixelData[] = {  {&_swigt__p_wxNativePixelData, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxNativePixelData_Accessor[] = {  {&_swigt__p_wxNativePixelData_Accessor, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxLayoutConstraints[] = {{&_swigt__p_wxLayoutConstraints, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxLayoutConstraints[] = {{&_swigt__p_wxLayoutConstraints, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxGBSizerItem[] = {{&_swigt__p_wxGBSizerItem, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxSizerItem[] = {{&_swigt__p_wxSizerItem, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSizerItem[] = {{&_swigt__p_wxSizerItem, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxGBSizerItem[] = {{&_swigt__p_wxGBSizerItem, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxScrollEvent[] = {{&_swigt__p_wxScrollEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIndividualLayoutConstraint[] = {{&_swigt__p_wxIndividualLayoutConstraint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxStaticBoxSizer[] = {{&_swigt__p_wxStaticBoxSizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxScrollEvent[] = {{&_swigt__p_wxScrollEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIndividualLayoutConstraint[] = {{&_swigt__p_wxIndividualLayoutConstraint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxStaticBoxSizer[] = {{&_swigt__p_wxStaticBoxSizer, 0, 0, 0},{0, 0, 0, 0}};


@@ -30459,6 +33691,7 @@ static swig_cast_info _swigc__p_wxGIFHandler[] = {{&_swigt__p_wxGIFHandler, 0, 0
 static swig_cast_info _swigc__p_wxPCXHandler[] = {{&_swigt__p_wxPCXHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxJPEGHandler[] = {{&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPNMHandler[] = {{&_swigt__p_wxPNMHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPCXHandler[] = {{&_swigt__p_wxPCXHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxJPEGHandler[] = {{&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPNMHandler[] = {{&_swigt__p_wxPNMHandler, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxMouseCaptureLostEvent[] = {{&_swigt__p_wxMouseCaptureLostEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxStdDialogButtonSizer[] = {{&_swigt__p_wxStdDialogButtonSizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxAcceleratorTable[] = {{&_swigt__p_wxAcceleratorTable, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxScrollWinEvent[] = {{&_swigt__p_wxScrollWinEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxStdDialogButtonSizer[] = {{&_swigt__p_wxStdDialogButtonSizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxAcceleratorTable[] = {{&_swigt__p_wxAcceleratorTable, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxScrollWinEvent[] = {{&_swigt__p_wxScrollWinEvent, 0, 0, 0},{0, 0, 0, 0}};


@@ -30481,18 +33714,20 @@ static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusE
 static swig_cast_info _swigc__p_wxControlWithItems[] = {{&_swigt__p_wxControlWithItems, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyValidator[] = {{&_swigt__p_wxPyValidator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxValidator[] = {{&_swigt__p_wxValidator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxControlWithItems[] = {{&_swigt__p_wxControlWithItems, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyValidator[] = {{&_swigt__p_wxPyValidator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxValidator[] = {{&_swigt__p_wxValidator, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxObject[] = {  {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0},  {&_swigt__p_wxRegionIterator, _p_wxRegionIteratorTo_p_wxObject, 0, 0},  {&_swigt__p_wxPen, _p_wxPenTo_p_wxObject, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMask, _p_wxMaskTo_p_wxObject, 0, 0},  {&_swigt__p_wxPseudoDC, _p_wxPseudoDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0},  {&_swigt__p_wxFont, _p_wxFontTo_p_wxObject, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxClientDC, _p_wxClientDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0},  {&_swigt__p_wxMemoryDC, _p_wxMemoryDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxRegion, _p_wxRegionTo_p_wxObject, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxDC, _p_wxDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxIcon, _p_wxIconTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindowDC, _p_wxWindowDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxGDIObject, _p_wxGDIObjectTo_p_wxObject, 0, 0},  {&_swigt__p_wxEffects, _p_wxEffectsTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPostScriptDC, _p_wxPostScriptDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrinterDC, _p_wxPrinterDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxScreenDC, _p_wxScreenDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0},  {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxBufferedDC, _p_wxBufferedDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxPalette, _p_wxPaletteTo_p_wxObject, 0, 0},  {&_swigt__p_wxImageList, _p_wxImageListTo_p_wxObject, 0, 0},  {&_swigt__p_wxCursor, _p_wxCursorTo_p_wxObject, 0, 0},  {&_swigt__p_wxObject, 0, 0, 0},  {&_swigt__p_wxMirrorDC, _p_wxMirrorDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxEncodingConverter, _p_wxEncodingConverterTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMetaFileDC, _p_wxMetaFileDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0},  {&_swigt__p_wxBitmap, _p_wxBitmapTo_p_wxObject, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0},  {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxBrush, _p_wxBrushTo_p_wxObject, 0, 0},  {&_swigt__p_wxMetaFile, _p_wxMetaFileTo_p_wxObject, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0},  {&_swigt__p_wxColour, _p_wxColourTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxObject[] = {  {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0},  {&_swigt__p_wxRegionIterator, _p_wxRegionIteratorTo_p_wxObject, 0, 0},  {&_swigt__p_wxPen, _p_wxPenTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMask, _p_wxMaskTo_p_wxObject, 0, 0},  {&_swigt__p_wxPseudoDC, _p_wxPseudoDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0},  {&_swigt__p_wxFont, _p_wxFontTo_p_wxObject, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxClientDC, _p_wxClientDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0},  {&_swigt__p_wxMemoryDC, _p_wxMemoryDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxRegion, _p_wxRegionTo_p_wxObject, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxDC, _p_wxDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxIcon, _p_wxIconTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindowDC, _p_wxWindowDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxGDIObject, _p_wxGDIObjectTo_p_wxObject, 0, 0},  {&_swigt__p_wxEffects, _p_wxEffectsTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPostScriptDC, _p_wxPostScriptDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrinterDC, _p_wxPrinterDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxScreenDC, _p_wxScreenDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0},  {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxBufferedDC, _p_wxBufferedDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxPalette, _p_wxPaletteTo_p_wxObject, 0, 0},  {&_swigt__p_wxImageList, _p_wxImageListTo_p_wxObject, 0, 0},  {&_swigt__p_wxCursor, _p_wxCursorTo_p_wxObject, 0, 0},  {&_swigt__p_wxObject, 0, 0, 0},  {&_swigt__p_wxMirrorDC, _p_wxMirrorDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxEncodingConverter, _p_wxEncodingConverterTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMetaFileDC, _p_wxMetaFileDCTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0},  {&_swigt__p_wxBitmap, _p_wxBitmapTo_p_wxObject, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0},  {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxBrush, _p_wxBrushTo_p_wxObject, 0, 0},  {&_swigt__p_wxMetaFile, _p_wxMetaFileTo_p_wxObject, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0},  {&_swigt__p_wxColour, _p_wxColourTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxPaintDC[] = {  {&_swigt__p_wxPaintDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPalette[] = {  {&_swigt__p_wxPalette, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPaperSize[] = {  {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPen[] = {  {&_swigt__p_wxPen, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPenList[] = {  {&_swigt__p_wxPenList, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPaintDC[] = {  {&_swigt__p_wxPaintDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPalette[] = {  {&_swigt__p_wxPalette, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPaperSize[] = {  {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPen[] = {  {&_swigt__p_wxPen, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPenList[] = {  {&_swigt__p_wxPenList, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxPixelDataBase[] = {  {&_swigt__p_wxPixelDataBase, 0, 0, 0},  {&_swigt__p_wxNativePixelData, _p_wxNativePixelDataTo_p_wxPixelDataBase, 0, 0},  {&_swigt__p_wxAlphaPixelData, _p_wxAlphaPixelDataTo_p_wxPixelDataBase, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxPoint[] = {  {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPostScriptDC[] = {  {&_swigt__p_wxPostScriptDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrintData[] = {  {&_swigt__p_wxPrintData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrinterDC[] = {  {&_swigt__p_wxPrinterDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPseudoDC[] = {  {&_swigt__p_wxPseudoDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyFontEnumerator[] = {  {&_swigt__p_wxPyFontEnumerator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPoint[] = {  {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPostScriptDC[] = {  {&_swigt__p_wxPostScriptDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrintData[] = {  {&_swigt__p_wxPrintData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrinterDC[] = {  {&_swigt__p_wxPrinterDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPseudoDC[] = {  {&_swigt__p_wxPseudoDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyFontEnumerator[] = {  {&_swigt__p_wxPyFontEnumerator, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxPyLocale[] = {  {&_swigt__p_wxPyLocale, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxRect[] = {  {&_swigt__p_wxRect, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxRegion[] = {  {&_swigt__p_wxRegion, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxRegionIterator[] = {  {&_swigt__p_wxRegionIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxRect[] = {  {&_swigt__p_wxRect, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxRegion[] = {  {&_swigt__p_wxRegion, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxRegionIterator[] = {  {&_swigt__p_wxRegionIterator, 0, 0, 0},{0, 0, 0, 0}};


@@ -30507,6 +33742,7 @@ static swig_cast_info _swigc__p_wxWindow[] = {  {&_swigt__p_wxControl, _p_wxCont
 static swig_cast_info _swigc__p_wxWindowDC[] = {  {&_swigt__p_wxWindowDC, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
 static swig_cast_info _swigc__p_wxWindowDC[] = {  {&_swigt__p_wxWindowDC, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {

+  _swigc__p_buffer,

   _swigc__p_char,
   _swigc__p_double,
   _swigc__p_form_ops_t,
   _swigc__p_char,
   _swigc__p_double,
   _swigc__p_form_ops_t,


@@ -30517,6 +33753,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxANIHandler,
   _swigc__p_wxAcceleratorTable,
   _swigc__p_wxActivateEvent,
   _swigc__p_wxANIHandler,
   _swigc__p_wxAcceleratorTable,
   _swigc__p_wxActivateEvent,

+  _swigc__p_wxAlphaPixelData,
+  _swigc__p_wxAlphaPixelData_Accessor,

   _swigc__p_wxBMPHandler,
   _swigc__p_wxBitmap,
   _swigc__p_wxBoxSizer,
   _swigc__p_wxBMPHandler,
   _swigc__p_wxBitmap,
   _swigc__p_wxBoxSizer,


@@ -30525,6 +33763,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxBufferedDC,
   _swigc__p_wxBufferedPaintDC,
   _swigc__p_wxCURHandler,
   _swigc__p_wxBufferedDC,
   _swigc__p_wxBufferedPaintDC,
   _swigc__p_wxCURHandler,

+  _swigc__p_wxChar,

   _swigc__p_wxChildFocusEvent,
   _swigc__p_wxClientDC,
   _swigc__p_wxClipboardTextEvent,
   _swigc__p_wxChildFocusEvent,
   _swigc__p_wxClientDC,
   _swigc__p_wxClipboardTextEvent,


@@ -30560,6 +33799,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxGIFHandler,
   _swigc__p_wxGridBagSizer,
   _swigc__p_wxGridSizer,
   _swigc__p_wxGIFHandler,
   _swigc__p_wxGridBagSizer,
   _swigc__p_wxGridSizer,

+  _swigc__p_wxHeaderButtonParams,

   _swigc__p_wxICOHandler,
   _swigc__p_wxIcon,
   _swigc__p_wxIconBundle,
   _swigc__p_wxICOHandler,
   _swigc__p_wxIcon,
   _swigc__p_wxIconBundle,


@@ -30587,10 +33827,13 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxMetaFileDC,
   _swigc__p_wxMirrorDC,
   _swigc__p_wxMouseCaptureChangedEvent,
   _swigc__p_wxMetaFileDC,
   _swigc__p_wxMirrorDC,
   _swigc__p_wxMouseCaptureChangedEvent,

+  _swigc__p_wxMouseCaptureLostEvent,

   _swigc__p_wxMouseEvent,
   _swigc__p_wxMoveEvent,
   _swigc__p_wxNativeEncodingInfo,
   _swigc__p_wxNativeFontInfo,
   _swigc__p_wxMouseEvent,
   _swigc__p_wxMoveEvent,
   _swigc__p_wxNativeEncodingInfo,
   _swigc__p_wxNativeFontInfo,

+  _swigc__p_wxNativePixelData,
+  _swigc__p_wxNativePixelData_Accessor,

   _swigc__p_wxNavigationKeyEvent,
   _swigc__p_wxNcPaintEvent,
   _swigc__p_wxNotifyEvent,
   _swigc__p_wxNavigationKeyEvent,
   _swigc__p_wxNcPaintEvent,
   _swigc__p_wxNotifyEvent,


@@ -30605,6 +33848,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxPaperSize,
   _swigc__p_wxPen,
   _swigc__p_wxPenList,
   _swigc__p_wxPaperSize,
   _swigc__p_wxPen,
   _swigc__p_wxPenList,

+  _swigc__p_wxPixelDataBase,

   _swigc__p_wxPoint,
   _swigc__p_wxPostScriptDC,
   _swigc__p_wxPrintData,
   _swigc__p_wxPoint,
   _swigc__p_wxPostScriptDC,
   _swigc__p_wxPrintData,


@@ -30615,6 +33859,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxPyEvent,
   _swigc__p_wxPyFontEnumerator,
   _swigc__p_wxPyImageHandler,
   _swigc__p_wxPyEvent,
   _swigc__p_wxPyFontEnumerator,
   _swigc__p_wxPyImageHandler,

+  _swigc__p_wxPyLocale,

   _swigc__p_wxPySizer,
   _swigc__p_wxPyValidator,
   _swigc__p_wxQueryNewPaletteEvent,
   _swigc__p_wxPySizer,
   _swigc__p_wxPyValidator,
   _swigc__p_wxQueryNewPaletteEvent,


@@ -31152,6 +34397,8 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "C2S_NAME",SWIG_From_int(static_cast< int >(wxC2S_NAME)));
   SWIG_Python_SetConstant(d, "C2S_CSS_SYNTAX",SWIG_From_int(static_cast< int >(wxC2S_CSS_SYNTAX)));
   SWIG_Python_SetConstant(d, "C2S_HTML_SYNTAX",SWIG_From_int(static_cast< int >(wxC2S_HTML_SYNTAX)));
   SWIG_Python_SetConstant(d, "C2S_NAME",SWIG_From_int(static_cast< int >(wxC2S_NAME)));
   SWIG_Python_SetConstant(d, "C2S_CSS_SYNTAX",SWIG_From_int(static_cast< int >(wxC2S_CSS_SYNTAX)));
   SWIG_Python_SetConstant(d, "C2S_HTML_SYNTAX",SWIG_From_int(static_cast< int >(wxC2S_HTML_SYNTAX)));

+  SWIG_Python_SetConstant(d, "ALPHA_TRANSPARENT",SWIG_From_int(static_cast< int >(wxALPHA_TRANSPARENT)));
+  SWIG_Python_SetConstant(d, "ALPHA_OPAQUE",SWIG_From_int(static_cast< int >(wxALPHA_OPAQUE)));

   SWIG_Python_SetConstant(d, "OutRegion",SWIG_From_int(static_cast< int >(wxOutRegion)));
   SWIG_Python_SetConstant(d, "PartRegion",SWIG_From_int(static_cast< int >(wxPartRegion)));
   SWIG_Python_SetConstant(d, "InRegion",SWIG_From_int(static_cast< int >(wxInRegion)));
   SWIG_Python_SetConstant(d, "OutRegion",SWIG_From_int(static_cast< int >(wxOutRegion)));
   SWIG_Python_SetConstant(d, "PartRegion",SWIG_From_int(static_cast< int >(wxPartRegion)));
   SWIG_Python_SetConstant(d, "InRegion",SWIG_From_int(static_cast< int >(wxInRegion)));


@@ -31584,9 +34831,11 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "CONTROL_DISABLED",SWIG_From_int(static_cast< int >(wxCONTROL_DISABLED)));
   SWIG_Python_SetConstant(d, "CONTROL_FOCUSED",SWIG_From_int(static_cast< int >(wxCONTROL_FOCUSED)));
   SWIG_Python_SetConstant(d, "CONTROL_PRESSED",SWIG_From_int(static_cast< int >(wxCONTROL_PRESSED)));
   SWIG_Python_SetConstant(d, "CONTROL_DISABLED",SWIG_From_int(static_cast< int >(wxCONTROL_DISABLED)));
   SWIG_Python_SetConstant(d, "CONTROL_FOCUSED",SWIG_From_int(static_cast< int >(wxCONTROL_FOCUSED)));
   SWIG_Python_SetConstant(d, "CONTROL_PRESSED",SWIG_From_int(static_cast< int >(wxCONTROL_PRESSED)));

+  SWIG_Python_SetConstant(d, "CONTROL_SPECIAL",SWIG_From_int(static_cast< int >(wxCONTROL_SPECIAL)));

   SWIG_Python_SetConstant(d, "CONTROL_ISDEFAULT",SWIG_From_int(static_cast< int >(wxCONTROL_ISDEFAULT)));
   SWIG_Python_SetConstant(d, "CONTROL_ISSUBMENU",SWIG_From_int(static_cast< int >(wxCONTROL_ISSUBMENU)));
   SWIG_Python_SetConstant(d, "CONTROL_EXPANDED",SWIG_From_int(static_cast< int >(wxCONTROL_EXPANDED)));
   SWIG_Python_SetConstant(d, "CONTROL_ISDEFAULT",SWIG_From_int(static_cast< int >(wxCONTROL_ISDEFAULT)));
   SWIG_Python_SetConstant(d, "CONTROL_ISSUBMENU",SWIG_From_int(static_cast< int >(wxCONTROL_ISSUBMENU)));
   SWIG_Python_SetConstant(d, "CONTROL_EXPANDED",SWIG_From_int(static_cast< int >(wxCONTROL_EXPANDED)));

+  SWIG_Python_SetConstant(d, "CONTROL_SIZEGRIP",SWIG_From_int(static_cast< int >(wxCONTROL_SIZEGRIP)));

   SWIG_Python_SetConstant(d, "CONTROL_CURRENT",SWIG_From_int(static_cast< int >(wxCONTROL_CURRENT)));
   SWIG_Python_SetConstant(d, "CONTROL_SELECTED",SWIG_From_int(static_cast< int >(wxCONTROL_SELECTED)));
   SWIG_Python_SetConstant(d, "CONTROL_CHECKED",SWIG_From_int(static_cast< int >(wxCONTROL_CHECKED)));
   SWIG_Python_SetConstant(d, "CONTROL_CURRENT",SWIG_From_int(static_cast< int >(wxCONTROL_CURRENT)));
   SWIG_Python_SetConstant(d, "CONTROL_SELECTED",SWIG_From_int(static_cast< int >(wxCONTROL_SELECTED)));
   SWIG_Python_SetConstant(d, "CONTROL_CHECKED",SWIG_From_int(static_cast< int >(wxCONTROL_CHECKED)));


@@ -31594,6 +34843,9 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "CONTROL_UNDETERMINED",SWIG_From_int(static_cast< int >(wxCONTROL_UNDETERMINED)));
   SWIG_Python_SetConstant(d, "CONTROL_FLAGS_MASK",SWIG_From_int(static_cast< int >(wxCONTROL_FLAGS_MASK)));
   SWIG_Python_SetConstant(d, "CONTROL_DIRTY",SWIG_From_int(static_cast< int >(wxCONTROL_DIRTY)));
   SWIG_Python_SetConstant(d, "CONTROL_UNDETERMINED",SWIG_From_int(static_cast< int >(wxCONTROL_UNDETERMINED)));
   SWIG_Python_SetConstant(d, "CONTROL_FLAGS_MASK",SWIG_From_int(static_cast< int >(wxCONTROL_FLAGS_MASK)));
   SWIG_Python_SetConstant(d, "CONTROL_DIRTY",SWIG_From_int(static_cast< int >(wxCONTROL_DIRTY)));

+  SWIG_Python_SetConstant(d, "HDR_SORT_ICON_NONE",SWIG_From_int(static_cast< int >(wxHDR_SORT_ICON_NONE)));
+  SWIG_Python_SetConstant(d, "HDR_SORT_ICON_UP",SWIG_From_int(static_cast< int >(wxHDR_SORT_ICON_UP)));
+  SWIG_Python_SetConstant(d, "HDR_SORT_ICON_DOWN",SWIG_From_int(static_cast< int >(wxHDR_SORT_ICON_DOWN)));

   SWIG_Python_SetConstant(d, "RendererVersion_Current_Version",SWIG_From_int(static_cast< int >(wxRendererVersion::Current_Version)));
   SWIG_Python_SetConstant(d, "RendererVersion_Current_Age",SWIG_From_int(static_cast< int >(wxRendererVersion::Current_Age)));
   
   SWIG_Python_SetConstant(d, "RendererVersion_Current_Version",SWIG_From_int(static_cast< int >(wxRendererVersion::Current_Version)));
   SWIG_Python_SetConstant(d, "RendererVersion_Current_Age",SWIG_From_int(static_cast< int >(wxRendererVersion::Current_Age)));