Gobs of changes needed to get up to date with today's CVS

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 5a799bd0fe1126c7b027723d0c5a66d799aee296..456b87c9590f02d30c797fbeea39997cce05cfd7 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -2,6 +2,30 @@ Recent Changes for wxPython
 =====================================================================
 
 
 =====================================================================
 
 

+2.7.2.0
+-------
+*
+
+Patch [ 1583183 ] Fixes printing/print preview inconsistencies
+
+Add events API to wxHtmlWindow (patch #1504493 by Francesco Montorsi)
+
+Added wxTB_RIGHT style for right-aligned toolbars (Igor Korot)
+
+Added New Zealand NZST and NZDT timezone support to wx.DateTime.
+
+wx.Window.GetAdjustedBestSize is deprecated.  In every conceivable
+scenario GetBestFitting size is probably what you want to use instead.
+
+
+
+
+
+
+
+
+
+

 2.7.1.3
 -------
 * 26-Oct-2006
 2.7.1.3
 -------
 * 26-Oct-2006

diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h
index 063201d6534aaa53d8a5beaa83da776cdb73a843..4efa244ecce73a445f93787850d09aa141ad8b7d 100644 (file)
--- a/wxPython/include/wx/wxPython/wxPython_int.h
+++ b/wxPython/include/wx/wxPython/wxPython_int.h
@@ -910,6 +910,29 @@ extern wxPyApp *wxPythonApp;
     }
 
 
     }
 
 

+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_INT_WIN(CBNAME)    \
+    int CBNAME(wxWindow* a)
+
+
+#define IMP_PYCALLBACK_INT_WIN(CLASS, PCLASS, CBNAME)                           \
+    int CLASS::CBNAME(wxWindow* a) {                                            \
+        int rval=0;                                                             \
+        bool found;                                                             \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* obj = wxPyMake_wxObject(a, false);                        \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)",obj));    \
+            Py_DECREF(obj);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads(blocked);                                           \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a);                                           \
+        return rval;                                                            \
+    }
+
+

 //---------------------------------------------------------------------------
 
 #define DEC_PYCALLBACK__DC(CBNAME)                      \
 //---------------------------------------------------------------------------
 
 #define DEC_PYCALLBACK__DC(CBNAME)                      \

diff --git a/wxPython/src/_bitmap.i b/wxPython/src/_bitmap.i
index f98e9daa7c1ad5451f281380e5db1a1e261a69a9..1316e7cd35d04d5ab3c6b9e8373a311d098d6839 100644 (file)
--- a/wxPython/src/_bitmap.i
+++ b/wxPython/src/_bitmap.i
@@ -23,6 +23,22 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+%{
+// 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
+%}
+
+//---------------------------------------------------------------------------
+
+

 %{
 #include <wx/image.h>
     
 %{
 #include <wx/image.h>
     


@@ -298,21 +314,87 @@ the ``type`` parameter.", "");
     
 #ifdef __WXMSW__
     bool CopyFromCursor(const wxCursor& cursor);
     
 #ifdef __WXMSW__
     bool CopyFromCursor(const wxCursor& cursor);

-
-// WXWIN_COMPATIBILITY_2_4
-  #if 0
-    int GetQuality();
-    void SetQuality(int q);
-    %pythoncode { GetQuality = wx._deprecated(GetQuality) }
-    %pythoncode { SetQuality = wx._deprecated(SetQuality) }
-  #endif

 #endif
 
 #endif
 

+    %extend {
+        DocStr(CopyFromBuffer,
+               "Copy data from a RGB buffer object to replace the bitmap pixel data.
+See `wxBitmapFromBuffer` for more details.", "");
+        void CopyFromBuffer(buffer data, int DATASIZE)
+        {
+            int height=self->GetHeight();
+            int width=self->GetWidth();
+
+            if (DATASIZE != width * height * 3) {
+                wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
+            }
+            wxNativePixelData pixData(*self, wxPoint(0,0), wxSize(width, height));
+            if (! pixData) {
+                // raise an exception...
+                wxPyErr_SetString(PyExc_RuntimeError,
+                                  "Failed to gain raw access to bitmap data.");
+                return;
+            }
+
+            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);
+            }
+        }
+
+        DocStr(CopyFromBufferRGBA,
+               "Copy data from a RGBA buffer object to replace the bitmap pixel data.
+See `wxBitmapFromBufferRGBA` for more details.", "");
+        void CopyFromBufferRGBA(buffer data, int DATASIZE)
+        {
+            int height=self->GetHeight();
+            int width=self->GetWidth();
+            
+            if (DATASIZE != width * height * 4) {
+                wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
+            }
+            wxAlphaPixelData pixData(*self, wxPoint(0,0), wxSize(width, height));
+            if (! pixData) {
+                // raise an exception...
+                wxPyErr_SetString(PyExc_RuntimeError,
+                                  "Failed to gain raw access to bitmap data.");
+                return;
+            }
+
+            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);
+            }
+        }        
+    }
+
+    

     %pythoncode { def __nonzero__(self): return self.IsOk() }
 
     %pythoncode { def __nonzero__(self): return self.IsOk() }
 

+    // TODO: Should these just be removed since the C++ operators are
+    // gone?  Or is using IsSameAs for wxPython ok?    

     %extend {
     %extend {

-        bool __eq__(const wxBitmap* other) { return other ? (*self == *other) : false; }
-        bool __ne__(const wxBitmap* other) { return other ? (*self != *other) : true;  }
+        bool __eq__(const wxBitmap* other) { return other ? self->IsSameAs(*other) : false; }
+        bool __ne__(const wxBitmap* other) { return other ? !self->IsSameAs(*other) : true;  }

     }
 
     %property(Depth, GetDepth, SetDepth, doc="See `GetDepth` and `SetDepth`");
     }
 
     %property(Depth, GetDepth, SetDepth, doc="See `GetDepth` and `SetDepth`");


@@ -331,19 +413,6 @@ the ``type`` parameter.", "");
 // use the Abstract Pixel API to be able to set RGB and A bytes directly into
 // the wxBitmap's pixel buffer.
 
 // use the Abstract Pixel API to be able to set RGB and A bytes directly into
 // the wxBitmap's pixel buffer.
 

-%{
-// 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
-%}
-

 
 %newobject _BitmapFromBufferAlpha;
 %newobject _BitmapFromBuffer;
 
 %newobject _BitmapFromBufferAlpha;
 %newobject _BitmapFromBuffer;

diff --git a/wxPython/src/_datetime.i b/wxPython/src/_datetime.i
index a14241a6c69a67f77575b6210438425982429980..aba286b03521d770b8c1d9b3ba173c1b687fbde7 100644 (file)
--- a/wxPython/src/_datetime.i
+++ b/wxPython/src/_datetime.i
@@ -78,7 +78,7 @@ public:
         GMT_6, GMT_5, GMT_4, GMT_3, GMT_2, GMT_1,
         GMT0,
         GMT1, GMT2, GMT3, GMT4, GMT5, GMT6,
         GMT_6, GMT_5, GMT_4, GMT_3, GMT_2, GMT_1,
         GMT0,
         GMT1, GMT2, GMT3, GMT4, GMT5, GMT6,

-        GMT7, GMT8, GMT9, GMT10, GMT11, GMT12,
+        GMT7, GMT8, GMT9, GMT10, GMT11, GMT12, GMT13,

 
         // Europe
         WET = GMT0,                         // Western Europe Time
 
         // Europe
         WET = GMT0,                         // Western Europe Time


@@ -108,10 +108,14 @@ public:
         // Australia
 
         A_WST = GMT8,                       // Western Standard Time
         // Australia
 
         A_WST = GMT8,                       // Western Standard Time

-        A_CST = GMT12 + 1,                  // Central Standard Time (+9.5)
+        A_CST = GMT13 + 1,                  // Central Standard Time (+9.5)

         A_EST = GMT10,                      // Eastern Standard Time
         A_ESST = GMT11,                     // Eastern Summer Time
 
         A_EST = GMT10,                      // Eastern Standard Time
         A_ESST = GMT11,                     // Eastern Summer Time
 

+        // New Zealand
+        NZST = GMT12,                       // Standard Time
+        NZDT = GMT13,                       // Daylight Saving Time
+        

         // Universal Coordinated Time = the new and politically correct name
         // for GMT
         UTC = GMT0
         // Universal Coordinated Time = the new and politically correct name
         // for GMT
         UTC = GMT0

diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index f2c860be0a856c77553ee67e7d18969c1b1edccd..9dbb9a3dbc389cd17931ac67f5c5d292331e9e10 100644 (file)
--- a/wxPython/src/_dc.i
+++ b/wxPython/src/_dc.i
@@ -352,6 +352,12 @@ position.", "
     :param srcPtMask:   Source position on the mask. 
 ",
         BlitPointSize);
     :param srcPtMask:   Source position on the mask. 
 ",
         BlitPointSize);

+
+
+    DocDeclStr(
+        wxBitmap , GetAsBitmap(const wxRect *subrect = NULL) const,
+        "", "");
+    

     
 
     DocStr(
     
 
     DocStr(


@@ -1316,7 +1322,7 @@ of it) before a bitmap can be reselected into another memory DC.
 class wxMemoryDC : public wxDC {
 public:
     DocCtorStr(
 class wxMemoryDC : public wxDC {
 public:
     DocCtorStr(

-        wxMemoryDC(const wxBitmap& bitmap = wxNullBitmap),
+        wxMemoryDC(wxBitmap& bitmap = wxNullBitmap),

         "Constructs a new memory device context.
 
 Use the Ok member to test whether the constructor was successful in
         "Constructs a new memory device context.
 
 Use the Ok member to test whether the constructor was successful in


@@ -1333,7 +1339,7 @@ drawing on it.", "
 
     
     DocDeclStr(
 
     
     DocDeclStr(

-        void , SelectObject(const wxBitmap& bitmap),
+        void , SelectObject(wxBitmap& bitmap),

         "Selects the bitmap into the device context, to use as the memory
 bitmap. Selecting the bitmap into a memory DC allows you to draw into
 the DC, and therefore the bitmap, and also to use Blit to copy the
         "Selects the bitmap into the device context, to use as the memory
 bitmap. Selecting the bitmap into a memory DC allows you to draw into
 the DC, and therefore the bitmap, and also to use Blit to copy the


@@ -1343,6 +1349,12 @@ If the argument is wx.NullBitmap (or some other uninitialised
 `wx.Bitmap`) the current bitmap is selected out of the device context,
 and the original bitmap restored, allowing the current bitmap to be
 destroyed safely.", "");
 `wx.Bitmap`) the current bitmap is selected out of the device context,
 and the original bitmap restored, allowing the current bitmap to be
 destroyed safely.", "");

+
+    
+    DocDeclStr(
+        void , SelectObjectAsSource(const wxBitmap& bmp),
+        "", "");
+    

     
 };
 
     
 };
 

diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i
index d57c92d2255b0a7b12bacb0c391e4736fd5d102b..7d2ff9e7badc36ded1d15f8229bfaeabda0cee2b 100644 (file)
--- a/wxPython/src/_gdicmn.i
+++ b/wxPython/src/_gdicmn.i
@@ -42,6 +42,7 @@ enum wxBitmapType
     wxBITMAP_TYPE_ICON,
     wxBITMAP_TYPE_ANI,
     wxBITMAP_TYPE_IFF,
     wxBITMAP_TYPE_ICON,
     wxBITMAP_TYPE_ANI,
     wxBITMAP_TYPE_IFF,

+    wxBITMAP_TYPE_TGA,

     wxBITMAP_TYPE_MACCURSOR,
 
 //    wxBITMAP_TYPE_BMP_RESOURCE,
     wxBITMAP_TYPE_MACCURSOR,
 
 //    wxBITMAP_TYPE_BMP_RESOURCE,

diff --git a/wxPython/src/_graphics.i b/wxPython/src/_graphics.i
index a222695c9116905030ae9b51bc79b5f51b42094f..4ecca9582f880d60d245f86534c77cd1643703d8 100644 (file)
--- a/wxPython/src/_graphics.i
+++ b/wxPython/src/_graphics.i
@@ -364,8 +364,7 @@ public :
 class wxGraphicsMatrix : public wxGraphicsObject
 {
 public :
 class wxGraphicsMatrix : public wxGraphicsObject
 {
 public :

-    // wxGraphicsMatrix(wxGraphicsRenderer* renderer);     *** This class is an ABC
-
+    wxGraphicsMatrix(); 

     virtual ~wxGraphicsMatrix();
 
     DocDeclStr(
     virtual ~wxGraphicsMatrix();
 
     DocDeclStr(


@@ -439,7 +438,7 @@ public :
 class wxGraphicsPath : public wxGraphicsObject
 {
 public :
 class wxGraphicsPath : public wxGraphicsObject
 {
 public :

-    //wxGraphicsPath(wxGraphicsRenderer* renderer);            *** This class is an ABC, so we can't allow instances to be created directly
+    wxGraphicsPath();

     virtual ~wxGraphicsPath();
 
 
     virtual ~wxGraphicsPath();
 
 


@@ -570,7 +569,7 @@ const wxGraphicsPath    wxNullGraphicsPath;
 class wxGraphicsContext : public wxGraphicsObject
 {
 public:
 class wxGraphicsContext : public wxGraphicsObject
 {
 public:

-    // wxGraphicsContext()         This is also an ABC, use Create to make an instance...
+    // wxGraphicsContext()         This is an ABC, use Create to make an instance...

     virtual ~wxGraphicsContext();
 
     %newobject Create;
     virtual ~wxGraphicsContext();
 
     %newobject Create;

diff --git a/wxPython/src/_image.i b/wxPython/src/_image.i
index cf0fff08d54eff35eb27a2f5f5f3da4b45056b22..b50691f280a068a3540c412b71cfa2db96304cfc 100644 (file)
--- a/wxPython/src/_image.i
+++ b/wxPython/src/_image.i
@@ -1263,7 +1263,12 @@ public:
 };
 
 
 };
 
 

-#if wxUSE_IFF
+
+#if 0
+%{
+#include <wx/imagiff.h>
+%}
+

 DocStr(wxIFFHandler,
 "A `wx.ImageHandler` for IFF image files.", "");
 class wxIFFHandler : public wxImageHandler {
 DocStr(wxIFFHandler,
 "A `wx.ImageHandler` for IFF image files.", "");
 class wxIFFHandler : public wxImageHandler {


@@ -1272,6 +1277,21 @@ public:
 };
 #endif
 
 };
 #endif
 

+
+#if 0
+%{
+#include <wx/imagtga.h>
+%}
+
+DocStr(wxTGAHandler,
+"A `wx.ImageHandler` for TGA image files.", "");
+class wxTGAHandler : public wxImageHandler {
+public:
+    wxTGAHandler();
+};
+#endif
+
+

 //---------------------------------------------------------------------------
 
 %{
 //---------------------------------------------------------------------------
 
 %{

diff --git a/wxPython/src/_obj.i b/wxPython/src/_obj.i
index 56672a69b71eafe7d1e53f6a148e2a68ea189a83..1555a2c5114d6ad94287e7fd2653ab8caa86ed5b 100644 (file)
--- a/wxPython/src/_obj.i
+++ b/wxPython/src/_obj.i
@@ -38,6 +38,13 @@ public:
         }
     }
 
         }
     }
 

+    DocDeclStr(
+        bool , IsSameAs(const wxObject& p) const,
+        "For wx.Objects that use C++ reference counting internally, this method
+can be used to determine if two objects are referencing the same data
+object.", "");
+    
+

     %property(ClassName, GetClassName, doc="See `GetClassName`");
 };
 
     %property(ClassName, GetClassName, doc="See `GetClassName`");
 };
 

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index 51ff10f048e88bf767ae34c3be11f268f29605ac..cce346ca10dd0907effa594180cb19c089745dad 100644 (file)
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -82,6 +82,7 @@ public:
     int GetQuality();
     wxPrintBin GetBin();
     wxPrintMode GetPrintMode() const;
     int GetQuality();
     wxPrintBin GetBin();
     wxPrintMode GetPrintMode() const;

+    int GetMedia() const;

     
     void SetNoCopies(int v);
     void SetCollate(bool flag);
     
     void SetNoCopies(int v);
     void SetCollate(bool flag);


@@ -95,7 +96,8 @@ public:
     void SetQuality(int quality);
     void SetBin(wxPrintBin bin);
     void SetPrintMode(wxPrintMode printMode);
     void SetQuality(int quality);
     void SetBin(wxPrintBin bin);
     void SetPrintMode(wxPrintMode printMode);

- 
+    void SetMedia(int media);
+    

     wxString GetFilename() const;
     void SetFilename( const wxString &filename );
 
     wxString GetFilename() const;
     void SetFilename( const wxString &filename );
 

diff --git a/wxPython/src/_process.i b/wxPython/src/_process.i
index 1156a96784fec8f1d5a7c11ca70df74d43be11c2..198b288e5c9dc8866b5f0a5f788de8a057daa673 100644 (file)
--- a/wxPython/src/_process.i
+++ b/wxPython/src/_process.i
@@ -101,6 +101,14 @@ public:
 
     %pythonAppend wxPyProcess  "self._setCallbackInfo(self, Process)"
     wxPyProcess(wxEvtHandler *parent = NULL, int id = -1);
 
     %pythonAppend wxPyProcess  "self._setCallbackInfo(self, Process)"
     wxPyProcess(wxEvtHandler *parent = NULL, int id = -1);

+    ~wxPyProcess();
+
+
+    DocDeclStr(
+        long , GetPid() const,
+        "get the process ID of the process executed by Open()", "");
+    
+

 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 

diff --git a/wxPython/src/_toolbar.i b/wxPython/src/_toolbar.i
index bdabc3a308df26072dcc7d2b96e0d089f304136f..f7e886494e5b22de7a68fa2bfc8c6e1227926e91 100644 (file)
--- a/wxPython/src/_toolbar.i
+++ b/wxPython/src/_toolbar.i
@@ -34,6 +34,11 @@ enum wxToolBarToolStyle
 enum {
     wxTB_HORIZONTAL,
     wxTB_VERTICAL,
 enum {
     wxTB_HORIZONTAL,
     wxTB_VERTICAL,

+    wxTB_TOP,
+    wxTB_LEFT,
+    wxTB_BOTTOM,
+    wxTB_RIGHT,
+

     wxTB_3DBUTTONS,
     wxTB_FLAT,
     wxTB_DOCKABLE,
     wxTB_3DBUTTONS,
     wxTB_FLAT,
     wxTB_DOCKABLE,


@@ -43,8 +48,7 @@ enum {
     wxTB_NOALIGN,
     wxTB_HORZ_LAYOUT,
     wxTB_HORZ_TEXT,
     wxTB_NOALIGN,
     wxTB_HORZ_LAYOUT,
     wxTB_HORZ_TEXT,

-    wxTB_NO_TOOLTIPS,
-    wxTB_BOTTOM
+    wxTB_NO_TOOLTIPS

 };
 
 
 };
 
 

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index c7b21a2a740378dd9ede38d86c7f2b303e0546e7..eaba0b3e0f590a0306369c5665caf3064dc3375b 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -578,18 +578,16 @@ the results.
 ", "");
     
 
 ", "");
     
 

-    DocDeclStr(
-        wxSize , GetAdjustedBestSize() const,
-        "This method is similar to GetBestSize, except in one
-thing. GetBestSize should return the minimum untruncated size of the
-window, while this method will return the largest of BestSize and any
-user specified minimum size. ie. it is the minimum size the window
-should currently be drawn at, not the minimal size it can possibly
-tolerate.", "");
+    %pythoncode {
+        def GetAdjustedBestSize(self):
+            s = self.GetBestSize()
+            return wx.Size(max(s.width,  self.GetMinWidth()),
+                           max(s.height, self.GetMinHeight()))
+        GetAdjustedBestSize = wx._deprecated(GetAdjustedBestSize, 'Use `GetBestFittingSize` instead.')
+    }

     
 
 
     
 
 

-

     DocDeclStr(
         void , Center( int direction = wxBOTH ),
         "Centers the window.  The parameter specifies the direction for
     DocDeclStr(
         void , Center( int direction = wxBOTH ),
         "Centers the window.  The parameter specifies the direction for


@@ -670,12 +668,12 @@ the virtual area of the window outside the given bounds.", "");
         "", "");
     
     DocDeclStr(
         "", "");
     
     DocDeclStr(

-        void , SetMinSize(const wxSize& minSize),
+        virtual void , SetMinSize(const wxSize& minSize),

         "A more convenient method than `SetSizeHints` for setting just the
 min size.", "");
     
     DocDeclStr(
         "A more convenient method than `SetSizeHints` for setting just the
 min size.", "");
     
     DocDeclStr(

-        void , SetMaxSize(const wxSize& maxSize),
+        virtual void , SetMaxSize(const wxSize& maxSize),

         "A more convenient method than `SetSizeHints` for setting just the
 max size.", "");
     
         "A more convenient method than `SetSizeHints` for setting just the
 max size.", "");
     

diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i
index 59a55ed3f34a1b4469b9bda7ddd41e13554cc102..53baa1d1707d7448308b46a7dc4f6991eb46a497 100755 (executable)
--- a/wxPython/src/aui.i
+++ b/wxPython/src/aui.i
@@ -289,6 +289,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);
             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);


@@ -310,6 +311,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);
             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);


@@ -334,6 +336,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOO)",
                                                          odc, owin, otext, orect, opane));
             Py_DECREF(odc);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOO)",
                                                          odc, owin, otext, orect, opane));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(otext);
             Py_DECREF(orect);
             Py_DECREF(opane);
             Py_DECREF(otext);
             Py_DECREF(orect);
             Py_DECREF(opane);


@@ -379,6 +382,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane));
             Py_DECREF(odc);
             PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
             Py_DECREF(opane);
        }
             Py_DECREF(orect);
             Py_DECREF(opane);
        }


@@ -405,6 +409,7 @@ class wxPyDockArt :  public wxDefaultDockArt
                                                          odc, owin, button, button_state,
                                                          orect, opane));
             Py_DECREF(odc);
                                                          odc, owin, button, button_state,
                                                          orect, opane));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
             Py_DECREF(opane);
         }
             Py_DECREF(orect);
             Py_DECREF(opane);
         }


@@ -484,6 +489,7 @@ class wxPyTabArt :  public wxDefaultTabArt
 {
     wxPyTabArt() : wxDefaultTabArt() {}
 
 {
     wxPyTabArt() : wxDefaultTabArt() {}
 

+    

     virtual void DrawBackground( wxDC* dc,
                                  const wxRect& rect )
     {
     virtual void DrawBackground( wxDC* dc,
                                  const wxRect& rect )
     {


@@ -547,9 +553,90 @@ class wxPyTabArt :  public wxDefaultTabArt
     }
 
 
     }
 
 

+    virtual void DrawButton( wxDC* dc,
+                             const wxRect& in_rect,
+                             int bitmap_id,
+                             int button_state,
+                             int orientation,
+                             const wxBitmap& bitmap_override,
+                             wxRect* out_rect)
+    {
+        bool found;
+        const char* errmsg = "DrawButton should return a wxRect";
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) {
+            PyObject* odc = wxPyMake_wxObject(dc, false);
+            PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0);
+            PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0);
+            PyObject* ro;
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiiiO)", odc, orect,
+                                                                 bitmap_id, button_state, orientation,
+                                                                 obmp));
+            if (ro) {
+                if (!wxRect_helper(ro, &out_rect)) 
+                    PyErr_SetString(PyExc_TypeError, errmsg);
+                Py_DECREF(ro);
+            }
+
+            Py_DECREF(odc);
+            Py_DECREF(orect);
+            Py_DECREF(obmp);
+        }
+        wxPyEndBlockThreads(blocked);
+        if (!found)
+            wxDefaultTabArt::DrawButton(dc, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect);
+    }
+
+    
+    virtual wxSize GetTabSize( wxDC* dc,
+                               const wxString& caption,
+                               bool active,
+                               int* x_extent)
+    {
+        bool found;
+        wxSize rv, *prv = &rv;
+        const char* errmsg = "GetTabSize should return a sequence containing (size, x_extent)";
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) {
+            PyObject* odc = wxPyMake_wxObject(dc, false);
+            PyObject* otext = wx2PyString(caption);
+            PyObject* ro;
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOi)", odc, otext, (int)active));
+            if (ro) {
+                if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
+                    PyObject* o1 = PySequence_GetItem(ro, 0);
+                    PyObject* o2 = PySequence_GetItem(ro, 1);
+                    if (!wxSize_helper(o1, &prv)) 
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    else if (!PyInt_Check(o2)) 
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    else
+                        *x_extent = PyInt_AsLong(o2);
+                    
+                    Py_DECREF(o1);
+                    Py_DECREF(o2);
+                }
+                else {
+                    PyErr_SetString(PyExc_TypeError, errmsg);
+                }
+                Py_DECREF(ro);
+            }
+
+            Py_DECREF(odc);
+            Py_DECREF(otext);
+        }
+        wxPyEndBlockThreads(blocked);
+        if (!found)
+            rv = wxDefaultTabArt::GetTabSize(dc, caption, active, x_extent);
+        return rv;
+    }
+   
+   
+

     DEC_PYCALLBACK__FONT(SetNormalFont);
     DEC_PYCALLBACK__FONT(SetSelectedFont);
     DEC_PYCALLBACK__FONT(SetMeasuringFont);
     DEC_PYCALLBACK__FONT(SetNormalFont);
     DEC_PYCALLBACK__FONT(SetSelectedFont);
     DEC_PYCALLBACK__FONT(SetMeasuringFont);

+    DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize);

 
     PYPRIVATE;
 };
 
     PYPRIVATE;
 };


@@ -558,7 +645,7 @@ class wxPyTabArt :  public wxDefaultTabArt
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetNormalFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetSelectedFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetMeasuringFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetNormalFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetSelectedFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetMeasuringFont);

-
+IMP_PYCALLBACK_INT_WIN(wxPyTabArt, wxDefaultTabArt, GetBestTabCtrlSize);

 %}
 
 
 %}
 
 

diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py
index c9b4862f13771ab753b2bc40ca4d638e13db6944..d515e093e801b748c59461a6937fea087b014192 100644 (file)
--- a/wxPython/src/gtk/_controls.py
+++ b/wxPython/src/gtk/_controls.py
@@ -3471,6 +3471,10 @@ TOOL_STYLE_SEPARATOR = _controls_.TOOL_STYLE_SEPARATOR
 TOOL_STYLE_CONTROL = _controls_.TOOL_STYLE_CONTROL
 TB_HORIZONTAL = _controls_.TB_HORIZONTAL
 TB_VERTICAL = _controls_.TB_VERTICAL
 TOOL_STYLE_CONTROL = _controls_.TOOL_STYLE_CONTROL
 TB_HORIZONTAL = _controls_.TB_HORIZONTAL
 TB_VERTICAL = _controls_.TB_VERTICAL

+TB_TOP = _controls_.TB_TOP
+TB_LEFT = _controls_.TB_LEFT
+TB_BOTTOM = _controls_.TB_BOTTOM
+TB_RIGHT = _controls_.TB_RIGHT

 TB_3DBUTTONS = _controls_.TB_3DBUTTONS
 TB_FLAT = _controls_.TB_FLAT
 TB_DOCKABLE = _controls_.TB_DOCKABLE
 TB_3DBUTTONS = _controls_.TB_3DBUTTONS
 TB_FLAT = _controls_.TB_FLAT
 TB_DOCKABLE = _controls_.TB_DOCKABLE


@@ -3481,7 +3485,6 @@ TB_NOALIGN = _controls_.TB_NOALIGN
 TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
 TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
 TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS
 TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
 TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
 TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS

-TB_BOTTOM = _controls_.TB_BOTTOM

 class ToolBarToolBase(_core.Object):
     """Proxy of C++ ToolBarToolBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class ToolBarToolBase(_core.Object):
     """Proxy of C++ ToolBarToolBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')

diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp
index 10211935dc4b7a180e0cc2c6f93b9719984c8d76..e15ce0926fcbe4e4a2b05399f3dbba24af223382 100644 (file)
--- a/wxPython/src/gtk/_controls_wrap.cpp
+++ b/wxPython/src/gtk/_controls_wrap.cpp
@@ -49044,6 +49044,10 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TOOL_STYLE_CONTROL",SWIG_From_int(static_cast< int >(wxTOOL_STYLE_CONTROL)));
   SWIG_Python_SetConstant(d, "TB_HORIZONTAL",SWIG_From_int(static_cast< int >(wxTB_HORIZONTAL)));
   SWIG_Python_SetConstant(d, "TB_VERTICAL",SWIG_From_int(static_cast< int >(wxTB_VERTICAL)));
   SWIG_Python_SetConstant(d, "TOOL_STYLE_CONTROL",SWIG_From_int(static_cast< int >(wxTOOL_STYLE_CONTROL)));
   SWIG_Python_SetConstant(d, "TB_HORIZONTAL",SWIG_From_int(static_cast< int >(wxTB_HORIZONTAL)));
   SWIG_Python_SetConstant(d, "TB_VERTICAL",SWIG_From_int(static_cast< int >(wxTB_VERTICAL)));

+  SWIG_Python_SetConstant(d, "TB_TOP",SWIG_From_int(static_cast< int >(wxTB_TOP)));
+  SWIG_Python_SetConstant(d, "TB_LEFT",SWIG_From_int(static_cast< int >(wxTB_LEFT)));
+  SWIG_Python_SetConstant(d, "TB_BOTTOM",SWIG_From_int(static_cast< int >(wxTB_BOTTOM)));
+  SWIG_Python_SetConstant(d, "TB_RIGHT",SWIG_From_int(static_cast< int >(wxTB_RIGHT)));

   SWIG_Python_SetConstant(d, "TB_3DBUTTONS",SWIG_From_int(static_cast< int >(wxTB_3DBUTTONS)));
   SWIG_Python_SetConstant(d, "TB_FLAT",SWIG_From_int(static_cast< int >(wxTB_FLAT)));
   SWIG_Python_SetConstant(d, "TB_DOCKABLE",SWIG_From_int(static_cast< int >(wxTB_DOCKABLE)));
   SWIG_Python_SetConstant(d, "TB_3DBUTTONS",SWIG_From_int(static_cast< int >(wxTB_3DBUTTONS)));
   SWIG_Python_SetConstant(d, "TB_FLAT",SWIG_From_int(static_cast< int >(wxTB_FLAT)));
   SWIG_Python_SetConstant(d, "TB_DOCKABLE",SWIG_From_int(static_cast< int >(wxTB_DOCKABLE)));


@@ -49054,7 +49058,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TB_HORZ_LAYOUT",SWIG_From_int(static_cast< int >(wxTB_HORZ_LAYOUT)));
   SWIG_Python_SetConstant(d, "TB_HORZ_TEXT",SWIG_From_int(static_cast< int >(wxTB_HORZ_TEXT)));
   SWIG_Python_SetConstant(d, "TB_NO_TOOLTIPS",SWIG_From_int(static_cast< int >(wxTB_NO_TOOLTIPS)));
   SWIG_Python_SetConstant(d, "TB_HORZ_LAYOUT",SWIG_From_int(static_cast< int >(wxTB_HORZ_LAYOUT)));
   SWIG_Python_SetConstant(d, "TB_HORZ_TEXT",SWIG_From_int(static_cast< int >(wxTB_HORZ_TEXT)));
   SWIG_Python_SetConstant(d, "TB_NO_TOOLTIPS",SWIG_From_int(static_cast< int >(wxTB_NO_TOOLTIPS)));

-  SWIG_Python_SetConstant(d, "TB_BOTTOM",SWIG_From_int(static_cast< int >(wxTB_BOTTOM)));

   SWIG_addvarlink(SWIG_globals(),(char*)"ListCtrlNameStr",ListCtrlNameStr_get, ListCtrlNameStr_set);
   SWIG_Python_SetConstant(d, "LC_VRULES",SWIG_From_int(static_cast< int >(wxLC_VRULES)));
   SWIG_Python_SetConstant(d, "LC_HRULES",SWIG_From_int(static_cast< int >(wxLC_HRULES)));
   SWIG_addvarlink(SWIG_globals(),(char*)"ListCtrlNameStr",ListCtrlNameStr_get, ListCtrlNameStr_set);
   SWIG_Python_SetConstant(d, "LC_VRULES",SWIG_From_int(static_cast< int >(wxLC_VRULES)));
   SWIG_Python_SetConstant(d, "LC_HRULES",SWIG_From_int(static_cast< int >(wxLC_HRULES)));

diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py
index b4a2481d233b6b1526d8f2cb0a84b301e02bb2bf..d0a2c5e16be9190da54feebf33736d6cf4010548 100644 (file)
--- a/wxPython/src/gtk/_core.py
+++ b/wxPython/src/gtk/_core.py
@@ -708,6 +708,16 @@ class Object(object):
         args[0].this.own(False)
         return _core_.Object_Destroy(*args, **kwargs)
 
         args[0].this.own(False)
         return _core_.Object_Destroy(*args, **kwargs)
 

+    def IsSameAs(*args, **kwargs):
+        """
+        IsSameAs(self, Object p) -> bool
+
+        For wx.Objects that use C++ reference counting internally, this method
+        can be used to determine if two objects are referencing the same data
+        object.
+        """
+        return _core_.Object_IsSameAs(*args, **kwargs)
+

     ClassName = property(GetClassName,doc="See `GetClassName`") 
 _core_.Object_swigregister(Object)
 _wxPySetDictionary = _core_._wxPySetDictionary
     ClassName = property(GetClassName,doc="See `GetClassName`") 
 _core_.Object_swigregister(Object)
 _wxPySetDictionary = _core_._wxPySetDictionary


@@ -734,6 +744,7 @@ BITMAP_TYPE_PICT = _core_.BITMAP_TYPE_PICT
 BITMAP_TYPE_ICON = _core_.BITMAP_TYPE_ICON
 BITMAP_TYPE_ANI = _core_.BITMAP_TYPE_ANI
 BITMAP_TYPE_IFF = _core_.BITMAP_TYPE_IFF
 BITMAP_TYPE_ICON = _core_.BITMAP_TYPE_ICON
 BITMAP_TYPE_ANI = _core_.BITMAP_TYPE_ANI
 BITMAP_TYPE_IFF = _core_.BITMAP_TYPE_IFF

+BITMAP_TYPE_TGA = _core_.BITMAP_TYPE_TGA

 BITMAP_TYPE_MACCURSOR = _core_.BITMAP_TYPE_MACCURSOR
 BITMAP_TYPE_ANY = _core_.BITMAP_TYPE_ANY
 CURSOR_NONE = _core_.CURSOR_NONE
 BITMAP_TYPE_MACCURSOR = _core_.BITMAP_TYPE_MACCURSOR
 BITMAP_TYPE_ANY = _core_.BITMAP_TYPE_ANY
 CURSOR_NONE = _core_.CURSOR_NONE


@@ -8594,18 +8605,11 @@ class Window(EvtHandler):
         """
         return _core_.Window_GetBestFittingSize(*args, **kwargs)
 
         """
         return _core_.Window_GetBestFittingSize(*args, **kwargs)
 

-    def GetAdjustedBestSize(*args, **kwargs):
-        """
-        GetAdjustedBestSize(self) -> Size
-
-        This method is similar to GetBestSize, except in one
-        thing. GetBestSize should return the minimum untruncated size of the
-        window, while this method will return the largest of BestSize and any
-        user specified minimum size. ie. it is the minimum size the window
-        should currently be drawn at, not the minimal size it can possibly
-        tolerate.
-        """
-        return _core_.Window_GetAdjustedBestSize(*args, **kwargs)
+    def GetAdjustedBestSize(self):
+        s = self.GetBestSize()
+        return wx.Size(max(s.width,  self.GetMinWidth()),
+                       max(s.height, self.GetMinHeight()))
+    GetAdjustedBestSize = wx._deprecated(GetAdjustedBestSize, 'Use `GetBestFittingSize` instead.')

 
     def Center(*args, **kwargs):
         """
 
     def Center(*args, **kwargs):
         """

diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp
index 8674c1d9541030d42bee4017717a7c811e347194..a83a61d6b5415d1401744176001e4543f943b719 100644 (file)
--- a/wxPython/src/gtk/_core_wrap.cpp
+++ b/wxPython/src/gtk/_core_wrap.cpp
@@ -4511,6 +4511,50 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_Object_IsSameAs(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxObject *arg1 = (wxObject *) 0 ;
+  wxObject *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 *) "p", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Object_IsSameAs",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxObject, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Object_IsSameAs" "', expected argument " "1"" of type '" "wxObject const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxObject * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxObject,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Object_IsSameAs" "', expected argument " "2"" of type '" "wxObject const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Object_IsSameAs" "', expected argument " "2"" of type '" "wxObject const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxObject * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)((wxObject const *)arg1)->IsSameAs((wxObject 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 *Object_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *Object_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -34631,34 +34675,6 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Window_GetAdjustedBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxWindow *arg1 = (wxWindow *) 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_wxWindow, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetAdjustedBestSize" "', expected argument " "1"" of type '" "wxWindow const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxWindow * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = ((wxWindow const *)arg1)->GetAdjustedBestSize();
-    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_Window_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_Window_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;


@@ -56393,6 +56409,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS, NULL},
         { (char *)"Object_GetClassName", (PyCFunction)_wrap_Object_GetClassName, METH_O, NULL},
         { (char *)"Object_Destroy", (PyCFunction)_wrap_Object_Destroy, METH_O, NULL},
         { (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS, NULL},
         { (char *)"Object_GetClassName", (PyCFunction)_wrap_Object_GetClassName, METH_O, NULL},
         { (char *)"Object_Destroy", (PyCFunction)_wrap_Object_Destroy, METH_O, NULL},

+        { (char *)"Object_IsSameAs", (PyCFunction) _wrap_Object_IsSameAs, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"Object_swigregister", Object_swigregister, METH_VARARGS, NULL},
         { (char *)"Size_width_set", _wrap_Size_width_set, METH_VARARGS, NULL},
         { (char *)"Size_width_get", (PyCFunction)_wrap_Size_width_get, METH_O, NULL},
         { (char *)"Object_swigregister", Object_swigregister, METH_VARARGS, NULL},
         { (char *)"Size_width_set", _wrap_Size_width_set, METH_VARARGS, NULL},
         { (char *)"Size_width_get", (PyCFunction)_wrap_Size_width_get, METH_O, NULL},


@@ -57366,7 +57383,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Window_InvalidateBestSize", (PyCFunction)_wrap_Window_InvalidateBestSize, METH_O, NULL},
         { (char *)"Window_CacheBestSize", (PyCFunction) _wrap_Window_CacheBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_GetBestFittingSize", (PyCFunction)_wrap_Window_GetBestFittingSize, METH_O, NULL},
         { (char *)"Window_InvalidateBestSize", (PyCFunction)_wrap_Window_InvalidateBestSize, METH_O, NULL},
         { (char *)"Window_CacheBestSize", (PyCFunction) _wrap_Window_CacheBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_GetBestFittingSize", (PyCFunction)_wrap_Window_GetBestFittingSize, METH_O, NULL},

-        { (char *)"Window_GetAdjustedBestSize", (PyCFunction)_wrap_Window_GetAdjustedBestSize, METH_O, NULL},

         { (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_Fit", (PyCFunction)_wrap_Window_Fit, METH_O, NULL},
         { (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_Fit", (PyCFunction)_wrap_Window_Fit, METH_O, NULL},


@@ -60152,6 +60168,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ICON",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ICON)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANI",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANI)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_IFF",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_IFF)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ICON",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ICON)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANI",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANI)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_IFF",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_IFF)));

+  SWIG_Python_SetConstant(d, "BITMAP_TYPE_TGA",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_TGA)));

   SWIG_Python_SetConstant(d, "BITMAP_TYPE_MACCURSOR",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_MACCURSOR)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANY",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANY)));
   SWIG_Python_SetConstant(d, "CURSOR_NONE",SWIG_From_int(static_cast< int >(wxCURSOR_NONE)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_MACCURSOR",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_MACCURSOR)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANY",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANY)));
   SWIG_Python_SetConstant(d, "CURSOR_NONE",SWIG_From_int(static_cast< int >(wxCURSOR_NONE)));

diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py
index 046d5e1c118354a57b4192fde50c1d3134f49cbf..76d9f151ea50f034cf6d7050799214251522df8b 100644 (file)
--- a/wxPython/src/gtk/_gdi.py
+++ b/wxPython/src/gtk/_gdi.py
@@ -668,6 +668,24 @@ class Bitmap(GDIObject):
         """
         return _gdi_.Bitmap_SetSize(*args, **kwargs)
 
         """
         return _gdi_.Bitmap_SetSize(*args, **kwargs)
 

+    def CopyFromBuffer(*args, **kwargs):
+        """
+        CopyFromBuffer(self, buffer data)
+
+        Copy data from a RGB buffer object to replace the bitmap pixel data.
+        See `wxBitmapFromBuffer` for more .
+        """
+        return _gdi_.Bitmap_CopyFromBuffer(*args, **kwargs)
+
+    def CopyFromBufferRGBA(*args, **kwargs):
+        """
+        CopyFromBufferRGBA(self, buffer data)
+
+        Copy data from a RGBA buffer object to replace the bitmap pixel data.
+        See `wxBitmapFromBufferRGBA` for more .
+        """
+        return _gdi_.Bitmap_CopyFromBufferRGBA(*args, **kwargs)
+

     def __nonzero__(self): return self.IsOk() 
     def __eq__(*args, **kwargs):
         """__eq__(self, Bitmap other) -> bool"""
     def __nonzero__(self): return self.IsOk() 
     def __eq__(*args, **kwargs):
         """__eq__(self, Bitmap other) -> bool"""


@@ -3367,6 +3385,10 @@ class DC(_core.Object):
         """
         return _gdi_.DC_BlitPointSize(*args, **kwargs)
 
         """
         return _gdi_.DC_BlitPointSize(*args, **kwargs)
 

+    def GetAsBitmap(*args, **kwargs):
+        """GetAsBitmap(self, Rect subrect=None) -> Bitmap"""
+        return _gdi_.DC_GetAsBitmap(*args, **kwargs)
+

     def SetClippingRegion(*args, **kwargs):
         """
         SetClippingRegion(self, int x, int y, int width, int height)
     def SetClippingRegion(*args, **kwargs):
         """
         SetClippingRegion(self, int x, int y, int width, int height)


@@ -4511,6 +4533,10 @@ class MemoryDC(DC):
         """
         return _gdi_.MemoryDC_SelectObject(*args, **kwargs)
 
         """
         return _gdi_.MemoryDC_SelectObject(*args, **kwargs)
 

+    def SelectObjectAsSource(*args, **kwargs):
+        """SelectObjectAsSource(self, Bitmap bmp)"""
+        return _gdi_.MemoryDC_SelectObjectAsSource(*args, **kwargs)
+

 _gdi_.MemoryDC_swigregister(MemoryDC)
 
 def MemoryDCFromDC(*args, **kwargs):
 _gdi_.MemoryDC_swigregister(MemoryDC)
 
 def MemoryDCFromDC(*args, **kwargs):


@@ -4966,8 +4992,10 @@ _gdi_.GraphicsFont_swigregister(GraphicsFont)
 class GraphicsMatrix(GraphicsObject):
     """Proxy of C++ GraphicsMatrix class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class GraphicsMatrix(GraphicsObject):
     """Proxy of C++ GraphicsMatrix class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')

-    def __init__(self): raise AttributeError, "No constructor defined"

     __repr__ = _swig_repr
     __repr__ = _swig_repr

+    def __init__(self, *args, **kwargs): 
+        """__init__(self) -> GraphicsMatrix"""
+        _gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs))

     __swig_destroy__ = _gdi_.delete_GraphicsMatrix
     __del__ = lambda self : None;
     def Concat(*args, **kwargs):
     __swig_destroy__ = _gdi_.delete_GraphicsMatrix
     __del__ = lambda self : None;
     def Concat(*args, **kwargs):


@@ -5072,8 +5100,10 @@ _gdi_.GraphicsMatrix_swigregister(GraphicsMatrix)
 class GraphicsPath(GraphicsObject):
     """Proxy of C++ GraphicsPath class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class GraphicsPath(GraphicsObject):
     """Proxy of C++ GraphicsPath class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')

-    def __init__(self): raise AttributeError, "No constructor defined"

     __repr__ = _swig_repr
     __repr__ = _swig_repr

+    def __init__(self, *args, **kwargs): 
+        """__init__(self) -> GraphicsPath"""
+        _gdi_.GraphicsPath_swiginit(self,_gdi_.new_GraphicsPath(*args, **kwargs))

     __swig_destroy__ = _gdi_.delete_GraphicsPath
     __del__ = lambda self : None;
     def MoveToPoint(*args):
     __swig_destroy__ = _gdi_.delete_GraphicsPath
     __del__ = lambda self : None;
     def MoveToPoint(*args):

diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp
index a59a42b386aaee3fee8378aae00e4246444780eb..27ad0c1f1a0ba6725d30a80789f4e4d8bdcc56cb 100644 (file)
--- a/wxPython/src/gtk/_gdi_wrap.cpp
+++ b/wxPython/src/gtk/_gdi_wrap.cpp
@@ -2926,6 +2926,18 @@ SWIGINTERN bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*s
 #include <wx/rawbmp.h>
 
 
 #include <wx/rawbmp.h>
 
 

+// 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
+
+

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


@@ -2976,20 +2988,67 @@ SWIGINTERN void wxBitmap_SetSize(wxBitmap *self,wxSize const &size){
             self->SetWidth(size.x);
             self->SetHeight(size.y);
         }
             self->SetWidth(size.x);
             self->SetHeight(size.y);
         }

-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 void wxBitmap_CopyFromBuffer(wxBitmap *self,buffer data,int DATASIZE){
+            int height=self->GetHeight();
+            int width=self->GetWidth();

 
 

-// 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
+            if (DATASIZE != width * height * 3) {
+                wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
+            }
+            wxNativePixelData pixData(*self, wxPoint(0,0), wxSize(width, height));
+            if (! pixData) {
+                // raise an exception...
+                wxPyErr_SetString(PyExc_RuntimeError,
+                                  "Failed to gain raw access to bitmap data.");
+                return;
+            }

 
 

+            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);
+            }
+        }
+SWIGINTERN void wxBitmap_CopyFromBufferRGBA(wxBitmap *self,buffer data,int DATASIZE){
+            int height=self->GetHeight();
+            int width=self->GetWidth();
+            
+            if (DATASIZE != width * height * 4) {
+                wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
+            }
+            wxAlphaPixelData pixData(*self, wxPoint(0,0), wxSize(width, height));
+            if (! pixData) {
+                // raise an exception...
+                wxPyErr_SetString(PyExc_RuntimeError,
+                                  "Failed to gain raw access to bitmap data.");
+                return;
+            }
+
+            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);
+            }
+        }
+SWIGINTERN bool wxBitmap___eq__(wxBitmap *self,wxBitmap const *other){ return other ? self->IsSameAs(*other) : false; }
+SWIGINTERN bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? !self->IsSameAs(*other) : true;  }

 
     wxBitmap* _BitmapFromBufferAlpha(int width, int height,
                                     buffer data, int DATASIZE,
 
     wxBitmap* _BitmapFromBufferAlpha(int width, int height,
                                     buffer data, int DATASIZE,


@@ -6892,6 +6951,76 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_Bitmap_CopyFromBuffer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxBitmap *arg1 = (wxBitmap *) 0 ;
+  buffer arg2 ;
+  int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  Py_ssize_t temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "data", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_CopyFromBuffer",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 '" "Bitmap_CopyFromBuffer" "', expected argument " "1"" of type '" "wxBitmap *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  {
+    if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail;
+    arg3 = (int)temp2;
+  }
+  {
+    wxBitmap_CopyFromBuffer(arg1,arg2,arg3);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Bitmap_CopyFromBufferRGBA(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxBitmap *arg1 = (wxBitmap *) 0 ;
+  buffer arg2 ;
+  int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  Py_ssize_t temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "data", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_CopyFromBufferRGBA",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 '" "Bitmap_CopyFromBufferRGBA" "', expected argument " "1"" of type '" "wxBitmap *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  {
+    if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail;
+    arg3 = (int)temp2;
+  }
+  {
+    wxBitmap_CopyFromBufferRGBA(arg1,arg2,arg3);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_Bitmap___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBitmap *arg1 = (wxBitmap *) 0 ;
 SWIGINTERN PyObject *_wrap_Bitmap___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBitmap *arg1 = (wxBitmap *) 0 ;


@@ -19677,6 +19806,47 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_DC_GetAsBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxDC *arg1 = (wxDC *) 0 ;
+  wxRect *arg2 = (wxRect *) NULL ;
+  SwigValueWrapper<wxBitmap > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "subrect", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DC_GetAsBitmap",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_GetAsBitmap" "', expected argument " "1"" of type '" "wxDC const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDC * >(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 '" "DC_GetAsBitmap" "', expected argument " "2"" of type '" "wxRect const *""'"); 
+    }
+    arg2 = reinterpret_cast< wxRect * >(argp2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxDC const *)arg1)->GetAsBitmap((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 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_DC_SetClippingRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;
 SWIGINTERN PyObject *_wrap_DC_SetClippingRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;


@@ -23745,7 +23915,7 @@ SWIGINTERN PyObject *DCClipper_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
 
 SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
 
 SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;

-  wxBitmap const &arg1_defvalue = wxNullBitmap ;
+  wxBitmap &arg1_defvalue = wxNullBitmap ;

   wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ;
   wxMemoryDC *result = 0 ;
   void *argp1 = 0 ;
   wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ;
   wxMemoryDC *result = 0 ;
   void *argp1 = 0 ;


@@ -23757,19 +23927,19 @@ SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail;
   if (obj0) {
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail;
   if (obj0) {

-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0  | 0);
+    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0 );

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

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

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

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

     }
     arg1 = reinterpret_cast< wxBitmap * >(argp1);
   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     arg1 = reinterpret_cast< wxBitmap * >(argp1);
   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxMemoryDC *)new wxMemoryDC((wxBitmap const &)*arg1);
+    result = (wxMemoryDC *)new wxMemoryDC(*arg1);

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


@@ -23831,17 +24001,58 @@ SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); 
   }
   arg1 = reinterpret_cast< wxMemoryDC * >(argp1);
     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 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SelectObject(*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_MemoryDC_SelectObjectAsSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxMemoryDC *arg1 = (wxMemoryDC *) 0 ;
+  wxBitmap *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 *) "bmp", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObjectAsSource",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObjectAsSource" "', 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)) {
   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(res2), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 

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

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

   }
   arg2 = reinterpret_cast< wxBitmap * >(argp2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg2 = reinterpret_cast< wxBitmap * >(argp2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SelectObject((wxBitmap const &)*arg2);
+    (arg1)->SelectObjectAsSource((wxBitmap const &)*arg2);

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


@@ -25151,6 +25362,22 @@ SWIGINTERN PyObject *GraphicsFont_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObj
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

+SWIGINTERN PyObject *_wrap_new_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGraphicsMatrix *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_GraphicsMatrix",0,0,0)) SWIG_fail;
+  {
+    result = (wxGraphicsMatrix *)new wxGraphicsMatrix();
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsMatrix, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_delete_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ;
 SWIGINTERN PyObject *_wrap_delete_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ;


@@ -25736,6 +25963,29 @@ SWIGINTERN PyObject *GraphicsMatrix_swigregister(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

+SWIGINTERN PyObject *GraphicsMatrix_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGraphicsPath *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_GraphicsPath",0,0,0)) SWIG_fail;
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxGraphicsPath *)new wxGraphicsPath();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsPath, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_delete_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
 SWIGINTERN PyObject *_wrap_delete_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;


@@ -26962,6 +27212,10 @@ SWIGINTERN PyObject *GraphicsPath_swigregister(PyObject *SWIGUNUSEDPARM(self), P
   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

+SWIGINTERN PyObject *GraphicsPath_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+

 SWIGINTERN int NullGraphicsPen_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NullGraphicsPen is read-only.");
   return 1;
 SWIGINTERN int NullGraphicsPen_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NullGraphicsPen is read-only.");
   return 1;


@@ -37923,6 +38177,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Bitmap_SetWidth", (PyCFunction) _wrap_Bitmap_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetSize", (PyCFunction) _wrap_Bitmap_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetWidth", (PyCFunction) _wrap_Bitmap_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetSize", (PyCFunction) _wrap_Bitmap_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"Bitmap_CopyFromBuffer", (PyCFunction) _wrap_Bitmap_CopyFromBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Bitmap_CopyFromBufferRGBA", (PyCFunction) _wrap_Bitmap_CopyFromBufferRGBA, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS, NULL},
         { (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS, NULL},


@@ -38265,6 +38521,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DC_DrawRotatedTextPoint", (PyCFunction) _wrap_DC_DrawRotatedTextPoint, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_Blit", (PyCFunction) _wrap_DC_Blit, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_BlitPointSize", (PyCFunction) _wrap_DC_BlitPointSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_DrawRotatedTextPoint", (PyCFunction) _wrap_DC_DrawRotatedTextPoint, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_Blit", (PyCFunction) _wrap_DC_Blit, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_BlitPointSize", (PyCFunction) _wrap_DC_BlitPointSize, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"DC_GetAsBitmap", (PyCFunction) _wrap_DC_GetAsBitmap, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -38374,6 +38631,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"MemoryDC_SelectObjectAsSource", (PyCFunction) _wrap_MemoryDC_SelectObjectAsSource, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL},
         { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL},
         { (char *)"new_ScreenDC", (PyCFunction)_wrap_new_ScreenDC, METH_NOARGS, NULL},
         { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL},
         { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL},
         { (char *)"new_ScreenDC", (PyCFunction)_wrap_new_ScreenDC, METH_NOARGS, NULL},


@@ -38440,6 +38698,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"delete_GraphicsFont", (PyCFunction)_wrap_delete_GraphicsFont, METH_O, NULL},
         { (char *)"GraphicsFont_swigregister", GraphicsFont_swigregister, METH_VARARGS, NULL},
         { (char *)"GraphicsFont_swiginit", GraphicsFont_swiginit, METH_VARARGS, NULL},
         { (char *)"delete_GraphicsFont", (PyCFunction)_wrap_delete_GraphicsFont, METH_O, NULL},
         { (char *)"GraphicsFont_swigregister", GraphicsFont_swigregister, METH_VARARGS, NULL},
         { (char *)"GraphicsFont_swiginit", GraphicsFont_swiginit, METH_VARARGS, NULL},

+        { (char *)"new_GraphicsMatrix", (PyCFunction)_wrap_new_GraphicsMatrix, METH_NOARGS, NULL},

         { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL},
         { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GraphicsMatrix_Copy", (PyCFunction) _wrap_GraphicsMatrix_Copy, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL},
         { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GraphicsMatrix_Copy", (PyCFunction) _wrap_GraphicsMatrix_Copy, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -38454,6 +38713,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GraphicsMatrix_TransformDistance", (PyCFunction) _wrap_GraphicsMatrix_TransformDistance, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GraphicsMatrix_GetNativeMatrix", (PyCFunction)_wrap_GraphicsMatrix_GetNativeMatrix, METH_O, NULL},
         { (char *)"GraphicsMatrix_swigregister", GraphicsMatrix_swigregister, METH_VARARGS, NULL},
         { (char *)"GraphicsMatrix_TransformDistance", (PyCFunction) _wrap_GraphicsMatrix_TransformDistance, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GraphicsMatrix_GetNativeMatrix", (PyCFunction)_wrap_GraphicsMatrix_GetNativeMatrix, METH_O, NULL},
         { (char *)"GraphicsMatrix_swigregister", GraphicsMatrix_swigregister, METH_VARARGS, NULL},

+        { (char *)"GraphicsMatrix_swiginit", GraphicsMatrix_swiginit, METH_VARARGS, NULL},
+        { (char *)"new_GraphicsPath", (PyCFunction)_wrap_new_GraphicsPath, METH_NOARGS, NULL},

         { (char *)"delete_GraphicsPath", (PyCFunction)_wrap_delete_GraphicsPath, METH_O, NULL},
         { (char *)"GraphicsPath_MoveToPoint", _wrap_GraphicsPath_MoveToPoint, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_AddLineToPoint", _wrap_GraphicsPath_AddLineToPoint, METH_VARARGS, NULL},
         { (char *)"delete_GraphicsPath", (PyCFunction)_wrap_delete_GraphicsPath, METH_O, NULL},
         { (char *)"GraphicsPath_MoveToPoint", _wrap_GraphicsPath_MoveToPoint, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_AddLineToPoint", _wrap_GraphicsPath_AddLineToPoint, METH_VARARGS, NULL},


@@ -38474,6 +38735,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GraphicsPath_GetBox", (PyCFunction)_wrap_GraphicsPath_GetBox, METH_O, NULL},
         { (char *)"GraphicsPath_Contains", _wrap_GraphicsPath_Contains, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_GetBox", (PyCFunction)_wrap_GraphicsPath_GetBox, METH_O, NULL},
         { (char *)"GraphicsPath_Contains", _wrap_GraphicsPath_Contains, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL},

+        { (char *)"GraphicsPath_swiginit", GraphicsPath_swiginit, METH_VARARGS, NULL},

         { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL},
         { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL},
         { (char *)"GraphicsContext_CreateFromNative", (PyCFunction) _wrap_GraphicsContext_CreateFromNative, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL},
         { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL},
         { (char *)"GraphicsContext_CreateFromNative", (PyCFunction) _wrap_GraphicsContext_CreateFromNative, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py
index a0c4f637e8470b3096fe8efe4556d56b39308ad2..0998a0a962efa830e15df2240656ab339c271e3f 100644 (file)
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -1886,6 +1886,16 @@ class Process(_core.EvtHandler):
         _misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))
         self._setCallbackInfo(self, Process)
 
         _misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))
         self._setCallbackInfo(self, Process)
 

+    __swig_destroy__ = _misc_.delete_Process
+    __del__ = lambda self : None;
+    def GetPid(*args, **kwargs):
+        """
+        GetPid(self) -> long
+
+        get the process ID of the process executed by Open()
+        """
+        return _misc_.Process_GetPid(*args, **kwargs)
+

     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.Process__setCallbackInfo(*args, **kwargs)
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.Process__setCallbackInfo(*args, **kwargs)


@@ -3369,6 +3379,7 @@ class DateTime(object):
     GMT10 = _misc_.DateTime_GMT10
     GMT11 = _misc_.DateTime_GMT11
     GMT12 = _misc_.DateTime_GMT12
     GMT10 = _misc_.DateTime_GMT10
     GMT11 = _misc_.DateTime_GMT11
     GMT12 = _misc_.DateTime_GMT12

+    GMT13 = _misc_.DateTime_GMT13

     WET = _misc_.DateTime_WET
     WEST = _misc_.DateTime_WEST
     CET = _misc_.DateTime_CET
     WET = _misc_.DateTime_WET
     WEST = _misc_.DateTime_WEST
     CET = _misc_.DateTime_CET


@@ -3394,6 +3405,8 @@ class DateTime(object):
     A_CST = _misc_.DateTime_A_CST
     A_EST = _misc_.DateTime_A_EST
     A_ESST = _misc_.DateTime_A_ESST
     A_CST = _misc_.DateTime_A_CST
     A_EST = _misc_.DateTime_A_EST
     A_ESST = _misc_.DateTime_A_ESST

+    NZST = _misc_.DateTime_NZST
+    NZDT = _misc_.DateTime_NZDT

     UTC = _misc_.DateTime_UTC
     Gregorian = _misc_.DateTime_Gregorian
     Julian = _misc_.DateTime_Julian
     UTC = _misc_.DateTime_UTC
     Gregorian = _misc_.DateTime_Gregorian
     Julian = _misc_.DateTime_Julian

diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp
index f8e050d97b44023377bd2164eb6ad05ed08916df..04a478861c03e82af76aafa33af7176e3558071a 100644 (file)
--- a/wxPython/src/gtk/_misc_wrap.cpp
+++ b/wxPython/src/gtk/_misc_wrap.cpp
@@ -14415,6 +14415,62 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_delete_Process(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyProcess *arg1 = (wxPyProcess *) 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_wxPyProcess, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Process" "', expected argument " "1"" of type '" "wxPyProcess *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyProcess * >(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_Process_GetPid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyProcess *arg1 = (wxPyProcess *) 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_wxPyProcess, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Process_GetPid" "', expected argument " "1"" of type '" "wxPyProcess const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyProcess * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (long)((wxPyProcess const *)arg1)->GetPid();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_long(static_cast< long >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_Process__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPyProcess *arg1 = (wxPyProcess *) 0 ;
 SWIGINTERN PyObject *_wrap_Process__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPyProcess *arg1 = (wxPyProcess *) 0 ;


@@ -39366,6 +39422,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Process_Exists", (PyCFunction) _wrap_Process_Exists, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Open", (PyCFunction) _wrap_Process_Open, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_Process", (PyCFunction) _wrap_new_Process, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Exists", (PyCFunction) _wrap_Process_Exists, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Open", (PyCFunction) _wrap_Process_Open, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_Process", (PyCFunction) _wrap_new_Process, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"delete_Process", (PyCFunction)_wrap_delete_Process, METH_O, NULL},
+        { (char *)"Process_GetPid", (PyCFunction)_wrap_Process_GetPid, METH_O, NULL},

         { (char *)"Process__setCallbackInfo", (PyCFunction) _wrap_Process__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_OnTerminate", (PyCFunction) _wrap_Process_OnTerminate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Redirect", (PyCFunction)_wrap_Process_Redirect, METH_O, NULL},
         { (char *)"Process__setCallbackInfo", (PyCFunction) _wrap_Process__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_OnTerminate", (PyCFunction) _wrap_Process_OnTerminate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Redirect", (PyCFunction)_wrap_Process_Redirect, METH_O, NULL},


@@ -42096,6 +42154,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "DateTime_GMT10",SWIG_From_int(static_cast< int >(wxDateTime::GMT10)));
   SWIG_Python_SetConstant(d, "DateTime_GMT11",SWIG_From_int(static_cast< int >(wxDateTime::GMT11)));
   SWIG_Python_SetConstant(d, "DateTime_GMT12",SWIG_From_int(static_cast< int >(wxDateTime::GMT12)));
   SWIG_Python_SetConstant(d, "DateTime_GMT10",SWIG_From_int(static_cast< int >(wxDateTime::GMT10)));
   SWIG_Python_SetConstant(d, "DateTime_GMT11",SWIG_From_int(static_cast< int >(wxDateTime::GMT11)));
   SWIG_Python_SetConstant(d, "DateTime_GMT12",SWIG_From_int(static_cast< int >(wxDateTime::GMT12)));

+  SWIG_Python_SetConstant(d, "DateTime_GMT13",SWIG_From_int(static_cast< int >(wxDateTime::GMT13)));

   SWIG_Python_SetConstant(d, "DateTime_WET",SWIG_From_int(static_cast< int >(wxDateTime::WET)));
   SWIG_Python_SetConstant(d, "DateTime_WEST",SWIG_From_int(static_cast< int >(wxDateTime::WEST)));
   SWIG_Python_SetConstant(d, "DateTime_CET",SWIG_From_int(static_cast< int >(wxDateTime::CET)));
   SWIG_Python_SetConstant(d, "DateTime_WET",SWIG_From_int(static_cast< int >(wxDateTime::WET)));
   SWIG_Python_SetConstant(d, "DateTime_WEST",SWIG_From_int(static_cast< int >(wxDateTime::WEST)));
   SWIG_Python_SetConstant(d, "DateTime_CET",SWIG_From_int(static_cast< int >(wxDateTime::CET)));


@@ -42121,6 +42180,8 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "DateTime_A_CST",SWIG_From_int(static_cast< int >(wxDateTime::A_CST)));
   SWIG_Python_SetConstant(d, "DateTime_A_EST",SWIG_From_int(static_cast< int >(wxDateTime::A_EST)));
   SWIG_Python_SetConstant(d, "DateTime_A_ESST",SWIG_From_int(static_cast< int >(wxDateTime::A_ESST)));
   SWIG_Python_SetConstant(d, "DateTime_A_CST",SWIG_From_int(static_cast< int >(wxDateTime::A_CST)));
   SWIG_Python_SetConstant(d, "DateTime_A_EST",SWIG_From_int(static_cast< int >(wxDateTime::A_EST)));
   SWIG_Python_SetConstant(d, "DateTime_A_ESST",SWIG_From_int(static_cast< int >(wxDateTime::A_ESST)));

+  SWIG_Python_SetConstant(d, "DateTime_NZST",SWIG_From_int(static_cast< int >(wxDateTime::NZST)));
+  SWIG_Python_SetConstant(d, "DateTime_NZDT",SWIG_From_int(static_cast< int >(wxDateTime::NZDT)));

   SWIG_Python_SetConstant(d, "DateTime_UTC",SWIG_From_int(static_cast< int >(wxDateTime::UTC)));
   SWIG_Python_SetConstant(d, "DateTime_Gregorian",SWIG_From_int(static_cast< int >(wxDateTime::Gregorian)));
   SWIG_Python_SetConstant(d, "DateTime_Julian",SWIG_From_int(static_cast< int >(wxDateTime::Julian)));
   SWIG_Python_SetConstant(d, "DateTime_UTC",SWIG_From_int(static_cast< int >(wxDateTime::UTC)));
   SWIG_Python_SetConstant(d, "DateTime_Gregorian",SWIG_From_int(static_cast< int >(wxDateTime::Gregorian)));
   SWIG_Python_SetConstant(d, "DateTime_Julian",SWIG_From_int(static_cast< int >(wxDateTime::Julian)));

diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py
index c4fbfef8ddefb6d3d41e2c5788a48414947277bc..fc2283fabe0d541ceb6c6086a92444bf35922931 100644 (file)
--- a/wxPython/src/gtk/_windows.py
+++ b/wxPython/src/gtk/_windows.py
@@ -3895,6 +3895,10 @@ class PrintData(_core.Object):
         """GetPrintMode(self) -> int"""
         return _windows_.PrintData_GetPrintMode(*args, **kwargs)
 
         """GetPrintMode(self) -> int"""
         return _windows_.PrintData_GetPrintMode(*args, **kwargs)
 

+    def GetMedia(*args, **kwargs):
+        """GetMedia(self) -> int"""
+        return _windows_.PrintData_GetMedia(*args, **kwargs)
+

     def SetNoCopies(*args, **kwargs):
         """SetNoCopies(self, int v)"""
         return _windows_.PrintData_SetNoCopies(*args, **kwargs)
     def SetNoCopies(*args, **kwargs):
         """SetNoCopies(self, int v)"""
         return _windows_.PrintData_SetNoCopies(*args, **kwargs)


@@ -3939,6 +3943,10 @@ class PrintData(_core.Object):
         """SetPrintMode(self, int printMode)"""
         return _windows_.PrintData_SetPrintMode(*args, **kwargs)
 
         """SetPrintMode(self, int printMode)"""
         return _windows_.PrintData_SetPrintMode(*args, **kwargs)
 

+    def SetMedia(*args, **kwargs):
+        """SetMedia(self, int media)"""
+        return _windows_.PrintData_SetMedia(*args, **kwargs)
+

     def GetFilename(*args, **kwargs):
         """GetFilename(self) -> String"""
         return _windows_.PrintData_GetFilename(*args, **kwargs)
     def GetFilename(*args, **kwargs):
         """GetFilename(self) -> String"""
         return _windows_.PrintData_GetFilename(*args, **kwargs)

diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp
index 997ed18fe75a0e4fa05f1188001cb8a9dcfa6746..65036bcb39563428e4482d3084aad4755c677a35 100644 (file)
--- a/wxPython/src/gtk/_windows_wrap.cpp
+++ b/wxPython/src/gtk/_windows_wrap.cpp
@@ -24073,6 +24073,34 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_PrintData_GetMedia(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPrintData *arg1 = (wxPrintData *) 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_wxPrintData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetMedia" "', expected argument " "1"" of type '" "wxPrintData const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxPrintData const *)arg1)->GetMedia();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_PrintData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
 SWIGINTERN PyObject *_wrap_PrintData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;


@@ -24496,6 +24524,44 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_PrintData_SetMedia(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPrintData *arg1 = (wxPrintData *) 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 *) "media", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetMedia",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetMedia" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetMedia" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetMedia(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_PrintData_GetFilename(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
 SWIGINTERN PyObject *_wrap_PrintData_GetFilename(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;


@@ -31978,6 +32044,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PrintData_GetQuality", (PyCFunction)_wrap_PrintData_GetQuality, METH_O, NULL},
         { (char *)"PrintData_GetBin", (PyCFunction)_wrap_PrintData_GetBin, METH_O, NULL},
         { (char *)"PrintData_GetPrintMode", (PyCFunction)_wrap_PrintData_GetPrintMode, METH_O, NULL},
         { (char *)"PrintData_GetQuality", (PyCFunction)_wrap_PrintData_GetQuality, METH_O, NULL},
         { (char *)"PrintData_GetBin", (PyCFunction)_wrap_PrintData_GetBin, METH_O, NULL},
         { (char *)"PrintData_GetPrintMode", (PyCFunction)_wrap_PrintData_GetPrintMode, METH_O, NULL},

+        { (char *)"PrintData_GetMedia", (PyCFunction)_wrap_PrintData_GetMedia, METH_O, NULL},

         { (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -31989,6 +32056,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetBin", (PyCFunction) _wrap_PrintData_SetBin, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetBin", (PyCFunction) _wrap_PrintData_SetBin, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"PrintData_SetMedia", (PyCFunction) _wrap_PrintData_SetMedia, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"PrintData_GetFilename", (PyCFunction)_wrap_PrintData_GetFilename, METH_O, NULL},
         { (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_GetPrivData", (PyCFunction)_wrap_PrintData_GetPrivData, METH_O, NULL},
         { (char *)"PrintData_GetFilename", (PyCFunction)_wrap_PrintData_GetFilename, METH_O, NULL},
         { (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_GetPrivData", (PyCFunction)_wrap_PrintData_GetPrivData, METH_O, NULL},

diff --git a/wxPython/src/gtk/aui.py b/wxPython/src/gtk/aui.py
index 4336192ba129a40929c4f594f777719e2b3f2bd7..8409a53e2adbf4792992d6b373de4b69bd1e06f2 100644 (file)
--- a/wxPython/src/gtk/aui.py
+++ b/wxPython/src/gtk/aui.py
@@ -194,6 +194,20 @@ AUI_GRADIENT_HORIZONTAL = _aui.AUI_GRADIENT_HORIZONTAL
 AUI_BUTTON_STATE_NORMAL = _aui.AUI_BUTTON_STATE_NORMAL
 AUI_BUTTON_STATE_HOVER = _aui.AUI_BUTTON_STATE_HOVER
 AUI_BUTTON_STATE_PRESSED = _aui.AUI_BUTTON_STATE_PRESSED
 AUI_BUTTON_STATE_NORMAL = _aui.AUI_BUTTON_STATE_NORMAL
 AUI_BUTTON_STATE_HOVER = _aui.AUI_BUTTON_STATE_HOVER
 AUI_BUTTON_STATE_PRESSED = _aui.AUI_BUTTON_STATE_PRESSED

+AUI_BUTTON_STATE_DISABLED = _aui.AUI_BUTTON_STATE_DISABLED
+AUI_BUTTON_STATE_HIDDEN = _aui.AUI_BUTTON_STATE_HIDDEN
+AUI_BUTTON_CLOSE = _aui.AUI_BUTTON_CLOSE
+AUI_BUTTON_MAXIMIZE = _aui.AUI_BUTTON_MAXIMIZE
+AUI_BUTTON_MINIMIZE = _aui.AUI_BUTTON_MINIMIZE
+AUI_BUTTON_PIN = _aui.AUI_BUTTON_PIN
+AUI_BUTTON_OPTIONS = _aui.AUI_BUTTON_OPTIONS
+AUI_BUTTON_LEFT = _aui.AUI_BUTTON_LEFT
+AUI_BUTTON_RIGHT = _aui.AUI_BUTTON_RIGHT
+AUI_BUTTON_UP = _aui.AUI_BUTTON_UP
+AUI_BUTTON_DOWN = _aui.AUI_BUTTON_DOWN
+AUI_BUTTON_CUSTOM1 = _aui.AUI_BUTTON_CUSTOM1
+AUI_BUTTON_CUSTOM2 = _aui.AUI_BUTTON_CUSTOM2
+AUI_BUTTON_CUSTOM3 = _aui.AUI_BUTTON_CUSTOM3

 AUI_INSERT_PANE = _aui.AUI_INSERT_PANE
 AUI_INSERT_ROW = _aui.AUI_INSERT_ROW
 AUI_INSERT_DOCK = _aui.AUI_INSERT_DOCK
 AUI_INSERT_PANE = _aui.AUI_INSERT_PANE
 AUI_INSERT_ROW = _aui.AUI_INSERT_ROW
 AUI_INSERT_DOCK = _aui.AUI_INSERT_DOCK


@@ -1442,6 +1456,18 @@ class TabArt(object):
     __repr__ = _swig_repr
     __swig_destroy__ = _aui.delete_TabArt
     __del__ = lambda self : None;
     __repr__ = _swig_repr
     __swig_destroy__ = _aui.delete_TabArt
     __del__ = lambda self : None;

+    def SetNormalFont(*args, **kwargs):
+        """SetNormalFont(self, Font font)"""
+        return _aui.TabArt_SetNormalFont(*args, **kwargs)
+
+    def SetSelectedFont(*args, **kwargs):
+        """SetSelectedFont(self, Font font)"""
+        return _aui.TabArt_SetSelectedFont(*args, **kwargs)
+
+    def SetMeasuringFont(*args, **kwargs):
+        """SetMeasuringFont(self, Font font)"""
+        return _aui.TabArt_SetMeasuringFont(*args, **kwargs)
+

     def DrawBackground(*args, **kwargs):
         """DrawBackground(self, DC dc, Rect rect)"""
         return _aui.TabArt_DrawBackground(*args, **kwargs)
     def DrawBackground(*args, **kwargs):
         """DrawBackground(self, DC dc, Rect rect)"""
         return _aui.TabArt_DrawBackground(*args, **kwargs)


@@ -1453,17 +1479,20 @@ class TabArt(object):
         """
         return _aui.TabArt_DrawTab(*args, **kwargs)
 
         """
         return _aui.TabArt_DrawTab(*args, **kwargs)
 

-    def SetNormalFont(*args, **kwargs):
-        """SetNormalFont(self, Font font)"""
-        return _aui.TabArt_SetNormalFont(*args, **kwargs)
+    def DrawButton(*args, **kwargs):
+        """
+        DrawButton(self, DC dc, Rect in_rect, int bitmap_id, int button_state, 
+            int orientation, Bitmap bitmap_override, Rect out_rect)
+        """
+        return _aui.TabArt_DrawButton(*args, **kwargs)

 
 

-    def SetSelectedFont(*args, **kwargs):
-        """SetSelectedFont(self, Font font)"""
-        return _aui.TabArt_SetSelectedFont(*args, **kwargs)
+    def GetTabSize(*args, **kwargs):
+        """GetTabSize(self, DC dc, String caption, bool active, int x_extent) -> Size"""
+        return _aui.TabArt_GetTabSize(*args, **kwargs)

 
 

-    def SetMeasuringFont(*args, **kwargs):
-        """SetMeasuringFont(self, Font font)"""
-        return _aui.TabArt_SetMeasuringFont(*args, **kwargs)
+    def GetBestTabCtrlSize(*args, **kwargs):
+        """GetBestTabCtrlSize(self, Window wnd) -> int"""
+        return _aui.TabArt_GetBestTabCtrlSize(*args, **kwargs)

 
 _aui.TabArt_swigregister(TabArt)
 
 
 _aui.TabArt_swigregister(TabArt)
 


@@ -1533,6 +1562,7 @@ class AuiTabContainerButton(object):
     cur_state = property(_aui.AuiTabContainerButton_cur_state_get, _aui.AuiTabContainerButton_cur_state_set)
     location = property(_aui.AuiTabContainerButton_location_get, _aui.AuiTabContainerButton_location_set)
     bitmap = property(_aui.AuiTabContainerButton_bitmap_get, _aui.AuiTabContainerButton_bitmap_set)
     cur_state = property(_aui.AuiTabContainerButton_cur_state_get, _aui.AuiTabContainerButton_cur_state_set)
     location = property(_aui.AuiTabContainerButton_location_get, _aui.AuiTabContainerButton_location_set)
     bitmap = property(_aui.AuiTabContainerButton_bitmap_get, _aui.AuiTabContainerButton_bitmap_set)

+    dis_bitmap = property(_aui.AuiTabContainerButton_dis_bitmap_get, _aui.AuiTabContainerButton_dis_bitmap_set)

     rect = property(_aui.AuiTabContainerButton_rect_get, _aui.AuiTabContainerButton_rect_set)
 _aui.AuiTabContainerButton_swigregister(AuiTabContainerButton)
 
     rect = property(_aui.AuiTabContainerButton_rect_get, _aui.AuiTabContainerButton_rect_set)
 _aui.AuiTabContainerButton_swigregister(AuiTabContainerButton)
 


@@ -1629,9 +1659,20 @@ class AuiTabContainer(object):
         return _aui.AuiTabContainer_SetRect(*args, **kwargs)
 
     def AddButton(*args, **kwargs):
         return _aui.AuiTabContainer_SetRect(*args, **kwargs)
 
     def AddButton(*args, **kwargs):

-        """AddButton(self, int id, int location, Bitmap bmp)"""
+        """
+        AddButton(self, int id, int location, Bitmap normal_bitmap=wxNullBitmap, 
+            Bitmap disabled_bitmap=wxNullBitmap)
+        """

         return _aui.AuiTabContainer_AddButton(*args, **kwargs)
 
         return _aui.AuiTabContainer_AddButton(*args, **kwargs)
 

+    def GetTabOffset(*args, **kwargs):
+        """GetTabOffset(self) -> size_t"""
+        return _aui.AuiTabContainer_GetTabOffset(*args, **kwargs)
+
+    def SetTabOffset(*args, **kwargs):
+        """SetTabOffset(self, size_t offset)"""
+        return _aui.AuiTabContainer_SetTabOffset(*args, **kwargs)
+

     ActivePage = property(GetActivePage,SetActivePage,doc="See `GetActivePage` and `SetActivePage`") 
     PageCount = property(GetPageCount,doc="See `GetPageCount`") 
     Pages = property(GetPages,doc="See `GetPages`") 
     ActivePage = property(GetActivePage,SetActivePage,doc="See `GetActivePage` and `SetActivePage`") 
     PageCount = property(GetPageCount,doc="See `GetPageCount`") 
     Pages = property(GetPages,doc="See `GetPages`") 

diff --git a/wxPython/src/gtk/aui_wrap.cpp b/wxPython/src/gtk/aui_wrap.cpp
index b5850e49e781600a3db89cada3eb6b324d196f7b..ef2c56631097b5c20619d39e47895c52ca1617fb 100644 (file)
--- a/wxPython/src/gtk/aui_wrap.cpp
+++ b/wxPython/src/gtk/aui_wrap.cpp
@@ -2929,6 +2929,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);
             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);


@@ -2950,6 +2951,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);
             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);


@@ -2974,6 +2976,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOO)",
                                                          odc, owin, otext, orect, opane));
             Py_DECREF(odc);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOO)",
                                                          odc, owin, otext, orect, opane));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(otext);
             Py_DECREF(orect);
             Py_DECREF(opane);
             Py_DECREF(otext);
             Py_DECREF(orect);
             Py_DECREF(opane);


@@ -3019,6 +3022,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane));
             Py_DECREF(odc);
             PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
             Py_DECREF(opane);
        }
             Py_DECREF(orect);
             Py_DECREF(opane);
        }


@@ -3045,6 +3049,7 @@ class wxPyDockArt :  public wxDefaultDockArt
                                                          odc, owin, button, button_state,
                                                          orect, opane));
             Py_DECREF(odc);
                                                          odc, owin, button, button_state,
                                                          orect, opane));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
             Py_DECREF(opane);
         }
             Py_DECREF(orect);
             Py_DECREF(opane);
         }


@@ -3071,6 +3076,7 @@ class wxPyTabArt :  public wxDefaultTabArt
 {
     wxPyTabArt() : wxDefaultTabArt() {}
 
 {
     wxPyTabArt() : wxDefaultTabArt() {}
 

+    

     virtual void DrawBackground( wxDC* dc,
                                  const wxRect& rect )
     {
     virtual void DrawBackground( wxDC* dc,
                                  const wxRect& rect )
     {


@@ -3134,9 +3140,90 @@ class wxPyTabArt :  public wxDefaultTabArt
     }
 
 
     }
 
 

+    virtual void DrawButton( wxDC* dc,
+                             const wxRect& in_rect,
+                             int bitmap_id,
+                             int button_state,
+                             int orientation,
+                             const wxBitmap& bitmap_override,
+                             wxRect* out_rect)
+    {
+        bool found;
+        const char* errmsg = "DrawButton should return a wxRect";
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) {
+            PyObject* odc = wxPyMake_wxObject(dc, false);
+            PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0);
+            PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0);
+            PyObject* ro;
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiiiO)", odc, orect,
+                                                                 bitmap_id, button_state, orientation,
+                                                                 obmp));
+            if (ro) {
+                if (!wxRect_helper(ro, &out_rect)) 
+                    PyErr_SetString(PyExc_TypeError, errmsg);
+                Py_DECREF(ro);
+            }
+
+            Py_DECREF(odc);
+            Py_DECREF(orect);
+            Py_DECREF(obmp);
+        }
+        wxPyEndBlockThreads(blocked);
+        if (!found)
+            wxDefaultTabArt::DrawButton(dc, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect);
+    }
+
+    
+    virtual wxSize GetTabSize( wxDC* dc,
+                               const wxString& caption,
+                               bool active,
+                               int* x_extent)
+    {
+        bool found;
+        wxSize rv, *prv = &rv;
+        const char* errmsg = "GetTabSize should return a sequence containing (size, x_extent)";
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) {
+            PyObject* odc = wxPyMake_wxObject(dc, false);
+            PyObject* otext = wx2PyString(caption);
+            PyObject* ro;
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOi)", odc, otext, (int)active));
+            if (ro) {
+                if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
+                    PyObject* o1 = PySequence_GetItem(ro, 0);
+                    PyObject* o2 = PySequence_GetItem(ro, 1);
+                    if (!wxSize_helper(o1, &prv)) 
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    else if (!PyInt_Check(o2)) 
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    else
+                        *x_extent = PyInt_AsLong(o2);
+                    
+                    Py_DECREF(o1);
+                    Py_DECREF(o2);
+                }
+                else {
+                    PyErr_SetString(PyExc_TypeError, errmsg);
+                }
+                Py_DECREF(ro);
+            }
+
+            Py_DECREF(odc);
+            Py_DECREF(otext);
+        }
+        wxPyEndBlockThreads(blocked);
+        if (!found)
+            rv = wxDefaultTabArt::GetTabSize(dc, caption, active, x_extent);
+        return rv;
+    }
+   
+   
+

     DEC_PYCALLBACK__FONT(SetNormalFont);
     DEC_PYCALLBACK__FONT(SetSelectedFont);
     DEC_PYCALLBACK__FONT(SetMeasuringFont);
     DEC_PYCALLBACK__FONT(SetNormalFont);
     DEC_PYCALLBACK__FONT(SetSelectedFont);
     DEC_PYCALLBACK__FONT(SetMeasuringFont);

+    DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize);

 
     PYPRIVATE;
 };
 
     PYPRIVATE;
 };


@@ -3145,7 +3232,7 @@ class wxPyTabArt :  public wxDefaultTabArt
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetNormalFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetSelectedFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetMeasuringFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetNormalFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetSelectedFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetMeasuringFont);

-
+IMP_PYCALLBACK_INT_WIN(wxPyTabArt, wxDefaultTabArt, GetBestTabCtrlSize);

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -11013,6 +11100,129 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_TabArt_SetNormalFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxTabArt *arg1 = (wxTabArt *) 0 ;
+  wxFont *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 *) "font", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetNormalFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetNormalFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxTabArt * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetNormalFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetNormalFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetNormalFont((wxFont const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TabArt_SetSelectedFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxTabArt *arg1 = (wxTabArt *) 0 ;
+  wxFont *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 *) "font", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetSelectedFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetSelectedFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxTabArt * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetSelectedFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetSelectedFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetSelectedFont((wxFont const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TabArt_SetMeasuringFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxTabArt *arg1 = (wxTabArt *) 0 ;
+  wxFont *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 *) "font", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetMeasuringFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetMeasuringFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxTabArt * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetMeasuringFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetMeasuringFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetMeasuringFont((wxFont const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_TabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxTabArt *arg1 = (wxTabArt *) 0 ;
 SWIGINTERN PyObject *_wrap_TabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxTabArt *arg1 = (wxTabArt *) 0 ;


@@ -11146,37 +11356,89 @@ fail:
 }
 
 
 }
 
 

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

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

-  wxFont *arg2 = 0 ;
+  wxDC *arg2 = (wxDC *) 0 ;
+  wxRect *arg3 = 0 ;
+  int arg4 ;
+  int arg5 ;
+  int arg6 ;
+  wxBitmap *arg7 = 0 ;
+  wxRect *arg8 = (wxRect *) 0 ;

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

+  wxRect temp3 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 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 *) "self",(char *) "font", NULL 
+    (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "bitmap_id",(char *) "button_state",(char *) "orientation",(char *) "bitmap_override",(char *) "out_rect", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetNormalFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO:TabArt_DrawButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetNormalFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_DrawButton" "', expected argument " "1"" of type '" "wxTabArt *""'"); 

   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);
   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetNormalFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC *""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetNormalFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  arg2 = reinterpret_cast< wxDC * >(argp2);
+  {
+    arg3 = &temp3;
+    if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TabArt_DrawButton" "', 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 '" "TabArt_DrawButton" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
+  ecode6 = SWIG_AsVal_int(obj5, &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "TabArt_DrawButton" "', expected argument " "6"" of type '" "int""'");
+  } 
+  arg6 = static_cast< int >(val6);
+  res7 = SWIG_ConvertPtr(obj6, &argp7, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "TabArt_DrawButton" "', expected argument " "7"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp7) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_DrawButton" "', expected argument " "7"" of type '" "wxBitmap const &""'"); 
+  }
+  arg7 = reinterpret_cast< wxBitmap * >(argp7);
+  res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_wxRect, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "TabArt_DrawButton" "', expected argument " "8"" of type '" "wxRect *""'"); 
+  }
+  arg8 = reinterpret_cast< wxRect * >(argp8);

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

-    (arg1)->SetNormalFont((wxFont const &)*arg2);
+    (arg1)->DrawButton(arg2,(wxRect const &)*arg3,arg4,arg5,arg6,(wxBitmap const &)*arg7,arg8);

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


@@ -11187,51 +11449,84 @@ fail:
 }
 
 
 }
 
 

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

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

-  wxFont *arg2 = 0 ;
+  wxDC *arg2 = (wxDC *) 0 ;
+  wxString *arg3 = 0 ;
+  bool arg4 ;
+  int *arg5 = (int *) 0 ;
+  wxSize result;

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

+  bool temp3 = false ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 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 *) "font", NULL 
+    (char *) "self",(char *) "dc",(char *) "caption",(char *) "active",(char *) "x_extent", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetSelectedFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:TabArt_GetTabSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetSelectedFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_GetTabSize" "', expected argument " "1"" of type '" "wxTabArt *""'"); 

   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);
   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetSelectedFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC *""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetSelectedFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  arg2 = reinterpret_cast< wxDC * >(argp2);
+  {
+    arg3 = wxString_in_helper(obj2);
+    if (arg3 == NULL) SWIG_fail;
+    temp3 = true;

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  ecode4 = SWIG_AsVal_bool(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TabArt_GetTabSize" "', expected argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  res5 = SWIG_ConvertPtr(obj4, &argp5,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "TabArt_GetTabSize" "', expected argument " "5"" of type '" "int *""'"); 
+  }
+  arg5 = reinterpret_cast< int * >(argp5);

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

-    (arg1)->SetSelectedFont((wxFont const &)*arg2);
+    result = (arg1)->GetTabSize(arg2,(wxString const &)*arg3,arg4,arg5);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  {
+    if (temp3)
+    delete arg3;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp3)
+    delete arg3;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

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

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

-  wxFont *arg2 = 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  int result;

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


@@ -11239,30 +11534,27 @@ SWIGINTERN PyObject *_wrap_TabArt_SetMeasuringFont(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "font", NULL 
+    (char *) "self",(char *) "wnd", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetMeasuringFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_GetBestTabCtrlSize",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetMeasuringFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_GetBestTabCtrlSize" "', expected argument " "1"" of type '" "wxTabArt *""'"); 

   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);
   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetMeasuringFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetMeasuringFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_GetBestTabCtrlSize" "', expected argument " "2"" of type '" "wxWindow *""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  arg2 = reinterpret_cast< wxWindow * >(argp2);

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

-    (arg1)->SetMeasuringFont((wxFont const &)*arg2);
+    result = (int)(arg1)->GetBestTabCtrlSize(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;


@@ -12126,6 +12418,59 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_AuiTabContainerButton_dis_bitmap_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiTabContainerButton *arg1 = (wxAuiTabContainerButton *) 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,"AuiTabContainerButton_dis_bitmap_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiTabContainerButton, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainerButton_dis_bitmap_set" "', expected argument " "1"" of type '" "wxAuiTabContainerButton *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiTabContainerButton * >(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 '" "AuiTabContainerButton_dis_bitmap_set" "', expected argument " "2"" of type '" "wxBitmap *""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  if (arg1) (arg1)->dis_bitmap = *arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiTabContainerButton_dis_bitmap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiTabContainerButton *arg1 = (wxAuiTabContainerButton *) 0 ;
+  wxBitmap *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_wxAuiTabContainerButton, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainerButton_dis_bitmap_get" "', expected argument " "1"" of type '" "wxAuiTabContainerButton *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiTabContainerButton * >(argp1);
+  result = (wxBitmap *)& ((arg1)->dis_bitmap);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBitmap, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_AuiTabContainerButton_rect_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiTabContainerButton *arg1 = (wxAuiTabContainerButton *) 0 ;
 SWIGINTERN PyObject *_wrap_AuiTabContainerButton_rect_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiTabContainerButton *arg1 = (wxAuiTabContainerButton *) 0 ;


@@ -13099,7 +13444,10 @@ SWIGINTERN PyObject *_wrap_AuiTabContainer_AddButton(PyObject *SWIGUNUSEDPARM(se
   wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ;
   int arg2 ;
   int arg3 ;
   wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ;
   int arg2 ;
   int arg3 ;

-  wxBitmap *arg4 = 0 ;
+  wxBitmap const &arg4_defvalue = wxNullBitmap ;
+  wxBitmap *arg4 = (wxBitmap *) &arg4_defvalue ;
+  wxBitmap const &arg5_defvalue = wxNullBitmap ;
+  wxBitmap *arg5 = (wxBitmap *) &arg5_defvalue ;

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


@@ -13108,15 +13456,18 @@ SWIGINTERN PyObject *_wrap_AuiTabContainer_AddButton(PyObject *SWIGUNUSEDPARM(se
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;

+  void *argp5 = 0 ;
+  int res5 = 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 *) "id",(char *) "location",(char *) "bmp", NULL 
+    (char *) "self",(char *) "id",(char *) "location",(char *) "normal_bitmap",(char *) "disabled_bitmap", NULL 

   };
   
   };
   

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

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


@@ -13132,17 +13483,95 @@ SWIGINTERN PyObject *_wrap_AuiTabContainer_AddButton(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AuiTabContainer_AddButton" "', expected argument " "3"" of type '" "int""'");
   } 
   arg3 = static_cast< int >(val3);
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AuiTabContainer_AddButton" "', expected argument " "3"" of type '" "int""'");
   } 
   arg3 = static_cast< int >(val3);

-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxBitmap,  0  | 0);
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "AuiTabContainer_AddButton" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+  if (obj3) {
+    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxBitmap,  0  | 0);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "AuiTabContainer_AddButton" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+    }
+    if (!argp4) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabContainer_AddButton" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+    }
+    arg4 = reinterpret_cast< wxBitmap * >(argp4);

   }
   }

-  if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabContainer_AddButton" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+  if (obj4) {
+    res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_wxBitmap,  0  | 0);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "AuiTabContainer_AddButton" "', expected argument " "5"" of type '" "wxBitmap const &""'"); 
+    }
+    if (!argp5) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabContainer_AddButton" "', expected argument " "5"" of type '" "wxBitmap const &""'"); 
+    }
+    arg5 = reinterpret_cast< wxBitmap * >(argp5);

   }
   }

-  arg4 = reinterpret_cast< wxBitmap * >(argp4);

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

-    (arg1)->AddButton(arg2,arg3,(wxBitmap const &)*arg4);
+    (arg1)->AddButton(arg2,arg3,(wxBitmap const &)*arg4,(wxBitmap const &)*arg5);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiTabContainer_GetTabOffset(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ;
+  size_t 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_wxAuiTabContainer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainer_GetTabOffset" "', expected argument " "1"" of type '" "wxAuiTabContainer const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiTabContainer * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (size_t)((wxAuiTabContainer const *)arg1)->GetTabOffset();
+    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_AuiTabContainer_SetTabOffset(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ;
+  size_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "offset", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AuiTabContainer_SetTabOffset",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabContainer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainer_SetTabOffset" "', expected argument " "1"" of type '" "wxAuiTabContainer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiTabContainer * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiTabContainer_SetTabOffset" "', expected argument " "2"" of type '" "size_t""'");
+  } 
+  arg2 = static_cast< size_t >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetTabOffset(arg2);

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


@@ -14198,11 +14627,14 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"FloatingPane_swigregister", FloatingPane_swigregister, METH_VARARGS, NULL},
         { (char *)"FloatingPane_swiginit", FloatingPane_swiginit, METH_VARARGS, NULL},
         { (char *)"delete_TabArt", (PyCFunction)_wrap_delete_TabArt, METH_O, NULL},
         { (char *)"FloatingPane_swigregister", FloatingPane_swigregister, METH_VARARGS, NULL},
         { (char *)"FloatingPane_swiginit", FloatingPane_swiginit, METH_VARARGS, NULL},
         { (char *)"delete_TabArt", (PyCFunction)_wrap_delete_TabArt, METH_O, NULL},

-        { (char *)"TabArt_DrawBackground", (PyCFunction) _wrap_TabArt_DrawBackground, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"TabArt_DrawTab", (PyCFunction) _wrap_TabArt_DrawTab, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"TabArt_SetNormalFont", (PyCFunction) _wrap_TabArt_SetNormalFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetSelectedFont", (PyCFunction) _wrap_TabArt_SetSelectedFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetMeasuringFont", (PyCFunction) _wrap_TabArt_SetMeasuringFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetNormalFont", (PyCFunction) _wrap_TabArt_SetNormalFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetSelectedFont", (PyCFunction) _wrap_TabArt_SetSelectedFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetMeasuringFont", (PyCFunction) _wrap_TabArt_SetMeasuringFont, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"TabArt_DrawBackground", (PyCFunction) _wrap_TabArt_DrawBackground, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TabArt_DrawTab", (PyCFunction) _wrap_TabArt_DrawTab, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TabArt_DrawButton", (PyCFunction) _wrap_TabArt_DrawButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TabArt_GetTabSize", (PyCFunction) _wrap_TabArt_GetTabSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TabArt_GetBestTabCtrlSize", (PyCFunction) _wrap_TabArt_GetBestTabCtrlSize, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"TabArt_swigregister", TabArt_swigregister, METH_VARARGS, NULL},
         { (char *)"new_DefaultTabArt", (PyCFunction)_wrap_new_DefaultTabArt, METH_NOARGS, NULL},
         { (char *)"delete_DefaultTabArt", (PyCFunction)_wrap_delete_DefaultTabArt, METH_O, NULL},
         { (char *)"TabArt_swigregister", TabArt_swigregister, METH_VARARGS, NULL},
         { (char *)"new_DefaultTabArt", (PyCFunction)_wrap_new_DefaultTabArt, METH_NOARGS, NULL},
         { (char *)"delete_DefaultTabArt", (PyCFunction)_wrap_delete_DefaultTabArt, METH_O, NULL},


@@ -14238,6 +14670,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"AuiTabContainerButton_location_get", (PyCFunction)_wrap_AuiTabContainerButton_location_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_bitmap_set", _wrap_AuiTabContainerButton_bitmap_set, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_bitmap_get", (PyCFunction)_wrap_AuiTabContainerButton_bitmap_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_location_get", (PyCFunction)_wrap_AuiTabContainerButton_location_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_bitmap_set", _wrap_AuiTabContainerButton_bitmap_set, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_bitmap_get", (PyCFunction)_wrap_AuiTabContainerButton_bitmap_get, METH_O, NULL},

+        { (char *)"AuiTabContainerButton_dis_bitmap_set", _wrap_AuiTabContainerButton_dis_bitmap_set, METH_VARARGS, NULL},
+        { (char *)"AuiTabContainerButton_dis_bitmap_get", (PyCFunction)_wrap_AuiTabContainerButton_dis_bitmap_get, METH_O, NULL},

         { (char *)"AuiTabContainerButton_rect_set", _wrap_AuiTabContainerButton_rect_set, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_rect_get", (PyCFunction)_wrap_AuiTabContainerButton_rect_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_swigregister", AuiTabContainerButton_swigregister, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_rect_set", _wrap_AuiTabContainerButton_rect_set, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_rect_get", (PyCFunction)_wrap_AuiTabContainerButton_rect_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_swigregister", AuiTabContainerButton_swigregister, METH_VARARGS, NULL},


@@ -14264,6 +14698,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"AuiTabContainer_DoShowHide", (PyCFunction)_wrap_AuiTabContainer_DoShowHide, METH_O, NULL},
         { (char *)"AuiTabContainer_SetRect", (PyCFunction) _wrap_AuiTabContainer_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"AuiTabContainer_AddButton", (PyCFunction) _wrap_AuiTabContainer_AddButton, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"AuiTabContainer_DoShowHide", (PyCFunction)_wrap_AuiTabContainer_DoShowHide, METH_O, NULL},
         { (char *)"AuiTabContainer_SetRect", (PyCFunction) _wrap_AuiTabContainer_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"AuiTabContainer_AddButton", (PyCFunction) _wrap_AuiTabContainer_AddButton, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"AuiTabContainer_GetTabOffset", (PyCFunction)_wrap_AuiTabContainer_GetTabOffset, METH_O, NULL},
+        { (char *)"AuiTabContainer_SetTabOffset", (PyCFunction) _wrap_AuiTabContainer_SetTabOffset, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"AuiTabContainer_swigregister", AuiTabContainer_swigregister, METH_VARARGS, NULL},
         { (char *)"AuiTabContainer_swiginit", AuiTabContainer_swiginit, METH_VARARGS, NULL},
         { (char *)"new_AuiTabCtrl", (PyCFunction) _wrap_new_AuiTabCtrl, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"AuiTabContainer_swigregister", AuiTabContainer_swigregister, METH_VARARGS, NULL},
         { (char *)"AuiTabContainer_swiginit", AuiTabContainer_swiginit, METH_VARARGS, NULL},
         { (char *)"new_AuiTabCtrl", (PyCFunction) _wrap_new_AuiTabCtrl, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -16963,6 +17399,20 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_NORMAL",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_NORMAL)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_HOVER",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_HOVER)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_PRESSED",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_PRESSED)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_NORMAL",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_NORMAL)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_HOVER",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_HOVER)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_PRESSED",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_PRESSED)));

+  SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_DISABLED",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_DISABLED)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_HIDDEN",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_HIDDEN)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_CLOSE",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_CLOSE)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_MAXIMIZE",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_MAXIMIZE)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_MINIMIZE",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_MINIMIZE)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_PIN",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_PIN)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_OPTIONS",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_OPTIONS)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_LEFT",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_LEFT)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_RIGHT",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_RIGHT)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_UP",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_UP)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_DOWN",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_DOWN)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_CUSTOM1",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_CUSTOM1)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_CUSTOM2",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_CUSTOM2)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_CUSTOM3",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_CUSTOM3)));

   SWIG_Python_SetConstant(d, "AUI_INSERT_PANE",SWIG_From_int(static_cast< int >(wxAUI_INSERT_PANE)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_ROW",SWIG_From_int(static_cast< int >(wxAUI_INSERT_ROW)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_DOCK",SWIG_From_int(static_cast< int >(wxAUI_INSERT_DOCK)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_PANE",SWIG_From_int(static_cast< int >(wxAUI_INSERT_PANE)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_ROW",SWIG_From_int(static_cast< int >(wxAUI_INSERT_ROW)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_DOCK",SWIG_From_int(static_cast< int >(wxAUI_INSERT_DOCK)));

diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py
index c928793c5421c193ca30bcd3868f2d6dbc60ad39..4af11a0939e9047a313108a04030689dfdc76b42 100644 (file)
--- a/wxPython/src/gtk/html.py
+++ b/wxPython/src/gtk/html.py
@@ -1664,23 +1664,57 @@ def PreHtmlHelpWindow(*args, **kwargs):
     self._setOORInfo(self)
     return val
 
     self._setOORInfo(self)
     return val
 

-class HtmlWindowEvent(_core.NotifyEvent):
-    """Proxy of C++ HtmlWindowEvent class"""
+wxEVT_COMMAND_HTML_CELL_CLICKED = _html.wxEVT_COMMAND_HTML_CELL_CLICKED
+wxEVT_COMMAND_HTML_CELL_HOVER = _html.wxEVT_COMMAND_HTML_CELL_HOVER
+wxEVT_COMMAND_HTML_LINK_CLICKED = _html.wxEVT_COMMAND_HTML_LINK_CLICKED
+class HtmlCellEvent(_core.CommandEvent):
+    """Proxy of C++ HtmlCellEvent class"""

     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 

-        """__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> HtmlWindowEvent"""
-        _html.HtmlWindowEvent_swiginit(self,_html.new_HtmlWindowEvent(*args, **kwargs))
-    def SetURL(*args, **kwargs):
-        """SetURL(self, String url)"""
-        return _html.HtmlWindowEvent_SetURL(*args, **kwargs)
-
-    def GetURL(*args, **kwargs):
-        """GetURL(self) -> String"""
-        return _html.HtmlWindowEvent_GetURL(*args, **kwargs)
-
-    URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") 
-_html.HtmlWindowEvent_swigregister(HtmlWindowEvent)
+        """
+        __init__(self, EventType commandType, int id, HtmlCell cell, Point pt, 
+            MouseEvent ev) -> HtmlCellEvent
+        """
+        _html.HtmlCellEvent_swiginit(self,_html.new_HtmlCellEvent(*args, **kwargs))
+    def GetCell(*args, **kwargs):
+        """GetCell(self) -> HtmlCell"""
+        return _html.HtmlCellEvent_GetCell(*args, **kwargs)
+
+    def GetPoint(*args, **kwargs):
+        """GetPoint(self) -> Point"""
+        return _html.HtmlCellEvent_GetPoint(*args, **kwargs)
+
+    def GetMouseEvent(*args, **kwargs):
+        """GetMouseEvent(self) -> MouseEvent"""
+        return _html.HtmlCellEvent_GetMouseEvent(*args, **kwargs)
+
+    def SetLinkClicked(*args, **kwargs):
+        """SetLinkClicked(self, bool linkclicked)"""
+        return _html.HtmlCellEvent_SetLinkClicked(*args, **kwargs)
+
+    def GetLinkClicked(*args, **kwargs):
+        """GetLinkClicked(self) -> bool"""
+        return _html.HtmlCellEvent_GetLinkClicked(*args, **kwargs)
+
+_html.HtmlCellEvent_swigregister(HtmlCellEvent)
+
+class HtmlLinkEvent(_core.CommandEvent):
+    """Proxy of C++ HtmlLinkEvent class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """__init__(self, int id, HtmlLinkInfo linkinfo) -> HtmlLinkEvent"""
+        _html.HtmlLinkEvent_swiginit(self,_html.new_HtmlLinkEvent(*args, **kwargs))
+    def GetLinkInfo(*args, **kwargs):
+        """GetLinkInfo(self) -> HtmlLinkInfo"""
+        return _html.HtmlLinkEvent_GetLinkInfo(*args, **kwargs)
+
+_html.HtmlLinkEvent_swigregister(HtmlLinkEvent)
+
+EVT_HTML_CELL_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_CLICKED, 1 )
+EVT_HTML_CELL_HOVER   = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_HOVER, 1 )
+EVT_HTML_LINK_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_LINK_CLICKED, 1 )

 
 class HtmlHelpFrame(_windows.Frame):
     """Proxy of C++ HtmlHelpFrame class"""
 
 class HtmlHelpFrame(_windows.Frame):
     """Proxy of C++ HtmlHelpFrame class"""

diff --git a/wxPython/src/gtk/html_wrap.cpp b/wxPython/src/gtk/html_wrap.cpp
index 0cff49c9acf2a3b8587ad76714484ddffe235728..511164adbd7f8000f98849df6aa5499dc26abfb7 100644 (file)
--- a/wxPython/src/gtk/html_wrap.cpp
+++ b/wxPython/src/gtk/html_wrap.cpp
@@ -2523,147 +2523,148 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxHtmlBookRecArray swig_types[57]
 #define SWIGTYPE_p_wxHtmlBookRecord swig_types[58]
 #define SWIGTYPE_p_wxHtmlCell swig_types[59]
 #define SWIGTYPE_p_wxHtmlBookRecArray swig_types[57]
 #define SWIGTYPE_p_wxHtmlBookRecord swig_types[58]
 #define SWIGTYPE_p_wxHtmlCell swig_types[59]

-#define SWIGTYPE_p_wxHtmlColourCell swig_types[60]
-#define SWIGTYPE_p_wxHtmlContainerCell swig_types[61]
-#define SWIGTYPE_p_wxHtmlDCRenderer swig_types[62]
-#define SWIGTYPE_p_wxHtmlEasyPrinting swig_types[63]
-#define SWIGTYPE_p_wxHtmlFilter swig_types[64]
-#define SWIGTYPE_p_wxHtmlFontCell swig_types[65]
-#define SWIGTYPE_p_wxHtmlHelpController swig_types[66]
-#define SWIGTYPE_p_wxHtmlHelpData swig_types[67]
-#define SWIGTYPE_p_wxHtmlHelpDialog swig_types[68]
-#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[69]
-#define SWIGTYPE_p_wxHtmlHelpFrameCfg swig_types[70]
-#define SWIGTYPE_p_wxHtmlHelpWindow swig_types[71]
-#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[72]
-#define SWIGTYPE_p_wxHtmlModalHelp swig_types[73]
-#define SWIGTYPE_p_wxHtmlParser swig_types[74]
-#define SWIGTYPE_p_wxHtmlPrintout swig_types[75]
-#define SWIGTYPE_p_wxHtmlRenderingInfo swig_types[76]
-#define SWIGTYPE_p_wxHtmlRenderingState swig_types[77]
-#define SWIGTYPE_p_wxHtmlRenderingStyle swig_types[78]
-#define SWIGTYPE_p_wxHtmlSearchStatus swig_types[79]
-#define SWIGTYPE_p_wxHtmlSelection swig_types[80]
-#define SWIGTYPE_p_wxHtmlTag swig_types[81]
-#define SWIGTYPE_p_wxHtmlTagHandler swig_types[82]
-#define SWIGTYPE_p_wxHtmlWidgetCell swig_types[83]
-#define SWIGTYPE_p_wxHtmlWinParser swig_types[84]
-#define SWIGTYPE_p_wxHtmlWindow swig_types[85]
-#define SWIGTYPE_p_wxHtmlWindowEvent swig_types[86]
-#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[87]
-#define SWIGTYPE_p_wxHtmlWordCell swig_types[88]
-#define SWIGTYPE_p_wxICOHandler swig_types[89]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[90]
-#define SWIGTYPE_p_wxIdleEvent swig_types[91]
-#define SWIGTYPE_p_wxImage swig_types[92]
-#define SWIGTYPE_p_wxImageHandler swig_types[93]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[94]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[95]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[96]
-#define SWIGTYPE_p_wxKeyEvent swig_types[97]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[98]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[99]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[100]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[101]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[102]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[103]
-#define SWIGTYPE_p_wxMenu swig_types[104]
-#define SWIGTYPE_p_wxMenuBar swig_types[105]
-#define SWIGTYPE_p_wxMenuEvent swig_types[106]
-#define SWIGTYPE_p_wxMenuItem swig_types[107]
-#define SWIGTYPE_p_wxMessageDialog swig_types[108]
-#define SWIGTYPE_p_wxMiniFrame swig_types[109]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[110]
-#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[111]
-#define SWIGTYPE_p_wxMouseEvent swig_types[112]
-#define SWIGTYPE_p_wxMoveEvent swig_types[113]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[114]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[115]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[116]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[117]
-#define SWIGTYPE_p_wxNumberEntryDialog swig_types[118]
-#define SWIGTYPE_p_wxObject swig_types[119]
-#define SWIGTYPE_p_wxPCXHandler swig_types[120]
-#define SWIGTYPE_p_wxPNGHandler swig_types[121]
-#define SWIGTYPE_p_wxPNMHandler swig_types[122]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[123]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[124]
-#define SWIGTYPE_p_wxPaintEvent swig_types[125]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[126]
-#define SWIGTYPE_p_wxPanel swig_types[127]
-#define SWIGTYPE_p_wxPaperSize swig_types[128]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[129]
-#define SWIGTYPE_p_wxPoint swig_types[130]
-#define SWIGTYPE_p_wxPopupWindow swig_types[131]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[132]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[133]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[134]
-#define SWIGTYPE_p_wxPrintData swig_types[135]
-#define SWIGTYPE_p_wxPrintDialog swig_types[136]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[137]
-#define SWIGTYPE_p_wxPrintPreview swig_types[138]
-#define SWIGTYPE_p_wxPrinter swig_types[139]
-#define SWIGTYPE_p_wxProgressDialog swig_types[140]
-#define SWIGTYPE_p_wxPyApp swig_types[141]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[142]
-#define SWIGTYPE_p_wxPyEvent swig_types[143]
-#define SWIGTYPE_p_wxPyHtmlFilter swig_types[144]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[145]
-#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[146]
-#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[147]
-#define SWIGTYPE_p_wxPyHtmlWindow swig_types[148]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[149]
-#define SWIGTYPE_p_wxPyPanel swig_types[150]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[151]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[152]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[153]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[154]
-#define SWIGTYPE_p_wxPyPrintout swig_types[155]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[156]
-#define SWIGTYPE_p_wxPySizer swig_types[157]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[158]
-#define SWIGTYPE_p_wxPyVListBox swig_types[159]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[160]
-#define SWIGTYPE_p_wxPyValidator swig_types[161]
-#define SWIGTYPE_p_wxPyWindow swig_types[162]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[163]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[164]
-#define SWIGTYPE_p_wxSashEvent swig_types[165]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[166]
-#define SWIGTYPE_p_wxSashWindow swig_types[167]
-#define SWIGTYPE_p_wxScrollEvent swig_types[168]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[169]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[170]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[171]
-#define SWIGTYPE_p_wxShowEvent swig_types[172]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[173]
-#define SWIGTYPE_p_wxSize swig_types[174]
-#define SWIGTYPE_p_wxSizeEvent swig_types[175]
-#define SWIGTYPE_p_wxSizer swig_types[176]
-#define SWIGTYPE_p_wxSizerItem swig_types[177]
-#define SWIGTYPE_p_wxSplashScreen swig_types[178]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[179]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[180]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[181]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[182]
-#define SWIGTYPE_p_wxStatusBar swig_types[183]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[184]
-#define SWIGTYPE_p_wxString swig_types[185]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[186]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[187]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[188]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[189]
-#define SWIGTYPE_p_wxTipWindow swig_types[190]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[191]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[192]
-#define SWIGTYPE_p_wxValidator swig_types[193]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[194]
-#define SWIGTYPE_p_wxWindow swig_types[195]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[196]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[197]
-#define SWIGTYPE_p_wxXPMHandler swig_types[198]
-static swig_type_info *swig_types[200];
-static swig_module_info swig_module = {swig_types, 199, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxHtmlCellEvent swig_types[60]
+#define SWIGTYPE_p_wxHtmlColourCell swig_types[61]
+#define SWIGTYPE_p_wxHtmlContainerCell swig_types[62]
+#define SWIGTYPE_p_wxHtmlDCRenderer swig_types[63]
+#define SWIGTYPE_p_wxHtmlEasyPrinting swig_types[64]
+#define SWIGTYPE_p_wxHtmlFilter swig_types[65]
+#define SWIGTYPE_p_wxHtmlFontCell swig_types[66]
+#define SWIGTYPE_p_wxHtmlHelpController swig_types[67]
+#define SWIGTYPE_p_wxHtmlHelpData swig_types[68]
+#define SWIGTYPE_p_wxHtmlHelpDialog swig_types[69]
+#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[70]
+#define SWIGTYPE_p_wxHtmlHelpFrameCfg swig_types[71]
+#define SWIGTYPE_p_wxHtmlHelpWindow swig_types[72]
+#define SWIGTYPE_p_wxHtmlLinkEvent swig_types[73]
+#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[74]
+#define SWIGTYPE_p_wxHtmlModalHelp swig_types[75]
+#define SWIGTYPE_p_wxHtmlParser swig_types[76]
+#define SWIGTYPE_p_wxHtmlPrintout swig_types[77]
+#define SWIGTYPE_p_wxHtmlRenderingInfo swig_types[78]
+#define SWIGTYPE_p_wxHtmlRenderingState swig_types[79]
+#define SWIGTYPE_p_wxHtmlRenderingStyle swig_types[80]
+#define SWIGTYPE_p_wxHtmlSearchStatus swig_types[81]
+#define SWIGTYPE_p_wxHtmlSelection swig_types[82]
+#define SWIGTYPE_p_wxHtmlTag swig_types[83]
+#define SWIGTYPE_p_wxHtmlTagHandler swig_types[84]
+#define SWIGTYPE_p_wxHtmlWidgetCell swig_types[85]
+#define SWIGTYPE_p_wxHtmlWinParser swig_types[86]
+#define SWIGTYPE_p_wxHtmlWindow swig_types[87]
+#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[88]
+#define SWIGTYPE_p_wxHtmlWordCell swig_types[89]
+#define SWIGTYPE_p_wxICOHandler swig_types[90]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[91]
+#define SWIGTYPE_p_wxIdleEvent swig_types[92]
+#define SWIGTYPE_p_wxImage swig_types[93]
+#define SWIGTYPE_p_wxImageHandler swig_types[94]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[95]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[96]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[97]
+#define SWIGTYPE_p_wxKeyEvent swig_types[98]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[99]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[100]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[101]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[102]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[103]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[104]
+#define SWIGTYPE_p_wxMenu swig_types[105]
+#define SWIGTYPE_p_wxMenuBar swig_types[106]
+#define SWIGTYPE_p_wxMenuEvent swig_types[107]
+#define SWIGTYPE_p_wxMenuItem swig_types[108]
+#define SWIGTYPE_p_wxMessageDialog swig_types[109]
+#define SWIGTYPE_p_wxMiniFrame swig_types[110]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[111]
+#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[112]
+#define SWIGTYPE_p_wxMouseEvent swig_types[113]
+#define SWIGTYPE_p_wxMoveEvent swig_types[114]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[115]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[116]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[117]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[118]
+#define SWIGTYPE_p_wxNumberEntryDialog swig_types[119]
+#define SWIGTYPE_p_wxObject swig_types[120]
+#define SWIGTYPE_p_wxPCXHandler swig_types[121]
+#define SWIGTYPE_p_wxPNGHandler swig_types[122]
+#define SWIGTYPE_p_wxPNMHandler swig_types[123]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[124]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[125]
+#define SWIGTYPE_p_wxPaintEvent swig_types[126]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[127]
+#define SWIGTYPE_p_wxPanel swig_types[128]
+#define SWIGTYPE_p_wxPaperSize swig_types[129]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[130]
+#define SWIGTYPE_p_wxPoint swig_types[131]
+#define SWIGTYPE_p_wxPopupWindow swig_types[132]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[133]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[134]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[135]
+#define SWIGTYPE_p_wxPrintData swig_types[136]
+#define SWIGTYPE_p_wxPrintDialog swig_types[137]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[138]
+#define SWIGTYPE_p_wxPrintPreview swig_types[139]
+#define SWIGTYPE_p_wxPrinter swig_types[140]
+#define SWIGTYPE_p_wxProgressDialog swig_types[141]
+#define SWIGTYPE_p_wxPyApp swig_types[142]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[143]
+#define SWIGTYPE_p_wxPyEvent swig_types[144]
+#define SWIGTYPE_p_wxPyHtmlFilter swig_types[145]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[146]
+#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[147]
+#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[148]
+#define SWIGTYPE_p_wxPyHtmlWindow swig_types[149]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[150]
+#define SWIGTYPE_p_wxPyPanel swig_types[151]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[152]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[153]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[154]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[155]
+#define SWIGTYPE_p_wxPyPrintout swig_types[156]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[157]
+#define SWIGTYPE_p_wxPySizer swig_types[158]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[159]
+#define SWIGTYPE_p_wxPyVListBox swig_types[160]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[161]
+#define SWIGTYPE_p_wxPyValidator swig_types[162]
+#define SWIGTYPE_p_wxPyWindow swig_types[163]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[164]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[165]
+#define SWIGTYPE_p_wxSashEvent swig_types[166]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[167]
+#define SWIGTYPE_p_wxSashWindow swig_types[168]
+#define SWIGTYPE_p_wxScrollEvent swig_types[169]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[170]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[171]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[172]
+#define SWIGTYPE_p_wxShowEvent swig_types[173]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[174]
+#define SWIGTYPE_p_wxSize swig_types[175]
+#define SWIGTYPE_p_wxSizeEvent swig_types[176]
+#define SWIGTYPE_p_wxSizer swig_types[177]
+#define SWIGTYPE_p_wxSizerItem swig_types[178]
+#define SWIGTYPE_p_wxSplashScreen swig_types[179]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[180]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[181]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[182]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[183]
+#define SWIGTYPE_p_wxStatusBar swig_types[184]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[185]
+#define SWIGTYPE_p_wxString swig_types[186]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[187]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[188]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[189]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[190]
+#define SWIGTYPE_p_wxTipWindow swig_types[191]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[192]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[193]
+#define SWIGTYPE_p_wxValidator swig_types[194]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[195]
+#define SWIGTYPE_p_wxWindow swig_types[196]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[197]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[198]
+#define SWIGTYPE_p_wxXPMHandler swig_types[199]
+static swig_type_info *swig_types[201];
+static swig_module_info swig_module = {swig_types, 200, 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)
 


@@ -14914,139 +14915,319 @@ SWIGINTERN PyObject *HtmlHelpWindow_swiginit(PyObject *SWIGUNUSEDPARM(self), PyO
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

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

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

-  wxEventType arg1 = (wxEventType) wxEVT_NULL ;
-  int arg2 = (int) 0 ;
-  wxHtmlWindowEvent *result = 0 ;
+  wxEventType arg1 ;
+  int arg2 ;
+  wxHtmlCell *arg3 = (wxHtmlCell *) 0 ;
+  wxPoint *arg4 = 0 ;
+  wxMouseEvent *arg5 = 0 ;
+  wxHtmlCellEvent *result = 0 ;

   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;

+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  wxPoint temp4 ;
+  void *argp5 = 0 ;
+  int res5 = 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 *) "commandType",(char *) "id", NULL 
+    (char *) "commandType",(char *) "id",(char *) "cell",(char *) "pt",(char *) "ev", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_HtmlWindowEvent",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_HtmlWindowEvent" "', expected argument " "1"" of type '" "wxEventType""'");
-    } 
-    arg1 = static_cast< wxEventType >(val1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_HtmlCellEvent",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_HtmlCellEvent" "', expected argument " "1"" of type '" "wxEventType""'");
+  } 
+  arg1 = static_cast< wxEventType >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_HtmlCellEvent" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_HtmlCellEvent" "', expected argument " "3"" of type '" "wxHtmlCell *""'"); 

   }
   }

-  if (obj1) {
-    ecode2 = SWIG_AsVal_int(obj1, &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_HtmlWindowEvent" "', expected argument " "2"" of type '" "int""'");
-    } 
-    arg2 = static_cast< int >(val2);
+  arg3 = reinterpret_cast< wxHtmlCell * >(argp3);
+  {
+    arg4 = &temp4;
+    if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail;
+  }
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_wxMouseEvent,  0  | 0);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_HtmlCellEvent" "', expected argument " "5"" of type '" "wxMouseEvent const &""'"); 

   }
   }

+  if (!argp5) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_HtmlCellEvent" "', expected argument " "5"" of type '" "wxMouseEvent const &""'"); 
+  }
+  arg5 = reinterpret_cast< wxMouseEvent * >(argp5);

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

-    result = (wxHtmlWindowEvent *)new wxHtmlWindowEvent(arg1,arg2);
+    result = (wxHtmlCellEvent *)new wxHtmlCellEvent(arg1,arg2,arg3,(wxPoint const &)*arg4,(wxMouseEvent const &)*arg5);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlWindowEvent, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlCellEvent, SWIG_POINTER_NEW |  0 );

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

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

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

-  wxHtmlWindowEvent *arg1 = (wxHtmlWindowEvent *) 0 ;
-  wxString *arg2 = 0 ;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 0 ;
+  wxHtmlCell *result = 0 ;

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

-  bool temp2 = false ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlCellEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_GetCell" "', expected argument " "1"" of type '" "wxHtmlCellEvent const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxHtmlCell *)((wxHtmlCellEvent const *)arg1)->GetCell();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCellEvent_GetPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 0 ;
+  wxPoint 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_wxHtmlCellEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_GetPoint" "', expected argument " "1"" of type '" "wxHtmlCellEvent const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlCellEvent const *)arg1)->GetPoint();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCellEvent_GetMouseEvent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 0 ;
+  wxMouseEvent 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_wxHtmlCellEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_GetMouseEvent" "', expected argument " "1"" of type '" "wxHtmlCellEvent const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlCellEvent const *)arg1)->GetMouseEvent();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxMouseEvent(static_cast< const wxMouseEvent& >(result))), SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCellEvent_SetLinkClicked(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;

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

-    (char *) "self",(char *) "url", NULL 
+    (char *) "self",(char *) "linkclicked", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowEvent_SetURL",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowEvent, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCellEvent_SetLinkClicked",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCellEvent, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowEvent_SetURL" "', expected argument " "1"" of type '" "wxHtmlWindowEvent *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_SetLinkClicked" "', expected argument " "1"" of type '" "wxHtmlCellEvent *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxHtmlWindowEvent * >(argp1);
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HtmlCellEvent_SetLinkClicked" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
   {

-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetLinkClicked(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCellEvent_GetLinkClicked(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 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_wxHtmlCellEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_GetLinkClicked" "', expected argument " "1"" of type '" "wxHtmlCellEvent const *""'"); 

   }
   }

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

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

-    (arg1)->SetURL((wxString const &)*arg2);
+    result = (bool)((wxHtmlCellEvent const *)arg1)->GetLinkClicked();

     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:

+  return NULL;
+}
+
+
+SWIGINTERN PyObject *HtmlCellEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxHtmlCellEvent, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *HtmlCellEvent_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_HtmlLinkEvent(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  wxHtmlLinkInfo *arg2 = 0 ;
+  wxHtmlLinkEvent *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "id",(char *) "linkinfo", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_HtmlLinkEvent",kwnames,&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_HtmlLinkEvent" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxHtmlLinkInfo,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_HtmlLinkEvent" "', expected argument " "2"" of type '" "wxHtmlLinkInfo const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_HtmlLinkEvent" "', expected argument " "2"" of type '" "wxHtmlLinkInfo const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlLinkInfo * >(argp2);

   {
   {

-    if (temp2)
-    delete arg2;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxHtmlLinkEvent *)new wxHtmlLinkEvent(arg1,(wxHtmlLinkInfo const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlLinkEvent, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_HtmlWindowEvent_GetURL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HtmlLinkEvent_GetLinkInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

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

-  wxHtmlWindowEvent *arg1 = (wxHtmlWindowEvent *) 0 ;
-  wxString *result = 0 ;
+  wxHtmlLinkEvent *arg1 = (wxHtmlLinkEvent *) 0 ;
+  wxHtmlLinkInfo *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_wxHtmlWindowEvent, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlLinkEvent, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowEvent_GetURL" "', expected argument " "1"" of type '" "wxHtmlWindowEvent const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlLinkEvent_GetLinkInfo" "', expected argument " "1"" of type '" "wxHtmlLinkEvent const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxHtmlWindowEvent * >(argp1);
+  arg1 = reinterpret_cast< wxHtmlLinkEvent * >(argp1);

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

-      wxString const &_result_ref = ((wxHtmlWindowEvent const *)arg1)->GetURL();
-      result = (wxString *) &_result_ref;
+      wxHtmlLinkInfo const &_result_ref = ((wxHtmlLinkEvent const *)arg1)->GetLinkInfo();
+      result = (wxHtmlLinkInfo *) &_result_ref;

     }
     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_wxHtmlLinkInfo, 0 |  0 );

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

-SWIGINTERN PyObject *HtmlWindowEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *HtmlLinkEvent_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_wxHtmlWindowEvent, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxHtmlLinkEvent, SWIG_NewClientData(obj));

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

-SWIGINTERN PyObject *HtmlWindowEvent_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *HtmlLinkEvent_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

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


@@ -17894,11 +18075,18 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlHelpWindow_GetTreeCtrl", (PyCFunction)_wrap_HtmlHelpWindow_GetTreeCtrl, METH_O, NULL},
         { (char *)"HtmlHelpWindow_swigregister", HtmlHelpWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlHelpWindow_swiginit", HtmlHelpWindow_swiginit, METH_VARARGS, NULL},
         { (char *)"HtmlHelpWindow_GetTreeCtrl", (PyCFunction)_wrap_HtmlHelpWindow_GetTreeCtrl, METH_O, NULL},
         { (char *)"HtmlHelpWindow_swigregister", HtmlHelpWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlHelpWindow_swiginit", HtmlHelpWindow_swiginit, METH_VARARGS, NULL},

-        { (char *)"new_HtmlWindowEvent", (PyCFunction) _wrap_new_HtmlWindowEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"HtmlWindowEvent_SetURL", (PyCFunction) _wrap_HtmlWindowEvent_SetURL, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"HtmlWindowEvent_GetURL", (PyCFunction)_wrap_HtmlWindowEvent_GetURL, METH_O, NULL},
-        { (char *)"HtmlWindowEvent_swigregister", HtmlWindowEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"HtmlWindowEvent_swiginit", HtmlWindowEvent_swiginit, METH_VARARGS, NULL},
+        { (char *)"new_HtmlCellEvent", (PyCFunction) _wrap_new_HtmlCellEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlCellEvent_GetCell", (PyCFunction)_wrap_HtmlCellEvent_GetCell, METH_O, NULL},
+        { (char *)"HtmlCellEvent_GetPoint", (PyCFunction)_wrap_HtmlCellEvent_GetPoint, METH_O, NULL},
+        { (char *)"HtmlCellEvent_GetMouseEvent", (PyCFunction)_wrap_HtmlCellEvent_GetMouseEvent, METH_O, NULL},
+        { (char *)"HtmlCellEvent_SetLinkClicked", (PyCFunction) _wrap_HtmlCellEvent_SetLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlCellEvent_GetLinkClicked", (PyCFunction)_wrap_HtmlCellEvent_GetLinkClicked, METH_O, NULL},
+        { (char *)"HtmlCellEvent_swigregister", HtmlCellEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"HtmlCellEvent_swiginit", HtmlCellEvent_swiginit, METH_VARARGS, NULL},
+        { (char *)"new_HtmlLinkEvent", (PyCFunction) _wrap_new_HtmlLinkEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlLinkEvent_GetLinkInfo", (PyCFunction)_wrap_HtmlLinkEvent_GetLinkInfo, METH_O, NULL},
+        { (char *)"HtmlLinkEvent_swigregister", HtmlLinkEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"HtmlLinkEvent_swiginit", HtmlLinkEvent_swiginit, METH_VARARGS, NULL},

         { (char *)"new_HtmlHelpFrame", (PyCFunction) _wrap_new_HtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreHtmlHelpFrame", (PyCFunction) _wrap_new_PreHtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlHelpFrame_Create", (PyCFunction) _wrap_HtmlHelpFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_HtmlHelpFrame", (PyCFunction) _wrap_new_HtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreHtmlHelpFrame", (PyCFunction) _wrap_new_PreHtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlHelpFrame_Create", (PyCFunction) _wrap_HtmlHelpFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -17999,6 +18187,9 @@ static void *_p_wxScrollEventTo_p_wxEvent(void *x) {
 static void *_p_wxFindDialogEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxFindDialogEvent *) x));
 }
 static void *_p_wxFindDialogEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxFindDialogEvent *) x));
 }

+static void *_p_wxHtmlCellEventTo_p_wxEvent(void *x) {
+    return (void *)((wxEvent *) (wxCommandEvent *) ((wxHtmlCellEvent *) x));
+}

 static void *_p_wxNotifyEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxNotifyEvent *) x));
 }
 static void *_p_wxNotifyEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxNotifyEvent *) x));
 }


@@ -18062,6 +18253,9 @@ static void *_p_wxMouseCaptureChangedEventTo_p_wxEvent(void *x) {
 static void *_p_wxSysColourChangedEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxSysColourChangedEvent *) x));
 }
 static void *_p_wxSysColourChangedEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxSysColourChangedEvent *) x));
 }

+static void *_p_wxHtmlLinkEventTo_p_wxEvent(void *x) {
+    return (void *)((wxEvent *) (wxCommandEvent *) ((wxHtmlLinkEvent *) x));
+}

 static void *_p_wxDropFilesEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxDropFilesEvent *) x));
 }
 static void *_p_wxDropFilesEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxDropFilesEvent *) x));
 }


@@ -18080,9 +18274,6 @@ static void *_p_wxQueryLayoutInfoEventTo_p_wxEvent(void *x) {
 static void *_p_wxShowEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxShowEvent *) x));
 }
 static void *_p_wxShowEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxShowEvent *) x));
 }

-static void *_p_wxHtmlWindowEventTo_p_wxEvent(void *x) {
-    return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *) ((wxHtmlWindowEvent *) x));
-}

 static void *_p_wxCommandEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxCommandEvent *) x));
 }
 static void *_p_wxCommandEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxCommandEvent *) x));
 }


@@ -18119,12 +18310,6 @@ static void *_p_wxHtmlWordCellTo_p_wxHtmlCell(void *x) {
 static void *_p_wxHtmlFontCellTo_p_wxHtmlCell(void *x) {
     return (void *)((wxHtmlCell *)  ((wxHtmlFontCell *) x));
 }
 static void *_p_wxHtmlFontCellTo_p_wxHtmlCell(void *x) {
     return (void *)((wxHtmlCell *)  ((wxHtmlFontCell *) x));
 }

-static void *_p_wxHtmlWindowEventTo_p_wxNotifyEvent(void *x) {
-    return (void *)((wxNotifyEvent *)  ((wxHtmlWindowEvent *) x));
-}
-static void *_p_wxSplitterEventTo_p_wxNotifyEvent(void *x) {
-    return (void *)((wxNotifyEvent *)  ((wxSplitterEvent *) x));
-}

 static void *_p_wxSplashScreenTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x));
 }
 static void *_p_wxSplashScreenTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x));
 }


@@ -18395,6 +18580,9 @@ static void *_p_wxCloseEventTo_p_wxObject(void *x) {
 static void *_p_wxHtmlEasyPrintingTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxHtmlEasyPrinting *) x));
 }
 static void *_p_wxHtmlEasyPrintingTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxHtmlEasyPrinting *) x));
 }

+static void *_p_wxHtmlCellEventTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxHtmlCellEvent *) 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));
 }


@@ -18650,9 +18838,6 @@ static void *_p_wxJPEGHandlerTo_p_wxObject(void *x) {
 static void *_p_wxPNMHandlerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxImageHandler *) ((wxPNMHandler *) x));
 }
 static void *_p_wxPNMHandlerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxImageHandler *) ((wxPNMHandler *) x));
 }

-static void *_p_wxHtmlWindowEventTo_p_wxObject(void *x) {
-    return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *) ((wxHtmlWindowEvent *) x));
-}

 static void *_p_wxShowEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxShowEvent *) x));
 }
 static void *_p_wxShowEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxShowEvent *) x));
 }


@@ -18755,6 +18940,9 @@ static void *_p_wxPaletteChangedEventTo_p_wxObject(void *x) {
 static void *_p_wxHtmlHelpControllerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxHelpControllerBase *) ((wxHtmlHelpController *) x));
 }
 static void *_p_wxHtmlHelpControllerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxHelpControllerBase *) ((wxHtmlHelpController *) x));
 }

+static void *_p_wxHtmlLinkEventTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxHtmlLinkEvent *) x));
+}

 static void *_p_wxPanelTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxPanel *) x));
 }
 static void *_p_wxPanelTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxPanel *) x));
 }


@@ -18803,6 +18991,72 @@ static void *_p_wxHtmlWordCellTo_p_wxObject(void *x) {
 static void *_p_wxMenuBarTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x));
 }
 static void *_p_wxMenuBarTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x));
 }

+static void *_p_wxFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *)  ((wxFrame *) x));
+}
+static void *_p_wxMiniFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMiniFrame *) x));
+}
+static void *_p_wxFontDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFontDialog *) x));
+}
+static void *_p_wxDirDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxDirDialog *) x));
+}
+static void *_p_wxColourDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxColourDialog *) x));
+}
+static void *_p_wxDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *)  ((wxDialog *) x));
+}
+static void *_p_wxHtmlHelpDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxHtmlHelpDialog *) x));
+}
+static void *_p_wxSplashScreenTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxSplashScreen *) x));
+}
+static void *_p_wxMDIParentFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIParentFrame *) x));
+}
+static void *_p_wxMDIChildFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIChildFrame *) x));
+}
+static void *_p_wxMessageDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMessageDialog *) x));
+}
+static void *_p_wxNumberEntryDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxNumberEntryDialog *) x));
+}
+static void *_p_wxPasswordEntryDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x));
+}
+static void *_p_wxTextEntryDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxTextEntryDialog *) x));
+}
+static void *_p_wxSingleChoiceDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxSingleChoiceDialog *) x));
+}
+static void *_p_wxMultiChoiceDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMultiChoiceDialog *) x));
+}
+static void *_p_wxFileDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFileDialog *) x));
+}
+static void *_p_wxProgressDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxProgressDialog *) x));
+}
+static void *_p_wxFindReplaceDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFindReplaceDialog *) x));
+}
+static void *_p_wxHtmlHelpFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxHtmlHelpFrame *) x));
+}
+static void *_p_wxPreviewFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxPreviewFrame *) x));
+}
+static void *_p_wxPyPreviewFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x));
+}

 static void *_p_wxSplashScreenTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x));
 }
 static void *_p_wxSplashScreenTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x));
 }


@@ -18956,72 +19210,6 @@ static void *_p_wxPyHtmlWindowTo_p_wxScrolledWindow(void *x) {
 static void *_p_wxPreviewCanvasTo_p_wxScrolledWindow(void *x) {
     return (void *)((wxScrolledWindow *)  ((wxPreviewCanvas *) x));
 }
 static void *_p_wxPreviewCanvasTo_p_wxScrolledWindow(void *x) {
     return (void *)((wxScrolledWindow *)  ((wxPreviewCanvas *) x));
 }

-static void *_p_wxFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *)  ((wxFrame *) x));
-}
-static void *_p_wxMiniFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMiniFrame *) x));
-}
-static void *_p_wxFontDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFontDialog *) x));
-}
-static void *_p_wxDirDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxDirDialog *) x));
-}
-static void *_p_wxColourDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxColourDialog *) x));
-}
-static void *_p_wxDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *)  ((wxDialog *) x));
-}
-static void *_p_wxHtmlHelpDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxHtmlHelpDialog *) x));
-}
-static void *_p_wxSplashScreenTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxSplashScreen *) x));
-}
-static void *_p_wxMDIParentFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIParentFrame *) x));
-}
-static void *_p_wxMDIChildFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIChildFrame *) x));
-}
-static void *_p_wxMessageDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMessageDialog *) x));
-}
-static void *_p_wxNumberEntryDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxNumberEntryDialog *) x));
-}
-static void *_p_wxPasswordEntryDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x));
-}
-static void *_p_wxTextEntryDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxTextEntryDialog *) x));
-}
-static void *_p_wxSingleChoiceDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxSingleChoiceDialog *) x));
-}
-static void *_p_wxMultiChoiceDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMultiChoiceDialog *) x));
-}
-static void *_p_wxFileDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFileDialog *) x));
-}
-static void *_p_wxProgressDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxProgressDialog *) x));
-}
-static void *_p_wxFindReplaceDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFindReplaceDialog *) x));
-}
-static void *_p_wxHtmlHelpFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxHtmlHelpFrame *) x));
-}
-static void *_p_wxPreviewFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxPreviewFrame *) x));
-}
-static void *_p_wxPyPreviewFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x));
-}

 static void *_p_wxColourDialogTo_p_wxDialog(void *x) {
     return (void *)((wxDialog *)  ((wxColourDialog *) x));
 }
 static void *_p_wxColourDialogTo_p_wxDialog(void *x) {
     return (void *)((wxDialog *)  ((wxColourDialog *) x));
 }


@@ -19100,12 +19288,18 @@ static void *_p_wxSashEventTo_p_wxCommandEvent(void *x) {
 static void *_p_wxWindowDestroyEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxWindowDestroyEvent *) x));
 }
 static void *_p_wxWindowDestroyEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxWindowDestroyEvent *) x));
 }

+static void *_p_wxHtmlLinkEventTo_p_wxCommandEvent(void *x) {
+    return (void *)((wxCommandEvent *)  ((wxHtmlLinkEvent *) x));
+}

 static void *_p_wxSplitterEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *) (wxNotifyEvent *) ((wxSplitterEvent *) x));
 }
 static void *_p_wxClipboardTextEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxClipboardTextEvent *) x));
 }
 static void *_p_wxSplitterEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *) (wxNotifyEvent *) ((wxSplitterEvent *) x));
 }
 static void *_p_wxClipboardTextEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxClipboardTextEvent *) x));
 }

+static void *_p_wxHtmlCellEventTo_p_wxCommandEvent(void *x) {
+    return (void *)((wxCommandEvent *)  ((wxHtmlCellEvent *) x));
+}

 static void *_p_wxScrollEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxScrollEvent *) x));
 }
 static void *_p_wxScrollEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxScrollEvent *) x));
 }


@@ -19127,9 +19321,6 @@ static void *_p_wxWindowCreateEventTo_p_wxCommandEvent(void *x) {
 static void *_p_wxNotifyEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxNotifyEvent *) x));
 }
 static void *_p_wxNotifyEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxNotifyEvent *) x));
 }

-static void *_p_wxHtmlWindowEventTo_p_wxCommandEvent(void *x) {
-    return (void *)((wxCommandEvent *) (wxNotifyEvent *) ((wxHtmlWindowEvent *) x));
-}

 static void *_p_wxFindDialogEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxFindDialogEvent *) x));
 }
 static void *_p_wxFindDialogEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxFindDialogEvent *) x));
 }


@@ -19157,6 +19348,7 @@ static swig_type_info _swigt__p_wxContextMenuEvent = {"_p_wxContextMenuEvent", 0
 static swig_type_info _swigt__p_wxChildFocusEvent = {"_p_wxChildFocusEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxDateEvent = {"_p_wxDateEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxWindowCreateEvent = {"_p_wxWindowCreateEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxChildFocusEvent = {"_p_wxChildFocusEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxDateEvent = {"_p_wxDateEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxWindowCreateEvent = {"_p_wxWindowCreateEvent", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxFindDialogEvent = {"_p_wxFindDialogEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxUpdateUIEvent = {"_p_wxUpdateUIEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxConfigBase = {"_p_wxConfigBase", "wxConfigBase *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFindDialogEvent = {"_p_wxFindDialogEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxUpdateUIEvent = {"_p_wxUpdateUIEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxConfigBase = {"_p_wxConfigBase", "wxConfigBase *", 0, 0, (void*)0, 0};


@@ -19198,8 +19390,8 @@ static swig_type_info _swigt__p_wxPaletteChangedEvent = {"_p_wxPaletteChangedEve
 static swig_type_info _swigt__p_wxDisplayChangedEvent = {"_p_wxDisplayChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMouseCaptureChangedEvent = {"_p_wxMouseCaptureChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxSysColourChangedEvent = {"_p_wxSysColourChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxDisplayChangedEvent = {"_p_wxDisplayChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMouseCaptureChangedEvent = {"_p_wxMouseCaptureChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxSysColourChangedEvent = {"_p_wxSysColourChangedEvent", 0, 0, 0, 0, 0};

-static swig_type_info _swigt__p_wxFocusEvent = {"_p_wxFocusEvent", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxDropFilesEvent = {"_p_wxDropFilesEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxDropFilesEvent = {"_p_wxDropFilesEvent", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxFocusEvent = {"_p_wxFocusEvent", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxQueryLayoutInfoEvent = {"_p_wxQueryLayoutInfoEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxNavigationKeyEvent = {"_p_wxNavigationKeyEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxQueryLayoutInfoEvent = {"_p_wxQueryLayoutInfoEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxNavigationKeyEvent = {"_p_wxNavigationKeyEvent", 0, 0, 0, 0, 0};


@@ -19247,6 +19439,7 @@ static swig_type_info _swigt__p_wxHelpSearchMode = {"_p_wxHelpSearchMode", "wxHe
 static swig_type_info _swigt__p_wxHtmlBookRecArray = {"_p_wxHtmlBookRecArray", "wxHtmlBookRecArray *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlBookRecord = {"_p_wxHtmlBookRecord", "wxHtmlBookRecord *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlCell = {"_p_wxHtmlCell", "wxHtmlCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlBookRecArray = {"_p_wxHtmlBookRecArray", "wxHtmlBookRecArray *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlBookRecord = {"_p_wxHtmlBookRecord", "wxHtmlBookRecord *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlCell = {"_p_wxHtmlCell", "wxHtmlCell *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHtmlCellEvent = {"_p_wxHtmlCellEvent", "wxHtmlCellEvent *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlColourCell = {"_p_wxHtmlColourCell", "wxHtmlColourCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlContainerCell = {"_p_wxHtmlContainerCell", "wxHtmlContainerCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlDCRenderer = {"_p_wxHtmlDCRenderer", "wxHtmlDCRenderer *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlColourCell = {"_p_wxHtmlColourCell", "wxHtmlColourCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlContainerCell = {"_p_wxHtmlContainerCell", "wxHtmlContainerCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlDCRenderer = {"_p_wxHtmlDCRenderer", "wxHtmlDCRenderer *", 0, 0, (void*)0, 0};


@@ -19259,6 +19452,7 @@ static swig_type_info _swigt__p_wxHtmlHelpDialog = {"_p_wxHtmlHelpDialog", "wxHt
 static swig_type_info _swigt__p_wxHtmlHelpFrame = {"_p_wxHtmlHelpFrame", "wxHtmlHelpFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpFrameCfg = {"_p_wxHtmlHelpFrameCfg", "wxHtmlHelpFrameCfg *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpWindow = {"_p_wxHtmlHelpWindow", "wxHtmlHelpWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpFrame = {"_p_wxHtmlHelpFrame", "wxHtmlHelpFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpFrameCfg = {"_p_wxHtmlHelpFrameCfg", "wxHtmlHelpFrameCfg *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpWindow = {"_p_wxHtmlHelpWindow", "wxHtmlHelpWindow *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHtmlLinkEvent = {"_p_wxHtmlLinkEvent", "wxHtmlLinkEvent *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlLinkInfo = {"_p_wxHtmlLinkInfo", "wxHtmlLinkInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlModalHelp = {"_p_wxHtmlModalHelp", "wxHtmlModalHelp *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlParser = {"_p_wxHtmlParser", "wxHtmlParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlLinkInfo = {"_p_wxHtmlLinkInfo", "wxHtmlLinkInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlModalHelp = {"_p_wxHtmlModalHelp", "wxHtmlModalHelp *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlParser = {"_p_wxHtmlParser", "wxHtmlParser *", 0, 0, (void*)0, 0};


@@ -19273,11 +19467,9 @@ static swig_type_info _swigt__p_wxHtmlTagHandler = {"_p_wxHtmlTagHandler", "wxHt
 static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHtmlWidgetCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHtmlWidgetCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};

-static swig_type_info _swigt__p_wxHtmlWindowEvent = {"_p_wxHtmlWindowEvent", "wxHtmlWindowEvent *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};

-static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", "wxNotifyEvent *", 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_wxIndividualLayoutConstraint = {"_p_wxIndividualLayoutConstraint", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMenuItem = {"_p_wxMenuItem", 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_wxIndividualLayoutConstraint = {"_p_wxIndividualLayoutConstraint", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMenuItem = {"_p_wxMenuItem", 0, 0, 0, 0, 0};


@@ -19287,8 +19479,8 @@ static swig_type_info _swigt__p_wxLayoutAlgorithm = {"_p_wxLayoutAlgorithm", 0,
 static swig_type_info _swigt__p_wxFindReplaceData = {"_p_wxFindReplaceData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPrintDialogData = {"_p_wxPrintDialogData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPrinter = {"_p_wxPrinter", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxFindReplaceData = {"_p_wxFindReplaceData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPrintDialogData = {"_p_wxPrintDialogData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPrinter = {"_p_wxPrinter", 0, 0, 0, 0, 0};

-static swig_type_info _swigt__p_wxGridSizer = {"_p_wxGridSizer", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxGridSizer = {"_p_wxGridSizer", 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_wxColourData = {"_p_wxColourData", 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_wxColourData = {"_p_wxColourData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxStdDialogButtonSizer = {"_p_wxStdDialogButtonSizer", 0, 0, 0, 0, 0};


@@ -19397,6 +19589,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlBookRecArray,
   &_swigt__p_wxHtmlBookRecord,
   &_swigt__p_wxHtmlCell,
   &_swigt__p_wxHtmlBookRecArray,
   &_swigt__p_wxHtmlBookRecord,
   &_swigt__p_wxHtmlCell,

+  &_swigt__p_wxHtmlCellEvent,

   &_swigt__p_wxHtmlColourCell,
   &_swigt__p_wxHtmlContainerCell,
   &_swigt__p_wxHtmlDCRenderer,
   &_swigt__p_wxHtmlColourCell,
   &_swigt__p_wxHtmlContainerCell,
   &_swigt__p_wxHtmlDCRenderer,


@@ -19409,6 +19602,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlHelpFrame,
   &_swigt__p_wxHtmlHelpFrameCfg,
   &_swigt__p_wxHtmlHelpWindow,
   &_swigt__p_wxHtmlHelpFrame,
   &_swigt__p_wxHtmlHelpFrameCfg,
   &_swigt__p_wxHtmlHelpWindow,

+  &_swigt__p_wxHtmlLinkEvent,

   &_swigt__p_wxHtmlLinkInfo,
   &_swigt__p_wxHtmlModalHelp,
   &_swigt__p_wxHtmlParser,
   &_swigt__p_wxHtmlLinkInfo,
   &_swigt__p_wxHtmlModalHelp,
   &_swigt__p_wxHtmlParser,


@@ -19423,7 +19617,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlWidgetCell,
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlWindow,
   &_swigt__p_wxHtmlWidgetCell,
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlWindow,

-  &_swigt__p_wxHtmlWindowEvent,

   &_swigt__p_wxHtmlWindowInterface,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxHtmlWindowInterface,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,


@@ -19558,9 +19751,10 @@ static swig_cast_info _swigc__p_wxContextMenuEvent[] = {{&_swigt__p_wxContextMen
 static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxNotifyEvent[] = {{&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxFindDialogEvent[] = {{&_swigt__p_wxFindDialogEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFindDialogEvent[] = {{&_swigt__p_wxFindDialogEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxCommandEvent[] = {  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxCommandEvent, 0, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxCommandEvent[] = {  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxHtmlLinkEvent, _p_wxHtmlLinkEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxHtmlCellEvent, _p_wxHtmlCellEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxCommandEvent, 0, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxConfigBase[] = {  {&_swigt__p_wxConfigBase, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxCursor[] = {  {&_swigt__p_wxCursor, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDC[] = {  {&_swigt__p_wxDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxConfigBase[] = {  {&_swigt__p_wxConfigBase, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxCursor[] = {  {&_swigt__p_wxCursor, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDC[] = {  {&_swigt__p_wxDC, 0, 0, 0},{0, 0, 0, 0}};


@@ -19599,15 +19793,15 @@ static swig_cast_info _swigc__p_wxPaletteChangedEvent[] = {{&_swigt__p_wxPalette
 static swig_cast_info _swigc__p_wxDisplayChangedEvent[] = {{&_swigt__p_wxDisplayChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseCaptureChangedEvent[] = {{&_swigt__p_wxMouseCaptureChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSysColourChangedEvent[] = {{&_swigt__p_wxSysColourChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDisplayChangedEvent[] = {{&_swigt__p_wxDisplayChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseCaptureChangedEvent[] = {{&_swigt__p_wxMouseCaptureChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSysColourChangedEvent[] = {{&_swigt__p_wxSysColourChangedEvent, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxFocusEvent[] = {{&_swigt__p_wxFocusEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxDropFilesEvent[] = {{&_swigt__p_wxDropFilesEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDropFilesEvent[] = {{&_swigt__p_wxDropFilesEvent, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxFocusEvent[] = {{&_swigt__p_wxFocusEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxQueryLayoutInfoEvent[] = {{&_swigt__p_wxQueryLayoutInfoEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxShowEvent[] = {{&_swigt__p_wxShowEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigationKeyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxKeyEvent[] = {{&_swigt__p_wxKeyEvent, 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_wxTaskBarIconEvent[] = {{&_swigt__p_wxTaskBarIconEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxQueryLayoutInfoEvent[] = {{&_swigt__p_wxQueryLayoutInfoEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxShowEvent[] = {{&_swigt__p_wxShowEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigationKeyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxKeyEvent[] = {{&_swigt__p_wxKeyEvent, 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_wxTaskBarIconEvent[] = {{&_swigt__p_wxTaskBarIconEvent, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxEvent[] = {  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEvent, 0, 0, 0},  {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxEvent[] = {  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxHtmlCellEvent, _p_wxHtmlCellEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEvent, 0, 0, 0},  {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxHtmlLinkEvent, _p_wxHtmlLinkEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxSplashScreen[] = {{&_swigt__p_wxSplashScreen, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMiniFrame[] = {{&_swigt__p_wxMiniFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyPanel[] = {{&_swigt__p_wxPyPanel, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSplashScreen[] = {{&_swigt__p_wxSplashScreen, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMiniFrame[] = {{&_swigt__p_wxMiniFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyPanel[] = {{&_swigt__p_wxPyPanel, 0, 0, 0},{0, 0, 0, 0}};


@@ -19649,6 +19843,7 @@ static swig_cast_info _swigc__p_wxHelpSearchMode[] = {  {&_swigt__p_wxHelpSearch
 static swig_cast_info _swigc__p_wxHtmlBookRecArray[] = {  {&_swigt__p_wxHtmlBookRecArray, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlBookRecord[] = {  {&_swigt__p_wxHtmlBookRecord, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlCell[] = {  {&_swigt__p_wxHtmlCell, 0, 0, 0},  {&_swigt__p_wxHtmlContainerCell, _p_wxHtmlContainerCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlWidgetCell, _p_wxHtmlWidgetCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlColourCell, _p_wxHtmlColourCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlWordCell, _p_wxHtmlWordCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlFontCell, _p_wxHtmlFontCellTo_p_wxHtmlCell, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlBookRecArray[] = {  {&_swigt__p_wxHtmlBookRecArray, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlBookRecord[] = {  {&_swigt__p_wxHtmlBookRecord, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlCell[] = {  {&_swigt__p_wxHtmlCell, 0, 0, 0},  {&_swigt__p_wxHtmlContainerCell, _p_wxHtmlContainerCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlWidgetCell, _p_wxHtmlWidgetCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlColourCell, _p_wxHtmlColourCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlWordCell, _p_wxHtmlWordCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlFontCell, _p_wxHtmlFontCellTo_p_wxHtmlCell, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHtmlCellEvent[] = {  {&_swigt__p_wxHtmlCellEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlColourCell[] = {  {&_swigt__p_wxHtmlColourCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlContainerCell[] = {  {&_swigt__p_wxHtmlContainerCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlDCRenderer[] = {  {&_swigt__p_wxHtmlDCRenderer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlColourCell[] = {  {&_swigt__p_wxHtmlColourCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlContainerCell[] = {  {&_swigt__p_wxHtmlContainerCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlDCRenderer[] = {  {&_swigt__p_wxHtmlDCRenderer, 0, 0, 0},{0, 0, 0, 0}};


@@ -19661,6 +19856,7 @@ static swig_cast_info _swigc__p_wxHtmlHelpDialog[] = {  {&_swigt__p_wxHtmlHelpDi
 static swig_cast_info _swigc__p_wxHtmlHelpFrame[] = {  {&_swigt__p_wxHtmlHelpFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpFrameCfg[] = {  {&_swigt__p_wxHtmlHelpFrameCfg, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpWindow[] = {  {&_swigt__p_wxHtmlHelpWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpFrame[] = {  {&_swigt__p_wxHtmlHelpFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpFrameCfg[] = {  {&_swigt__p_wxHtmlHelpFrameCfg, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpWindow[] = {  {&_swigt__p_wxHtmlHelpWindow, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHtmlLinkEvent[] = {  {&_swigt__p_wxHtmlLinkEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlLinkInfo[] = {  {&_swigt__p_wxHtmlLinkInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlModalHelp[] = {  {&_swigt__p_wxHtmlModalHelp, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlParser[] = {  {&_swigt__p_wxHtmlParser, 0, 0, 0},  {&_swigt__p_wxHtmlWinParser, _p_wxHtmlWinParserTo_p_wxHtmlParser, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlLinkInfo[] = {  {&_swigt__p_wxHtmlLinkInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlModalHelp[] = {  {&_swigt__p_wxHtmlModalHelp, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlParser[] = {  {&_swigt__p_wxHtmlParser, 0, 0, 0},  {&_swigt__p_wxHtmlWinParser, _p_wxHtmlWinParserTo_p_wxHtmlParser, 0, 0},{0, 0, 0, 0}};


@@ -19675,11 +19871,9 @@ static swig_cast_info _swigc__p_wxHtmlTagHandler[] = {  {&_swigt__p_wxHtmlTagHan
 static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidgetCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidgetCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxHtmlWindowEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxNotifyEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, 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_wxMenuItem[] = {{&_swigt__p_wxMenuItem, 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_wxIndividualLayoutConstraint[] = {{&_swigt__p_wxIndividualLayoutConstraint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMenuItem[] = {{&_swigt__p_wxMenuItem, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxImage[] = {{&_swigt__p_wxImage, 0, 0, 0},{0, 0, 0, 0}};


@@ -19688,8 +19882,8 @@ static swig_cast_info _swigc__p_wxLayoutAlgorithm[] = {{&_swigt__p_wxLayoutAlgor
 static swig_cast_info _swigc__p_wxFindReplaceData[] = {{&_swigt__p_wxFindReplaceData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrintDialogData[] = {{&_swigt__p_wxPrintDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrinter[] = {{&_swigt__p_wxPrinter, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFindReplaceData[] = {{&_swigt__p_wxFindReplaceData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrintDialogData[] = {{&_swigt__p_wxPrintDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrinter[] = {{&_swigt__p_wxPrinter, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxGridSizer[] = {{&_swigt__p_wxGridSizer, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxGridSizer[] = {{&_swigt__p_wxGridSizer, 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_wxColourData[] = {{&_swigt__p_wxColourData, 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_wxColourData[] = {{&_swigt__p_wxColourData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxStdDialogButtonSizer[] = {{&_swigt__p_wxStdDialogButtonSizer, 0, 0, 0},{0, 0, 0, 0}};


@@ -19719,7 +19913,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_wxObject[] = {  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlFontCell, _p_wxHtmlFontCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlTag, _p_wxHtmlTagTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlFilter, _p_wxPyHtmlFilterTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_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_wxHtmlEasyPrinting, _p_wxHtmlEasyPrintingTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0},  {&_swigt__p_wxObject, 0, 0, 0},  {&_swigt__p_wxHtmlParser, _p_wxHtmlParserTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWinParser, _p_wxHtmlWinParserTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpFrame, _p_wxHtmlHelpFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWidgetCell, _p_wxHtmlWidgetCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourData, _p_wxColourDataTo_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_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlPrintout, _p_wxHtmlPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_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_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlContainerCell, _p_wxHtmlContainerCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpDialog, _p_wxHtmlHelpDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlWinTagHandler, _p_wxPyHtmlWinTagHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlTagHandler, _p_wxPyHtmlTagHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_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_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpWindow, _p_wxHtmlHelpWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlWindow, _p_wxPyHtmlWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxHelpControllerBase, _p_wxHelpControllerBaseTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlDCRenderer, _p_wxHtmlDCRendererTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlLinkInfo, _p_wxHtmlLinkInfoTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_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_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpController, _p_wxHtmlHelpControllerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlCell, _p_wxHtmlCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlColourCell, _p_wxHtmlColourCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWordCell, _p_wxHtmlWordCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxObject[] = {  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlFontCell, _p_wxHtmlFontCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlTag, _p_wxHtmlTagTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlFilter, _p_wxPyHtmlFilterTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_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_wxHtmlEasyPrinting, _p_wxHtmlEasyPrintingTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlCellEvent, _p_wxHtmlCellEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0},  {&_swigt__p_wxObject, 0, 0, 0},  {&_swigt__p_wxHtmlWinParser, _p_wxHtmlWinParserTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlParser, _p_wxHtmlParserTo_p_wxObject, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpFrame, _p_wxHtmlHelpFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWidgetCell, _p_wxHtmlWidgetCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourData, _p_wxColourDataTo_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_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlPrintout, _p_wxHtmlPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_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_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlContainerCell, _p_wxHtmlContainerCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpDialog, _p_wxHtmlHelpDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlWinTagHandler, _p_wxPyHtmlWinTagHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlTagHandler, _p_wxPyHtmlTagHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_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_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpWindow, _p_wxHtmlHelpWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlWindow, _p_wxPyHtmlWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxHelpControllerBase, _p_wxHelpControllerBaseTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlDCRenderer, _p_wxHtmlDCRendererTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlLinkInfo, _p_wxHtmlLinkInfoTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_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_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpController, _p_wxHtmlHelpControllerTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlLinkEvent, _p_wxHtmlLinkEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlCell, _p_wxHtmlCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlColourCell, _p_wxHtmlColourCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_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_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWordCell, _p_wxHtmlWordCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxPageSetupDialogData[] = {  {&_swigt__p_wxPageSetupDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPanel[] = {  {&_swigt__p_wxPanel, 0, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlWindow, _p_wxPyHtmlWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 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_wxPageSetupDialogData[] = {  {&_swigt__p_wxPageSetupDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPanel[] = {  {&_swigt__p_wxPanel, 0, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlWindow, _p_wxPyHtmlWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPaperSize[] = {  {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}};


@@ -19799,6 +19993,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlBookRecArray,
   _swigc__p_wxHtmlBookRecord,
   _swigc__p_wxHtmlCell,
   _swigc__p_wxHtmlBookRecArray,
   _swigc__p_wxHtmlBookRecord,
   _swigc__p_wxHtmlCell,

+  _swigc__p_wxHtmlCellEvent,

   _swigc__p_wxHtmlColourCell,
   _swigc__p_wxHtmlContainerCell,
   _swigc__p_wxHtmlDCRenderer,
   _swigc__p_wxHtmlColourCell,
   _swigc__p_wxHtmlContainerCell,
   _swigc__p_wxHtmlDCRenderer,


@@ -19811,6 +20006,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlHelpFrame,
   _swigc__p_wxHtmlHelpFrameCfg,
   _swigc__p_wxHtmlHelpWindow,
   _swigc__p_wxHtmlHelpFrame,
   _swigc__p_wxHtmlHelpFrameCfg,
   _swigc__p_wxHtmlHelpWindow,

+  _swigc__p_wxHtmlLinkEvent,

   _swigc__p_wxHtmlLinkInfo,
   _swigc__p_wxHtmlModalHelp,
   _swigc__p_wxHtmlParser,
   _swigc__p_wxHtmlLinkInfo,
   _swigc__p_wxHtmlModalHelp,
   _swigc__p_wxHtmlParser,


@@ -19825,7 +20021,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlWidgetCell,
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlWindow,
   _swigc__p_wxHtmlWidgetCell,
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlWindow,

-  _swigc__p_wxHtmlWindowEvent,

   _swigc__p_wxHtmlWindowInterface,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,
   _swigc__p_wxHtmlWindowInterface,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,


@@ -20531,6 +20726,9 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "ID_HTML_SEARCHBUTTON",SWIG_From_int(static_cast< int >(wxID_HTML_SEARCHBUTTON)));
   SWIG_Python_SetConstant(d, "ID_HTML_SEARCHCHOICE",SWIG_From_int(static_cast< int >(wxID_HTML_SEARCHCHOICE)));
   SWIG_Python_SetConstant(d, "ID_HTML_COUNTINFO",SWIG_From_int(static_cast< int >(wxID_HTML_COUNTINFO)));
   SWIG_Python_SetConstant(d, "ID_HTML_SEARCHBUTTON",SWIG_From_int(static_cast< int >(wxID_HTML_SEARCHBUTTON)));
   SWIG_Python_SetConstant(d, "ID_HTML_SEARCHCHOICE",SWIG_From_int(static_cast< int >(wxID_HTML_SEARCHCHOICE)));
   SWIG_Python_SetConstant(d, "ID_HTML_COUNTINFO",SWIG_From_int(static_cast< int >(wxID_HTML_COUNTINFO)));

+  PyDict_SetItemString(d, "wxEVT_COMMAND_HTML_CELL_CLICKED", PyInt_FromLong(wxEVT_COMMAND_HTML_CELL_CLICKED));
+  PyDict_SetItemString(d, "wxEVT_COMMAND_HTML_CELL_HOVER", PyInt_FromLong(wxEVT_COMMAND_HTML_CELL_HOVER));
+  PyDict_SetItemString(d, "wxEVT_COMMAND_HTML_LINK_CLICKED", PyInt_FromLong(wxEVT_COMMAND_HTML_LINK_CLICKED));

   
   wxPyPtrTypeMap_Add("wxHtmlTagHandler",    "wxPyHtmlTagHandler");
   wxPyPtrTypeMap_Add("wxHtmlWinTagHandler", "wxPyHtmlWinTagHandler");
   
   wxPyPtrTypeMap_Add("wxHtmlTagHandler",    "wxPyHtmlTagHandler");
   wxPyPtrTypeMap_Add("wxHtmlWinTagHandler", "wxPyHtmlWinTagHandler");

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index dbb187082060e915fa1fb0c9fe5b4e8fe87b8e62..63948ad85ed7721b7035ffbeb468e8a373f4f351 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -1569,20 +1569,47 @@ public:
     %property(TreeCtrl, GetTreeCtrl, doc="See `GetTreeCtrl`");
 };
 
     %property(TreeCtrl, GetTreeCtrl, doc="See `GetTreeCtrl`");
 };
 

+//---------------------------------------------------------------------------
+
+
+%constant wxEventType wxEVT_COMMAND_HTML_CELL_CLICKED;
+%constant wxEventType wxEVT_COMMAND_HTML_CELL_HOVER;
+%constant wxEventType wxEVT_COMMAND_HTML_LINK_CLICKED;
+

 
 

-class wxHtmlWindowEvent: public wxNotifyEvent
+class wxHtmlCellEvent : public wxCommandEvent

 {
 public:
 {
 public:

-    wxHtmlWindowEvent(wxEventType commandType = wxEVT_NULL, int id = 0):
-        wxNotifyEvent(commandType, id);
+    wxHtmlCellEvent(wxEventType commandType, int id,
+                    wxHtmlCell *cell, const wxPoint &pt,
+                    const wxMouseEvent &ev);

 
 

-    void SetURL(const wxString& url);
-    const wxString& GetURL() const;
+    wxHtmlCell* GetCell() const;
+    wxPoint GetPoint() const;
+    wxMouseEvent GetMouseEvent() const;

 
 

-    %property(URL, GetURL, SetURL, doc="See `GetURL` and `SetURL`");
+    void SetLinkClicked(bool linkclicked);
+    bool GetLinkClicked() const;

 };
 
 
 };
 
 

+class wxHtmlLinkEvent : public wxCommandEvent
+{
+public:
+    wxHtmlLinkEvent(int id, const wxHtmlLinkInfo &linkinfo);
+    
+    const wxHtmlLinkInfo &GetLinkInfo() const;
+};
+
+
+%pythoncode {
+    EVT_HTML_CELL_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_CLICKED, 1 )
+    EVT_HTML_CELL_HOVER   = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_HOVER, 1 )
+    EVT_HTML_LINK_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_LINK_CLICKED, 1 )
+}
+        
+//---------------------------------------------------------------------------
+

 
 MustHaveApp(wxHtmlHelpFrame);
 
 
 MustHaveApp(wxHtmlHelpFrame);
 

diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py
index a26bd0463a3a4843c9fbcb076a2be62e06319ab4..a81e6b84f4d992175148f1c230b9615c7e863e31 100644 (file)
--- a/wxPython/src/mac/_controls.py
+++ b/wxPython/src/mac/_controls.py
@@ -3464,6 +3464,10 @@ TOOL_STYLE_SEPARATOR = _controls_.TOOL_STYLE_SEPARATOR
 TOOL_STYLE_CONTROL = _controls_.TOOL_STYLE_CONTROL
 TB_HORIZONTAL = _controls_.TB_HORIZONTAL
 TB_VERTICAL = _controls_.TB_VERTICAL
 TOOL_STYLE_CONTROL = _controls_.TOOL_STYLE_CONTROL
 TB_HORIZONTAL = _controls_.TB_HORIZONTAL
 TB_VERTICAL = _controls_.TB_VERTICAL

+TB_TOP = _controls_.TB_TOP
+TB_LEFT = _controls_.TB_LEFT
+TB_BOTTOM = _controls_.TB_BOTTOM
+TB_RIGHT = _controls_.TB_RIGHT

 TB_3DBUTTONS = _controls_.TB_3DBUTTONS
 TB_FLAT = _controls_.TB_FLAT
 TB_DOCKABLE = _controls_.TB_DOCKABLE
 TB_3DBUTTONS = _controls_.TB_3DBUTTONS
 TB_FLAT = _controls_.TB_FLAT
 TB_DOCKABLE = _controls_.TB_DOCKABLE


@@ -3474,7 +3478,6 @@ TB_NOALIGN = _controls_.TB_NOALIGN
 TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
 TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
 TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS
 TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
 TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
 TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS

-TB_BOTTOM = _controls_.TB_BOTTOM

 class ToolBarToolBase(_core.Object):
     """Proxy of C++ ToolBarToolBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class ToolBarToolBase(_core.Object):
     """Proxy of C++ ToolBarToolBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')

diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp
index 8519e2f36702d6b44526ac9cc8f9d869a99c0f06..c21c652609e417f599a0fcfb67d107c7c450ab5b 100644 (file)
--- a/wxPython/src/mac/_controls_wrap.cpp
+++ b/wxPython/src/mac/_controls_wrap.cpp
@@ -48967,6 +48967,10 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TOOL_STYLE_CONTROL",SWIG_From_int(static_cast< int >(wxTOOL_STYLE_CONTROL)));
   SWIG_Python_SetConstant(d, "TB_HORIZONTAL",SWIG_From_int(static_cast< int >(wxTB_HORIZONTAL)));
   SWIG_Python_SetConstant(d, "TB_VERTICAL",SWIG_From_int(static_cast< int >(wxTB_VERTICAL)));
   SWIG_Python_SetConstant(d, "TOOL_STYLE_CONTROL",SWIG_From_int(static_cast< int >(wxTOOL_STYLE_CONTROL)));
   SWIG_Python_SetConstant(d, "TB_HORIZONTAL",SWIG_From_int(static_cast< int >(wxTB_HORIZONTAL)));
   SWIG_Python_SetConstant(d, "TB_VERTICAL",SWIG_From_int(static_cast< int >(wxTB_VERTICAL)));

+  SWIG_Python_SetConstant(d, "TB_TOP",SWIG_From_int(static_cast< int >(wxTB_TOP)));
+  SWIG_Python_SetConstant(d, "TB_LEFT",SWIG_From_int(static_cast< int >(wxTB_LEFT)));
+  SWIG_Python_SetConstant(d, "TB_BOTTOM",SWIG_From_int(static_cast< int >(wxTB_BOTTOM)));
+  SWIG_Python_SetConstant(d, "TB_RIGHT",SWIG_From_int(static_cast< int >(wxTB_RIGHT)));

   SWIG_Python_SetConstant(d, "TB_3DBUTTONS",SWIG_From_int(static_cast< int >(wxTB_3DBUTTONS)));
   SWIG_Python_SetConstant(d, "TB_FLAT",SWIG_From_int(static_cast< int >(wxTB_FLAT)));
   SWIG_Python_SetConstant(d, "TB_DOCKABLE",SWIG_From_int(static_cast< int >(wxTB_DOCKABLE)));
   SWIG_Python_SetConstant(d, "TB_3DBUTTONS",SWIG_From_int(static_cast< int >(wxTB_3DBUTTONS)));
   SWIG_Python_SetConstant(d, "TB_FLAT",SWIG_From_int(static_cast< int >(wxTB_FLAT)));
   SWIG_Python_SetConstant(d, "TB_DOCKABLE",SWIG_From_int(static_cast< int >(wxTB_DOCKABLE)));


@@ -48977,7 +48981,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TB_HORZ_LAYOUT",SWIG_From_int(static_cast< int >(wxTB_HORZ_LAYOUT)));
   SWIG_Python_SetConstant(d, "TB_HORZ_TEXT",SWIG_From_int(static_cast< int >(wxTB_HORZ_TEXT)));
   SWIG_Python_SetConstant(d, "TB_NO_TOOLTIPS",SWIG_From_int(static_cast< int >(wxTB_NO_TOOLTIPS)));
   SWIG_Python_SetConstant(d, "TB_HORZ_LAYOUT",SWIG_From_int(static_cast< int >(wxTB_HORZ_LAYOUT)));
   SWIG_Python_SetConstant(d, "TB_HORZ_TEXT",SWIG_From_int(static_cast< int >(wxTB_HORZ_TEXT)));
   SWIG_Python_SetConstant(d, "TB_NO_TOOLTIPS",SWIG_From_int(static_cast< int >(wxTB_NO_TOOLTIPS)));

-  SWIG_Python_SetConstant(d, "TB_BOTTOM",SWIG_From_int(static_cast< int >(wxTB_BOTTOM)));

   SWIG_addvarlink(SWIG_globals(),(char*)"ListCtrlNameStr",ListCtrlNameStr_get, ListCtrlNameStr_set);
   SWIG_Python_SetConstant(d, "LC_VRULES",SWIG_From_int(static_cast< int >(wxLC_VRULES)));
   SWIG_Python_SetConstant(d, "LC_HRULES",SWIG_From_int(static_cast< int >(wxLC_HRULES)));
   SWIG_addvarlink(SWIG_globals(),(char*)"ListCtrlNameStr",ListCtrlNameStr_get, ListCtrlNameStr_set);
   SWIG_Python_SetConstant(d, "LC_VRULES",SWIG_From_int(static_cast< int >(wxLC_VRULES)));
   SWIG_Python_SetConstant(d, "LC_HRULES",SWIG_From_int(static_cast< int >(wxLC_HRULES)));

diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py
index b4a2481d233b6b1526d8f2cb0a84b301e02bb2bf..d0a2c5e16be9190da54feebf33736d6cf4010548 100644 (file)
--- a/wxPython/src/mac/_core.py
+++ b/wxPython/src/mac/_core.py
@@ -708,6 +708,16 @@ class Object(object):
         args[0].this.own(False)
         return _core_.Object_Destroy(*args, **kwargs)
 
         args[0].this.own(False)
         return _core_.Object_Destroy(*args, **kwargs)
 

+    def IsSameAs(*args, **kwargs):
+        """
+        IsSameAs(self, Object p) -> bool
+
+        For wx.Objects that use C++ reference counting internally, this method
+        can be used to determine if two objects are referencing the same data
+        object.
+        """
+        return _core_.Object_IsSameAs(*args, **kwargs)
+

     ClassName = property(GetClassName,doc="See `GetClassName`") 
 _core_.Object_swigregister(Object)
 _wxPySetDictionary = _core_._wxPySetDictionary
     ClassName = property(GetClassName,doc="See `GetClassName`") 
 _core_.Object_swigregister(Object)
 _wxPySetDictionary = _core_._wxPySetDictionary


@@ -734,6 +744,7 @@ BITMAP_TYPE_PICT = _core_.BITMAP_TYPE_PICT
 BITMAP_TYPE_ICON = _core_.BITMAP_TYPE_ICON
 BITMAP_TYPE_ANI = _core_.BITMAP_TYPE_ANI
 BITMAP_TYPE_IFF = _core_.BITMAP_TYPE_IFF
 BITMAP_TYPE_ICON = _core_.BITMAP_TYPE_ICON
 BITMAP_TYPE_ANI = _core_.BITMAP_TYPE_ANI
 BITMAP_TYPE_IFF = _core_.BITMAP_TYPE_IFF

+BITMAP_TYPE_TGA = _core_.BITMAP_TYPE_TGA

 BITMAP_TYPE_MACCURSOR = _core_.BITMAP_TYPE_MACCURSOR
 BITMAP_TYPE_ANY = _core_.BITMAP_TYPE_ANY
 CURSOR_NONE = _core_.CURSOR_NONE
 BITMAP_TYPE_MACCURSOR = _core_.BITMAP_TYPE_MACCURSOR
 BITMAP_TYPE_ANY = _core_.BITMAP_TYPE_ANY
 CURSOR_NONE = _core_.CURSOR_NONE


@@ -8594,18 +8605,11 @@ class Window(EvtHandler):
         """
         return _core_.Window_GetBestFittingSize(*args, **kwargs)
 
         """
         return _core_.Window_GetBestFittingSize(*args, **kwargs)
 

-    def GetAdjustedBestSize(*args, **kwargs):
-        """
-        GetAdjustedBestSize(self) -> Size
-
-        This method is similar to GetBestSize, except in one
-        thing. GetBestSize should return the minimum untruncated size of the
-        window, while this method will return the largest of BestSize and any
-        user specified minimum size. ie. it is the minimum size the window
-        should currently be drawn at, not the minimal size it can possibly
-        tolerate.
-        """
-        return _core_.Window_GetAdjustedBestSize(*args, **kwargs)
+    def GetAdjustedBestSize(self):
+        s = self.GetBestSize()
+        return wx.Size(max(s.width,  self.GetMinWidth()),
+                       max(s.height, self.GetMinHeight()))
+    GetAdjustedBestSize = wx._deprecated(GetAdjustedBestSize, 'Use `GetBestFittingSize` instead.')

 
     def Center(*args, **kwargs):
         """
 
     def Center(*args, **kwargs):
         """

diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp
index 5f05a15043d99d84903f5a6a022b9696b4531e0c..4ccd9652c25ac43b7353b566d1a0702fdf011ff2 100644 (file)
--- a/wxPython/src/mac/_core_wrap.cpp
+++ b/wxPython/src/mac/_core_wrap.cpp
@@ -4510,6 +4510,50 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_Object_IsSameAs(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxObject *arg1 = (wxObject *) 0 ;
+  wxObject *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 *) "p", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Object_IsSameAs",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxObject, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Object_IsSameAs" "', expected argument " "1"" of type '" "wxObject const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxObject * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxObject,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Object_IsSameAs" "', expected argument " "2"" of type '" "wxObject const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Object_IsSameAs" "', expected argument " "2"" of type '" "wxObject const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxObject * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)((wxObject const *)arg1)->IsSameAs((wxObject 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 *Object_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *Object_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -34630,34 +34674,6 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Window_GetAdjustedBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxWindow *arg1 = (wxWindow *) 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_wxWindow, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetAdjustedBestSize" "', expected argument " "1"" of type '" "wxWindow const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxWindow * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = ((wxWindow const *)arg1)->GetAdjustedBestSize();
-    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_Window_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_Window_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;


@@ -56392,6 +56408,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS, NULL},
         { (char *)"Object_GetClassName", (PyCFunction)_wrap_Object_GetClassName, METH_O, NULL},
         { (char *)"Object_Destroy", (PyCFunction)_wrap_Object_Destroy, METH_O, NULL},
         { (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS, NULL},
         { (char *)"Object_GetClassName", (PyCFunction)_wrap_Object_GetClassName, METH_O, NULL},
         { (char *)"Object_Destroy", (PyCFunction)_wrap_Object_Destroy, METH_O, NULL},

+        { (char *)"Object_IsSameAs", (PyCFunction) _wrap_Object_IsSameAs, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"Object_swigregister", Object_swigregister, METH_VARARGS, NULL},
         { (char *)"Size_width_set", _wrap_Size_width_set, METH_VARARGS, NULL},
         { (char *)"Size_width_get", (PyCFunction)_wrap_Size_width_get, METH_O, NULL},
         { (char *)"Object_swigregister", Object_swigregister, METH_VARARGS, NULL},
         { (char *)"Size_width_set", _wrap_Size_width_set, METH_VARARGS, NULL},
         { (char *)"Size_width_get", (PyCFunction)_wrap_Size_width_get, METH_O, NULL},


@@ -57365,7 +57382,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Window_InvalidateBestSize", (PyCFunction)_wrap_Window_InvalidateBestSize, METH_O, NULL},
         { (char *)"Window_CacheBestSize", (PyCFunction) _wrap_Window_CacheBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_GetBestFittingSize", (PyCFunction)_wrap_Window_GetBestFittingSize, METH_O, NULL},
         { (char *)"Window_InvalidateBestSize", (PyCFunction)_wrap_Window_InvalidateBestSize, METH_O, NULL},
         { (char *)"Window_CacheBestSize", (PyCFunction) _wrap_Window_CacheBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_GetBestFittingSize", (PyCFunction)_wrap_Window_GetBestFittingSize, METH_O, NULL},

-        { (char *)"Window_GetAdjustedBestSize", (PyCFunction)_wrap_Window_GetAdjustedBestSize, METH_O, NULL},

         { (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_Fit", (PyCFunction)_wrap_Window_Fit, METH_O, NULL},
         { (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_Fit", (PyCFunction)_wrap_Window_Fit, METH_O, NULL},


@@ -60151,6 +60167,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ICON",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ICON)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANI",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANI)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_IFF",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_IFF)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ICON",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ICON)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANI",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANI)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_IFF",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_IFF)));

+  SWIG_Python_SetConstant(d, "BITMAP_TYPE_TGA",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_TGA)));

   SWIG_Python_SetConstant(d, "BITMAP_TYPE_MACCURSOR",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_MACCURSOR)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANY",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANY)));
   SWIG_Python_SetConstant(d, "CURSOR_NONE",SWIG_From_int(static_cast< int >(wxCURSOR_NONE)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_MACCURSOR",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_MACCURSOR)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANY",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANY)));
   SWIG_Python_SetConstant(d, "CURSOR_NONE",SWIG_From_int(static_cast< int >(wxCURSOR_NONE)));

diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py
index 78bb508be712172eb4e542c4fa66143c619c1506..90816c865809edb2f473d1d3bb585cc8025be100 100644 (file)
--- a/wxPython/src/mac/_gdi.py
+++ b/wxPython/src/mac/_gdi.py
@@ -671,6 +671,24 @@ class Bitmap(GDIObject):
         """
         return _gdi_.Bitmap_SetSize(*args, **kwargs)
 
         """
         return _gdi_.Bitmap_SetSize(*args, **kwargs)
 

+    def CopyFromBuffer(*args, **kwargs):
+        """
+        CopyFromBuffer(self, buffer data)
+
+        Copy data from a RGB buffer object to replace the bitmap pixel data.
+        See `wxBitmapFromBuffer` for more .
+        """
+        return _gdi_.Bitmap_CopyFromBuffer(*args, **kwargs)
+
+    def CopyFromBufferRGBA(*args, **kwargs):
+        """
+        CopyFromBufferRGBA(self, buffer data)
+
+        Copy data from a RGBA buffer object to replace the bitmap pixel data.
+        See `wxBitmapFromBufferRGBA` for more .
+        """
+        return _gdi_.Bitmap_CopyFromBufferRGBA(*args, **kwargs)
+

     def __nonzero__(self): return self.IsOk() 
     def __eq__(*args, **kwargs):
         """__eq__(self, Bitmap other) -> bool"""
     def __nonzero__(self): return self.IsOk() 
     def __eq__(*args, **kwargs):
         """__eq__(self, Bitmap other) -> bool"""


@@ -3366,6 +3384,10 @@ class DC(_core.Object):
         """
         return _gdi_.DC_BlitPointSize(*args, **kwargs)
 
         """
         return _gdi_.DC_BlitPointSize(*args, **kwargs)
 

+    def GetAsBitmap(*args, **kwargs):
+        """GetAsBitmap(self, Rect subrect=None) -> Bitmap"""
+        return _gdi_.DC_GetAsBitmap(*args, **kwargs)
+

     def SetClippingRegion(*args, **kwargs):
         """
         SetClippingRegion(self, int x, int y, int width, int height)
     def SetClippingRegion(*args, **kwargs):
         """
         SetClippingRegion(self, int x, int y, int width, int height)


@@ -4510,6 +4532,10 @@ class MemoryDC(DC):
         """
         return _gdi_.MemoryDC_SelectObject(*args, **kwargs)
 
         """
         return _gdi_.MemoryDC_SelectObject(*args, **kwargs)
 

+    def SelectObjectAsSource(*args, **kwargs):
+        """SelectObjectAsSource(self, Bitmap bmp)"""
+        return _gdi_.MemoryDC_SelectObjectAsSource(*args, **kwargs)
+

 _gdi_.MemoryDC_swigregister(MemoryDC)
 
 def MemoryDCFromDC(*args, **kwargs):
 _gdi_.MemoryDC_swigregister(MemoryDC)
 
 def MemoryDCFromDC(*args, **kwargs):


@@ -4993,8 +5019,10 @@ _gdi_.GraphicsFont_swigregister(GraphicsFont)
 class GraphicsMatrix(GraphicsObject):
     """Proxy of C++ GraphicsMatrix class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class GraphicsMatrix(GraphicsObject):
     """Proxy of C++ GraphicsMatrix class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')

-    def __init__(self): raise AttributeError, "No constructor defined"

     __repr__ = _swig_repr
     __repr__ = _swig_repr

+    def __init__(self, *args, **kwargs): 
+        """__init__(self) -> GraphicsMatrix"""
+        _gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs))

     __swig_destroy__ = _gdi_.delete_GraphicsMatrix
     __del__ = lambda self : None;
     def Concat(*args, **kwargs):
     __swig_destroy__ = _gdi_.delete_GraphicsMatrix
     __del__ = lambda self : None;
     def Concat(*args, **kwargs):


@@ -5099,8 +5127,10 @@ _gdi_.GraphicsMatrix_swigregister(GraphicsMatrix)
 class GraphicsPath(GraphicsObject):
     """Proxy of C++ GraphicsPath class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class GraphicsPath(GraphicsObject):
     """Proxy of C++ GraphicsPath class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')

-    def __init__(self): raise AttributeError, "No constructor defined"

     __repr__ = _swig_repr
     __repr__ = _swig_repr

+    def __init__(self, *args, **kwargs): 
+        """__init__(self) -> GraphicsPath"""
+        _gdi_.GraphicsPath_swiginit(self,_gdi_.new_GraphicsPath(*args, **kwargs))

     __swig_destroy__ = _gdi_.delete_GraphicsPath
     __del__ = lambda self : None;
     def MoveToPoint(*args):
     __swig_destroy__ = _gdi_.delete_GraphicsPath
     __del__ = lambda self : None;
     def MoveToPoint(*args):


@@ -5253,8 +5283,8 @@ class GraphicsPath(GraphicsObject):
 
     def Contains(*args):
         """
 
     def Contains(*args):
         """

-        Contains(self, Double x, Double y, int fillStyle=WINDING_RULE) -> bool
-        Contains(self, wxPoint2DDouble c, int fillStyle=WINDING_RULE) -> bool
+        Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool
+        Contains(self, wxPoint2DDouble c, int fillStyle=ODDEVEN_RULE) -> bool

         """
         return _gdi_.GraphicsPath_Contains(*args)
 
         """
         return _gdi_.GraphicsPath_Contains(*args)
 


@@ -5475,7 +5505,7 @@ class GraphicsContext(GraphicsObject):
 
     def FillPath(*args, **kwargs):
         """
 
     def FillPath(*args, **kwargs):
         """

-        FillPath(self, GraphicsPath path, int fillStyle=WINDING_RULE)
+        FillPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE)

 
         fills a path with the current brush
         """
 
         fills a path with the current brush
         """


@@ -5483,7 +5513,7 @@ class GraphicsContext(GraphicsObject):
 
     def DrawPath(*args, **kwargs):
         """
 
     def DrawPath(*args, **kwargs):
         """

-        DrawPath(self, GraphicsPath path, int fillStyle=WINDING_RULE)
+        DrawPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE)

 
         draws a path by first filling and then stroking
         """
 
         draws a path by first filling and then stroking
         """


@@ -5543,7 +5573,7 @@ class GraphicsContext(GraphicsObject):
 
     def DrawLines(*args, **kwargs):
         """
 
     def DrawLines(*args, **kwargs):
         """

-        DrawLines(self, size_t points, int fillStyle=WINDING_RULE)
+        DrawLines(self, size_t points, int fillStyle=ODDEVEN_RULE)

 
         draws a polygon
         """
 
         draws a polygon
         """

diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp
index 8e27843809d9724dc5f858188f31642663378ef1..877700f36deca5e8f634b99fe7523ade8ceda47c 100644 (file)
--- a/wxPython/src/mac/_gdi_wrap.cpp
+++ b/wxPython/src/mac/_gdi_wrap.cpp
@@ -2949,6 +2949,18 @@ SWIG_AsVal_short (PyObject * obj, short *val)
 #include <wx/rawbmp.h>
 
 
 #include <wx/rawbmp.h>
 
 

+// 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
+
+

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


@@ -2999,20 +3011,67 @@ SWIGINTERN void wxBitmap_SetSize(wxBitmap *self,wxSize const &size){
             self->SetWidth(size.x);
             self->SetHeight(size.y);
         }
             self->SetWidth(size.x);
             self->SetHeight(size.y);
         }

-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 void wxBitmap_CopyFromBuffer(wxBitmap *self,buffer data,int DATASIZE){
+            int height=self->GetHeight();
+            int width=self->GetWidth();

 
 

-// 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
+            if (DATASIZE != width * height * 3) {
+                wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
+            }
+            wxNativePixelData pixData(*self, wxPoint(0,0), wxSize(width, height));
+            if (! pixData) {
+                // raise an exception...
+                wxPyErr_SetString(PyExc_RuntimeError,
+                                  "Failed to gain raw access to bitmap data.");
+                return;
+            }

 
 

+            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);
+            }
+        }
+SWIGINTERN void wxBitmap_CopyFromBufferRGBA(wxBitmap *self,buffer data,int DATASIZE){
+            int height=self->GetHeight();
+            int width=self->GetWidth();
+            
+            if (DATASIZE != width * height * 4) {
+                wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
+            }
+            wxAlphaPixelData pixData(*self, wxPoint(0,0), wxSize(width, height));
+            if (! pixData) {
+                // raise an exception...
+                wxPyErr_SetString(PyExc_RuntimeError,
+                                  "Failed to gain raw access to bitmap data.");
+                return;
+            }
+
+            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);
+            }
+        }
+SWIGINTERN bool wxBitmap___eq__(wxBitmap *self,wxBitmap const *other){ return other ? self->IsSameAs(*other) : false; }
+SWIGINTERN bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? !self->IsSameAs(*other) : true;  }

 
     wxBitmap* _BitmapFromBufferAlpha(int width, int height,
                                     buffer data, int DATASIZE,
 
     wxBitmap* _BitmapFromBufferAlpha(int width, int height,
                                     buffer data, int DATASIZE,


@@ -6934,6 +6993,76 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_Bitmap_CopyFromBuffer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxBitmap *arg1 = (wxBitmap *) 0 ;
+  buffer arg2 ;
+  int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  Py_ssize_t temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "data", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_CopyFromBuffer",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 '" "Bitmap_CopyFromBuffer" "', expected argument " "1"" of type '" "wxBitmap *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  {
+    if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail;
+    arg3 = (int)temp2;
+  }
+  {
+    wxBitmap_CopyFromBuffer(arg1,arg2,arg3);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Bitmap_CopyFromBufferRGBA(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxBitmap *arg1 = (wxBitmap *) 0 ;
+  buffer arg2 ;
+  int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  Py_ssize_t temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "data", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_CopyFromBufferRGBA",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 '" "Bitmap_CopyFromBufferRGBA" "', expected argument " "1"" of type '" "wxBitmap *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  {
+    if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail;
+    arg3 = (int)temp2;
+  }
+  {
+    wxBitmap_CopyFromBufferRGBA(arg1,arg2,arg3);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_Bitmap___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBitmap *arg1 = (wxBitmap *) 0 ;
 SWIGINTERN PyObject *_wrap_Bitmap___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBitmap *arg1 = (wxBitmap *) 0 ;


@@ -19662,6 +19791,47 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_DC_GetAsBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxDC *arg1 = (wxDC *) 0 ;
+  wxRect *arg2 = (wxRect *) NULL ;
+  SwigValueWrapper<wxBitmap > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "subrect", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DC_GetAsBitmap",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_GetAsBitmap" "', expected argument " "1"" of type '" "wxDC const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDC * >(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 '" "DC_GetAsBitmap" "', expected argument " "2"" of type '" "wxRect const *""'"); 
+    }
+    arg2 = reinterpret_cast< wxRect * >(argp2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxDC const *)arg1)->GetAsBitmap((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 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_DC_SetClippingRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;
 SWIGINTERN PyObject *_wrap_DC_SetClippingRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;


@@ -23730,7 +23900,7 @@ SWIGINTERN PyObject *DCClipper_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
 
 SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
 
 SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;

-  wxBitmap const &arg1_defvalue = wxNullBitmap ;
+  wxBitmap &arg1_defvalue = wxNullBitmap ;

   wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ;
   wxMemoryDC *result = 0 ;
   void *argp1 = 0 ;
   wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ;
   wxMemoryDC *result = 0 ;
   void *argp1 = 0 ;


@@ -23742,19 +23912,19 @@ SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail;
   if (obj0) {
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail;
   if (obj0) {

-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0  | 0);
+    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0 );

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

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

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

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

     }
     arg1 = reinterpret_cast< wxBitmap * >(argp1);
   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     arg1 = reinterpret_cast< wxBitmap * >(argp1);
   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxMemoryDC *)new wxMemoryDC((wxBitmap const &)*arg1);
+    result = (wxMemoryDC *)new wxMemoryDC(*arg1);

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


@@ -23816,17 +23986,58 @@ SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); 
   }
   arg1 = reinterpret_cast< wxMemoryDC * >(argp1);
     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 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SelectObject(*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_MemoryDC_SelectObjectAsSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxMemoryDC *arg1 = (wxMemoryDC *) 0 ;
+  wxBitmap *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 *) "bmp", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObjectAsSource",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObjectAsSource" "', 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)) {
   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(res2), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 

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

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

   }
   arg2 = reinterpret_cast< wxBitmap * >(argp2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg2 = reinterpret_cast< wxBitmap * >(argp2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SelectObject((wxBitmap const &)*arg2);
+    (arg1)->SelectObjectAsSource((wxBitmap const &)*arg2);

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


@@ -25360,6 +25571,22 @@ SWIGINTERN PyObject *GraphicsFont_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObj
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

+SWIGINTERN PyObject *_wrap_new_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGraphicsMatrix *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_GraphicsMatrix",0,0,0)) SWIG_fail;
+  {
+    result = (wxGraphicsMatrix *)new wxGraphicsMatrix();
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsMatrix, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_delete_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ;
 SWIGINTERN PyObject *_wrap_delete_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ;


@@ -25636,11 +25863,11 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_IsIdentity(PyObject *SWIGUNUSEDPARM(se
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_IsIdentity" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_IsIdentity" "', expected argument " "1"" of type '" "wxGraphicsMatrix const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1);
   {

-    result = (bool)(arg1)->IsIdentity();
+    result = (bool)((wxGraphicsMatrix const *)arg1)->IsIdentity();

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


@@ -25799,7 +26026,7 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_TransformPoint(PyObject *SWIGUNUSEDPAR
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsMatrix_TransformPoint",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsMatrix_TransformPoint",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_TransformPoint" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_TransformPoint" "', expected argument " "1"" of type '" "wxGraphicsMatrix const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1);
   if (!(SWIG_IsOK((res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2),SWIGTYPE_p_double,0))))) {
   }
   arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1);
   if (!(SWIG_IsOK((res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2),SWIGTYPE_p_double,0))))) {


@@ -25823,7 +26050,7 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_TransformPoint(PyObject *SWIGUNUSEDPAR
     res3 = SWIG_AddTmpMask(ecode);
   }
   {
     res3 = SWIG_AddTmpMask(ecode);
   }
   {

-    (arg1)->TransformPoint(arg2,arg3);
+    ((wxGraphicsMatrix const *)arg1)->TransformPoint(arg2,arg3);

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


@@ -25866,7 +26093,7 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_TransformDistance(PyObject *SWIGUNUSED
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsMatrix_TransformDistance",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsMatrix_TransformDistance",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_TransformDistance" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_TransformDistance" "', expected argument " "1"" of type '" "wxGraphicsMatrix const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1);
   if (!(SWIG_IsOK((res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2),SWIGTYPE_p_double,0))))) {
   }
   arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1);
   if (!(SWIG_IsOK((res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2),SWIGTYPE_p_double,0))))) {


@@ -25890,7 +26117,7 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_TransformDistance(PyObject *SWIGUNUSED
     res3 = SWIG_AddTmpMask(ecode);
   }
   {
     res3 = SWIG_AddTmpMask(ecode);
   }
   {

-    (arg1)->TransformDistance(arg2,arg3);
+    ((wxGraphicsMatrix const *)arg1)->TransformDistance(arg2,arg3);

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


@@ -25945,6 +26172,29 @@ SWIGINTERN PyObject *GraphicsMatrix_swigregister(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

+SWIGINTERN PyObject *GraphicsMatrix_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGraphicsPath *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_GraphicsPath",0,0,0)) SWIG_fail;
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxGraphicsPath *)new wxGraphicsPath();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsPath, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_delete_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
 SWIGINTERN PyObject *_wrap_delete_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;


@@ -26352,11 +26602,11 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_GetCurrentPoint(PyObject *SWIGUNUSEDPARM
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_GetCurrentPoint" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_GetCurrentPoint" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   {

-    result = (arg1)->GetCurrentPoint();
+    result = ((wxGraphicsPath const *)arg1)->GetCurrentPoint();

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


@@ -26946,7 +27196,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_UnGetNativePath(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsPath_UnGetNativePath",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsPath_UnGetNativePath",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_UnGetNativePath" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_UnGetNativePath" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);


@@ -26954,7 +27204,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_UnGetNativePath(PyObject *SWIGUNUSEDPARM
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsPath_UnGetNativePath" "', expected argument " "2"" of type '" "void *""'"); 
   }
   {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsPath_UnGetNativePath" "', expected argument " "2"" of type '" "void *""'"); 
   }
   {

-    (arg1)->UnGetNativePath(arg2);
+    ((wxGraphicsPath const *)arg1)->UnGetNativePath(arg2);

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


@@ -27015,11 +27265,11 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), P
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_GetBox" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_GetBox" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   {

-    result = (arg1)->GetBox();
+    result = ((wxGraphicsPath const *)arg1)->GetBox();

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


@@ -27034,7 +27284,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_0(PyObject *SWIGUNUSEDPAR
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
   wxDouble arg2 ;
   wxDouble arg3 ;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
   wxDouble arg2 ;
   wxDouble arg3 ;

-  int arg4 = (int) wxWINDING_RULE ;
+  int arg4 = (int) wxODDEVEN_RULE ;

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


@@ -27048,7 +27298,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_0(PyObject *SWIGUNUSEDPAR
   if ((nobjs < 3) || (nobjs > 4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if ((nobjs < 3) || (nobjs > 4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);


@@ -27069,7 +27319,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_0(PyObject *SWIGUNUSEDPAR
     arg4 = static_cast< int >(val4);
   }
   {
     arg4 = static_cast< int >(val4);
   }
   {

-    result = (bool)(arg1)->Contains(arg2,arg3,arg4);
+    result = (bool)((wxGraphicsPath const *)arg1)->Contains(arg2,arg3,arg4);

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


@@ -27085,7 +27335,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
   wxPoint2DDouble *arg2 = 0 ;
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
   wxPoint2DDouble *arg2 = 0 ;

-  int arg3 = (int) wxWINDING_RULE ;
+  int arg3 = (int) wxODDEVEN_RULE ;

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


@@ -27097,7 +27347,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR
   if ((nobjs < 2) || (nobjs > 3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if ((nobjs < 2) || (nobjs > 3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxPoint2DDouble,  0  | 0);
   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxPoint2DDouble,  0  | 0);


@@ -27116,7 +27366,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR
     arg3 = static_cast< int >(val3);
   }
   {
     arg3 = static_cast< int >(val3);
   }
   {

-    result = (bool)(arg1)->Contains((wxPoint2DDouble const &)*arg2,arg3);
+    result = (bool)((wxGraphicsPath const *)arg1)->Contains((wxPoint2DDouble const &)*arg2,arg3);

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


@@ -27171,6 +27421,10 @@ SWIGINTERN PyObject *GraphicsPath_swigregister(PyObject *SWIGUNUSEDPARM(self), P
   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

+SWIGINTERN PyObject *GraphicsPath_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+

 SWIGINTERN int NullGraphicsPen_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NullGraphicsPen is read-only.");
   return 1;
 SWIGINTERN int NullGraphicsPen_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NullGraphicsPen is read-only.");
   return 1;


@@ -28582,7 +28836,7 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_FillPath(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ;
   wxGraphicsPath *arg2 = 0 ;
   PyObject *resultobj = 0;
   wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ;
   wxGraphicsPath *arg2 = 0 ;

-  int arg3 = (int) wxWINDING_RULE ;
+  int arg3 = (int) wxODDEVEN_RULE ;

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


@@ -28632,7 +28886,7 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_DrawPath(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ;
   wxGraphicsPath *arg2 = 0 ;
   PyObject *resultobj = 0;
   wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ;
   wxGraphicsPath *arg2 = 0 ;

-  int arg3 = (int) wxWINDING_RULE ;
+  int arg3 = (int) wxODDEVEN_RULE ;

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


@@ -29273,7 +29527,7 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_DrawLines(PyObject *SWIGUNUSEDPARM(se
   wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ;
   size_t arg2 ;
   wxPoint2D *arg3 = (wxPoint2D *) 0 ;
   wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ;
   size_t arg2 ;
   wxPoint2D *arg3 = (wxPoint2D *) 0 ;

-  int arg4 = (int) wxWINDING_RULE ;
+  int arg4 = (int) wxODDEVEN_RULE ;

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


@@ -38133,6 +38387,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Bitmap_SetWidth", (PyCFunction) _wrap_Bitmap_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetSize", (PyCFunction) _wrap_Bitmap_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetWidth", (PyCFunction) _wrap_Bitmap_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetSize", (PyCFunction) _wrap_Bitmap_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"Bitmap_CopyFromBuffer", (PyCFunction) _wrap_Bitmap_CopyFromBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Bitmap_CopyFromBufferRGBA", (PyCFunction) _wrap_Bitmap_CopyFromBufferRGBA, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS, NULL},
         { (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS, NULL},


@@ -38474,6 +38730,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DC_DrawRotatedTextPoint", (PyCFunction) _wrap_DC_DrawRotatedTextPoint, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_Blit", (PyCFunction) _wrap_DC_Blit, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_BlitPointSize", (PyCFunction) _wrap_DC_BlitPointSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_DrawRotatedTextPoint", (PyCFunction) _wrap_DC_DrawRotatedTextPoint, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_Blit", (PyCFunction) _wrap_DC_Blit, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_BlitPointSize", (PyCFunction) _wrap_DC_BlitPointSize, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"DC_GetAsBitmap", (PyCFunction) _wrap_DC_GetAsBitmap, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -38583,6 +38840,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"MemoryDC_SelectObjectAsSource", (PyCFunction) _wrap_MemoryDC_SelectObjectAsSource, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL},
         { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL},
         { (char *)"new_ScreenDC", (PyCFunction)_wrap_new_ScreenDC, METH_NOARGS, NULL},
         { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL},
         { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL},
         { (char *)"new_ScreenDC", (PyCFunction)_wrap_new_ScreenDC, METH_NOARGS, NULL},


@@ -38656,6 +38914,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"delete_GraphicsFont", (PyCFunction)_wrap_delete_GraphicsFont, METH_O, NULL},
         { (char *)"GraphicsFont_swigregister", GraphicsFont_swigregister, METH_VARARGS, NULL},
         { (char *)"GraphicsFont_swiginit", GraphicsFont_swiginit, METH_VARARGS, NULL},
         { (char *)"delete_GraphicsFont", (PyCFunction)_wrap_delete_GraphicsFont, METH_O, NULL},
         { (char *)"GraphicsFont_swigregister", GraphicsFont_swigregister, METH_VARARGS, NULL},
         { (char *)"GraphicsFont_swiginit", GraphicsFont_swiginit, METH_VARARGS, NULL},

+        { (char *)"new_GraphicsMatrix", (PyCFunction)_wrap_new_GraphicsMatrix, METH_NOARGS, NULL},

         { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL},
         { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GraphicsMatrix_Copy", (PyCFunction) _wrap_GraphicsMatrix_Copy, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL},
         { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GraphicsMatrix_Copy", (PyCFunction) _wrap_GraphicsMatrix_Copy, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -38670,6 +38929,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GraphicsMatrix_TransformDistance", (PyCFunction) _wrap_GraphicsMatrix_TransformDistance, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GraphicsMatrix_GetNativeMatrix", (PyCFunction)_wrap_GraphicsMatrix_GetNativeMatrix, METH_O, NULL},
         { (char *)"GraphicsMatrix_swigregister", GraphicsMatrix_swigregister, METH_VARARGS, NULL},
         { (char *)"GraphicsMatrix_TransformDistance", (PyCFunction) _wrap_GraphicsMatrix_TransformDistance, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GraphicsMatrix_GetNativeMatrix", (PyCFunction)_wrap_GraphicsMatrix_GetNativeMatrix, METH_O, NULL},
         { (char *)"GraphicsMatrix_swigregister", GraphicsMatrix_swigregister, METH_VARARGS, NULL},

+        { (char *)"GraphicsMatrix_swiginit", GraphicsMatrix_swiginit, METH_VARARGS, NULL},
+        { (char *)"new_GraphicsPath", (PyCFunction)_wrap_new_GraphicsPath, METH_NOARGS, NULL},

         { (char *)"delete_GraphicsPath", (PyCFunction)_wrap_delete_GraphicsPath, METH_O, NULL},
         { (char *)"GraphicsPath_MoveToPoint", _wrap_GraphicsPath_MoveToPoint, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_AddLineToPoint", _wrap_GraphicsPath_AddLineToPoint, METH_VARARGS, NULL},
         { (char *)"delete_GraphicsPath", (PyCFunction)_wrap_delete_GraphicsPath, METH_O, NULL},
         { (char *)"GraphicsPath_MoveToPoint", _wrap_GraphicsPath_MoveToPoint, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_AddLineToPoint", _wrap_GraphicsPath_AddLineToPoint, METH_VARARGS, NULL},


@@ -38690,6 +38951,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GraphicsPath_GetBox", (PyCFunction)_wrap_GraphicsPath_GetBox, METH_O, NULL},
         { (char *)"GraphicsPath_Contains", _wrap_GraphicsPath_Contains, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_GetBox", (PyCFunction)_wrap_GraphicsPath_GetBox, METH_O, NULL},
         { (char *)"GraphicsPath_Contains", _wrap_GraphicsPath_Contains, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL},

+        { (char *)"GraphicsPath_swiginit", GraphicsPath_swiginit, METH_VARARGS, NULL},

         { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL},
         { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL},
         { (char *)"GraphicsContext_CreateFromNative", (PyCFunction) _wrap_GraphicsContext_CreateFromNative, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL},
         { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL},
         { (char *)"GraphicsContext_CreateFromNative", (PyCFunction) _wrap_GraphicsContext_CreateFromNative, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py
index ad5eaba23c378feadbe348414b580caa45054190..40d2696f9906be67a2a232668a4e3da102c852a9 100644 (file)
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -1886,6 +1886,16 @@ class Process(_core.EvtHandler):
         _misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))
         self._setCallbackInfo(self, Process)
 
         _misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))
         self._setCallbackInfo(self, Process)
 

+    __swig_destroy__ = _misc_.delete_Process
+    __del__ = lambda self : None;
+    def GetPid(*args, **kwargs):
+        """
+        GetPid(self) -> long
+
+        get the process ID of the process executed by Open()
+        """
+        return _misc_.Process_GetPid(*args, **kwargs)
+

     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.Process__setCallbackInfo(*args, **kwargs)
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.Process__setCallbackInfo(*args, **kwargs)


@@ -3369,6 +3379,7 @@ class DateTime(object):
     GMT10 = _misc_.DateTime_GMT10
     GMT11 = _misc_.DateTime_GMT11
     GMT12 = _misc_.DateTime_GMT12
     GMT10 = _misc_.DateTime_GMT10
     GMT11 = _misc_.DateTime_GMT11
     GMT12 = _misc_.DateTime_GMT12

+    GMT13 = _misc_.DateTime_GMT13

     WET = _misc_.DateTime_WET
     WEST = _misc_.DateTime_WEST
     CET = _misc_.DateTime_CET
     WET = _misc_.DateTime_WET
     WEST = _misc_.DateTime_WEST
     CET = _misc_.DateTime_CET


@@ -3394,6 +3405,8 @@ class DateTime(object):
     A_CST = _misc_.DateTime_A_CST
     A_EST = _misc_.DateTime_A_EST
     A_ESST = _misc_.DateTime_A_ESST
     A_CST = _misc_.DateTime_A_CST
     A_EST = _misc_.DateTime_A_EST
     A_ESST = _misc_.DateTime_A_ESST

+    NZST = _misc_.DateTime_NZST
+    NZDT = _misc_.DateTime_NZDT

     UTC = _misc_.DateTime_UTC
     Gregorian = _misc_.DateTime_Gregorian
     Julian = _misc_.DateTime_Julian
     UTC = _misc_.DateTime_UTC
     Gregorian = _misc_.DateTime_Gregorian
     Julian = _misc_.DateTime_Julian

diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp
index f5d4dec4620cf761632a5ac867685e183edd5e75..4ddb3c01056b337c1361e6e7146ec0b29c480bf1 100644 (file)
--- a/wxPython/src/mac/_misc_wrap.cpp
+++ b/wxPython/src/mac/_misc_wrap.cpp
@@ -14407,6 +14407,62 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_delete_Process(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyProcess *arg1 = (wxPyProcess *) 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_wxPyProcess, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Process" "', expected argument " "1"" of type '" "wxPyProcess *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyProcess * >(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_Process_GetPid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyProcess *arg1 = (wxPyProcess *) 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_wxPyProcess, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Process_GetPid" "', expected argument " "1"" of type '" "wxPyProcess const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyProcess * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (long)((wxPyProcess const *)arg1)->GetPid();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_long(static_cast< long >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_Process__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPyProcess *arg1 = (wxPyProcess *) 0 ;
 SWIGINTERN PyObject *_wrap_Process__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPyProcess *arg1 = (wxPyProcess *) 0 ;


@@ -39427,6 +39483,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Process_Exists", (PyCFunction) _wrap_Process_Exists, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Open", (PyCFunction) _wrap_Process_Open, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_Process", (PyCFunction) _wrap_new_Process, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Exists", (PyCFunction) _wrap_Process_Exists, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Open", (PyCFunction) _wrap_Process_Open, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_Process", (PyCFunction) _wrap_new_Process, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"delete_Process", (PyCFunction)_wrap_delete_Process, METH_O, NULL},
+        { (char *)"Process_GetPid", (PyCFunction)_wrap_Process_GetPid, METH_O, NULL},

         { (char *)"Process__setCallbackInfo", (PyCFunction) _wrap_Process__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_OnTerminate", (PyCFunction) _wrap_Process_OnTerminate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Redirect", (PyCFunction)_wrap_Process_Redirect, METH_O, NULL},
         { (char *)"Process__setCallbackInfo", (PyCFunction) _wrap_Process__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_OnTerminate", (PyCFunction) _wrap_Process_OnTerminate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Redirect", (PyCFunction)_wrap_Process_Redirect, METH_O, NULL},


@@ -42163,6 +42221,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "DateTime_GMT10",SWIG_From_int(static_cast< int >(wxDateTime::GMT10)));
   SWIG_Python_SetConstant(d, "DateTime_GMT11",SWIG_From_int(static_cast< int >(wxDateTime::GMT11)));
   SWIG_Python_SetConstant(d, "DateTime_GMT12",SWIG_From_int(static_cast< int >(wxDateTime::GMT12)));
   SWIG_Python_SetConstant(d, "DateTime_GMT10",SWIG_From_int(static_cast< int >(wxDateTime::GMT10)));
   SWIG_Python_SetConstant(d, "DateTime_GMT11",SWIG_From_int(static_cast< int >(wxDateTime::GMT11)));
   SWIG_Python_SetConstant(d, "DateTime_GMT12",SWIG_From_int(static_cast< int >(wxDateTime::GMT12)));

+  SWIG_Python_SetConstant(d, "DateTime_GMT13",SWIG_From_int(static_cast< int >(wxDateTime::GMT13)));

   SWIG_Python_SetConstant(d, "DateTime_WET",SWIG_From_int(static_cast< int >(wxDateTime::WET)));
   SWIG_Python_SetConstant(d, "DateTime_WEST",SWIG_From_int(static_cast< int >(wxDateTime::WEST)));
   SWIG_Python_SetConstant(d, "DateTime_CET",SWIG_From_int(static_cast< int >(wxDateTime::CET)));
   SWIG_Python_SetConstant(d, "DateTime_WET",SWIG_From_int(static_cast< int >(wxDateTime::WET)));
   SWIG_Python_SetConstant(d, "DateTime_WEST",SWIG_From_int(static_cast< int >(wxDateTime::WEST)));
   SWIG_Python_SetConstant(d, "DateTime_CET",SWIG_From_int(static_cast< int >(wxDateTime::CET)));


@@ -42188,6 +42247,8 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "DateTime_A_CST",SWIG_From_int(static_cast< int >(wxDateTime::A_CST)));
   SWIG_Python_SetConstant(d, "DateTime_A_EST",SWIG_From_int(static_cast< int >(wxDateTime::A_EST)));
   SWIG_Python_SetConstant(d, "DateTime_A_ESST",SWIG_From_int(static_cast< int >(wxDateTime::A_ESST)));
   SWIG_Python_SetConstant(d, "DateTime_A_CST",SWIG_From_int(static_cast< int >(wxDateTime::A_CST)));
   SWIG_Python_SetConstant(d, "DateTime_A_EST",SWIG_From_int(static_cast< int >(wxDateTime::A_EST)));
   SWIG_Python_SetConstant(d, "DateTime_A_ESST",SWIG_From_int(static_cast< int >(wxDateTime::A_ESST)));

+  SWIG_Python_SetConstant(d, "DateTime_NZST",SWIG_From_int(static_cast< int >(wxDateTime::NZST)));
+  SWIG_Python_SetConstant(d, "DateTime_NZDT",SWIG_From_int(static_cast< int >(wxDateTime::NZDT)));

   SWIG_Python_SetConstant(d, "DateTime_UTC",SWIG_From_int(static_cast< int >(wxDateTime::UTC)));
   SWIG_Python_SetConstant(d, "DateTime_Gregorian",SWIG_From_int(static_cast< int >(wxDateTime::Gregorian)));
   SWIG_Python_SetConstant(d, "DateTime_Julian",SWIG_From_int(static_cast< int >(wxDateTime::Julian)));
   SWIG_Python_SetConstant(d, "DateTime_UTC",SWIG_From_int(static_cast< int >(wxDateTime::UTC)));
   SWIG_Python_SetConstant(d, "DateTime_Gregorian",SWIG_From_int(static_cast< int >(wxDateTime::Gregorian)));
   SWIG_Python_SetConstant(d, "DateTime_Julian",SWIG_From_int(static_cast< int >(wxDateTime::Julian)));

diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py
index 74cb59e11c4d525cdeb2e595608da7f5f1d98e84..03e553b376ff4bd9ccb775cadf9a5d096176d0e9 100644 (file)
--- a/wxPython/src/mac/_windows.py
+++ b/wxPython/src/mac/_windows.py
@@ -3875,6 +3875,10 @@ class PrintData(_core.Object):
         """GetPrintMode(self) -> int"""
         return _windows_.PrintData_GetPrintMode(*args, **kwargs)
 
         """GetPrintMode(self) -> int"""
         return _windows_.PrintData_GetPrintMode(*args, **kwargs)
 

+    def GetMedia(*args, **kwargs):
+        """GetMedia(self) -> int"""
+        return _windows_.PrintData_GetMedia(*args, **kwargs)
+

     def SetNoCopies(*args, **kwargs):
         """SetNoCopies(self, int v)"""
         return _windows_.PrintData_SetNoCopies(*args, **kwargs)
     def SetNoCopies(*args, **kwargs):
         """SetNoCopies(self, int v)"""
         return _windows_.PrintData_SetNoCopies(*args, **kwargs)


@@ -3919,6 +3923,10 @@ class PrintData(_core.Object):
         """SetPrintMode(self, int printMode)"""
         return _windows_.PrintData_SetPrintMode(*args, **kwargs)
 
         """SetPrintMode(self, int printMode)"""
         return _windows_.PrintData_SetPrintMode(*args, **kwargs)
 

+    def SetMedia(*args, **kwargs):
+        """SetMedia(self, int media)"""
+        return _windows_.PrintData_SetMedia(*args, **kwargs)
+

     def GetFilename(*args, **kwargs):
         """GetFilename(self) -> String"""
         return _windows_.PrintData_GetFilename(*args, **kwargs)
     def GetFilename(*args, **kwargs):
         """GetFilename(self) -> String"""
         return _windows_.PrintData_GetFilename(*args, **kwargs)

diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp
index b6651cc034d612f7d78e4c45d16f3a5d5b762ca9..7a95a5e7b628deb773870d92aec816a089174623 100644 (file)
--- a/wxPython/src/mac/_windows_wrap.cpp
+++ b/wxPython/src/mac/_windows_wrap.cpp
@@ -23937,6 +23937,34 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_PrintData_GetMedia(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPrintData *arg1 = (wxPrintData *) 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_wxPrintData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetMedia" "', expected argument " "1"" of type '" "wxPrintData const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxPrintData const *)arg1)->GetMedia();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_PrintData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
 SWIGINTERN PyObject *_wrap_PrintData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;


@@ -24360,6 +24388,44 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_PrintData_SetMedia(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPrintData *arg1 = (wxPrintData *) 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 *) "media", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetMedia",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetMedia" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetMedia" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetMedia(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_PrintData_GetFilename(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
 SWIGINTERN PyObject *_wrap_PrintData_GetFilename(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;


@@ -31839,6 +31905,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PrintData_GetQuality", (PyCFunction)_wrap_PrintData_GetQuality, METH_O, NULL},
         { (char *)"PrintData_GetBin", (PyCFunction)_wrap_PrintData_GetBin, METH_O, NULL},
         { (char *)"PrintData_GetPrintMode", (PyCFunction)_wrap_PrintData_GetPrintMode, METH_O, NULL},
         { (char *)"PrintData_GetQuality", (PyCFunction)_wrap_PrintData_GetQuality, METH_O, NULL},
         { (char *)"PrintData_GetBin", (PyCFunction)_wrap_PrintData_GetBin, METH_O, NULL},
         { (char *)"PrintData_GetPrintMode", (PyCFunction)_wrap_PrintData_GetPrintMode, METH_O, NULL},

+        { (char *)"PrintData_GetMedia", (PyCFunction)_wrap_PrintData_GetMedia, METH_O, NULL},

         { (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -31850,6 +31917,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetBin", (PyCFunction) _wrap_PrintData_SetBin, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetBin", (PyCFunction) _wrap_PrintData_SetBin, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"PrintData_SetMedia", (PyCFunction) _wrap_PrintData_SetMedia, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"PrintData_GetFilename", (PyCFunction)_wrap_PrintData_GetFilename, METH_O, NULL},
         { (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_GetPrivData", (PyCFunction)_wrap_PrintData_GetPrivData, METH_O, NULL},
         { (char *)"PrintData_GetFilename", (PyCFunction)_wrap_PrintData_GetFilename, METH_O, NULL},
         { (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_GetPrivData", (PyCFunction)_wrap_PrintData_GetPrivData, METH_O, NULL},

diff --git a/wxPython/src/mac/aui.py b/wxPython/src/mac/aui.py
index 5d560cbf1239dfae6ed2cbbbc27f364a499867b5..8409a53e2adbf4792992d6b373de4b69bd1e06f2 100644 (file)
--- a/wxPython/src/mac/aui.py
+++ b/wxPython/src/mac/aui.py
@@ -194,6 +194,20 @@ AUI_GRADIENT_HORIZONTAL = _aui.AUI_GRADIENT_HORIZONTAL
 AUI_BUTTON_STATE_NORMAL = _aui.AUI_BUTTON_STATE_NORMAL
 AUI_BUTTON_STATE_HOVER = _aui.AUI_BUTTON_STATE_HOVER
 AUI_BUTTON_STATE_PRESSED = _aui.AUI_BUTTON_STATE_PRESSED
 AUI_BUTTON_STATE_NORMAL = _aui.AUI_BUTTON_STATE_NORMAL
 AUI_BUTTON_STATE_HOVER = _aui.AUI_BUTTON_STATE_HOVER
 AUI_BUTTON_STATE_PRESSED = _aui.AUI_BUTTON_STATE_PRESSED

+AUI_BUTTON_STATE_DISABLED = _aui.AUI_BUTTON_STATE_DISABLED
+AUI_BUTTON_STATE_HIDDEN = _aui.AUI_BUTTON_STATE_HIDDEN
+AUI_BUTTON_CLOSE = _aui.AUI_BUTTON_CLOSE
+AUI_BUTTON_MAXIMIZE = _aui.AUI_BUTTON_MAXIMIZE
+AUI_BUTTON_MINIMIZE = _aui.AUI_BUTTON_MINIMIZE
+AUI_BUTTON_PIN = _aui.AUI_BUTTON_PIN
+AUI_BUTTON_OPTIONS = _aui.AUI_BUTTON_OPTIONS
+AUI_BUTTON_LEFT = _aui.AUI_BUTTON_LEFT
+AUI_BUTTON_RIGHT = _aui.AUI_BUTTON_RIGHT
+AUI_BUTTON_UP = _aui.AUI_BUTTON_UP
+AUI_BUTTON_DOWN = _aui.AUI_BUTTON_DOWN
+AUI_BUTTON_CUSTOM1 = _aui.AUI_BUTTON_CUSTOM1
+AUI_BUTTON_CUSTOM2 = _aui.AUI_BUTTON_CUSTOM2
+AUI_BUTTON_CUSTOM3 = _aui.AUI_BUTTON_CUSTOM3

 AUI_INSERT_PANE = _aui.AUI_INSERT_PANE
 AUI_INSERT_ROW = _aui.AUI_INSERT_ROW
 AUI_INSERT_DOCK = _aui.AUI_INSERT_DOCK
 AUI_INSERT_PANE = _aui.AUI_INSERT_PANE
 AUI_INSERT_ROW = _aui.AUI_INSERT_ROW
 AUI_INSERT_DOCK = _aui.AUI_INSERT_DOCK


@@ -1442,6 +1456,18 @@ class TabArt(object):
     __repr__ = _swig_repr
     __swig_destroy__ = _aui.delete_TabArt
     __del__ = lambda self : None;
     __repr__ = _swig_repr
     __swig_destroy__ = _aui.delete_TabArt
     __del__ = lambda self : None;

+    def SetNormalFont(*args, **kwargs):
+        """SetNormalFont(self, Font font)"""
+        return _aui.TabArt_SetNormalFont(*args, **kwargs)
+
+    def SetSelectedFont(*args, **kwargs):
+        """SetSelectedFont(self, Font font)"""
+        return _aui.TabArt_SetSelectedFont(*args, **kwargs)
+
+    def SetMeasuringFont(*args, **kwargs):
+        """SetMeasuringFont(self, Font font)"""
+        return _aui.TabArt_SetMeasuringFont(*args, **kwargs)
+

     def DrawBackground(*args, **kwargs):
         """DrawBackground(self, DC dc, Rect rect)"""
         return _aui.TabArt_DrawBackground(*args, **kwargs)
     def DrawBackground(*args, **kwargs):
         """DrawBackground(self, DC dc, Rect rect)"""
         return _aui.TabArt_DrawBackground(*args, **kwargs)


@@ -1453,17 +1479,20 @@ class TabArt(object):
         """
         return _aui.TabArt_DrawTab(*args, **kwargs)
 
         """
         return _aui.TabArt_DrawTab(*args, **kwargs)
 

-    def SetNormalFont(*args, **kwargs):
-        """SetNormalFont(self, Font font)"""
-        return _aui.TabArt_SetNormalFont(*args, **kwargs)
+    def DrawButton(*args, **kwargs):
+        """
+        DrawButton(self, DC dc, Rect in_rect, int bitmap_id, int button_state, 
+            int orientation, Bitmap bitmap_override, Rect out_rect)
+        """
+        return _aui.TabArt_DrawButton(*args, **kwargs)

 
 

-    def SetSelectedFont(*args, **kwargs):
-        """SetSelectedFont(self, Font font)"""
-        return _aui.TabArt_SetSelectedFont(*args, **kwargs)
+    def GetTabSize(*args, **kwargs):
+        """GetTabSize(self, DC dc, String caption, bool active, int x_extent) -> Size"""
+        return _aui.TabArt_GetTabSize(*args, **kwargs)

 
 

-    def SetMeasuringFont(*args, **kwargs):
-        """SetMeasuringFont(self, Font font)"""
-        return _aui.TabArt_SetMeasuringFont(*args, **kwargs)
+    def GetBestTabCtrlSize(*args, **kwargs):
+        """GetBestTabCtrlSize(self, Window wnd) -> int"""
+        return _aui.TabArt_GetBestTabCtrlSize(*args, **kwargs)

 
 _aui.TabArt_swigregister(TabArt)
 
 
 _aui.TabArt_swigregister(TabArt)
 


@@ -1533,6 +1562,7 @@ class AuiTabContainerButton(object):
     cur_state = property(_aui.AuiTabContainerButton_cur_state_get, _aui.AuiTabContainerButton_cur_state_set)
     location = property(_aui.AuiTabContainerButton_location_get, _aui.AuiTabContainerButton_location_set)
     bitmap = property(_aui.AuiTabContainerButton_bitmap_get, _aui.AuiTabContainerButton_bitmap_set)
     cur_state = property(_aui.AuiTabContainerButton_cur_state_get, _aui.AuiTabContainerButton_cur_state_set)
     location = property(_aui.AuiTabContainerButton_location_get, _aui.AuiTabContainerButton_location_set)
     bitmap = property(_aui.AuiTabContainerButton_bitmap_get, _aui.AuiTabContainerButton_bitmap_set)

+    dis_bitmap = property(_aui.AuiTabContainerButton_dis_bitmap_get, _aui.AuiTabContainerButton_dis_bitmap_set)

     rect = property(_aui.AuiTabContainerButton_rect_get, _aui.AuiTabContainerButton_rect_set)
 _aui.AuiTabContainerButton_swigregister(AuiTabContainerButton)
 
     rect = property(_aui.AuiTabContainerButton_rect_get, _aui.AuiTabContainerButton_rect_set)
 _aui.AuiTabContainerButton_swigregister(AuiTabContainerButton)
 


@@ -1629,9 +1659,20 @@ class AuiTabContainer(object):
         return _aui.AuiTabContainer_SetRect(*args, **kwargs)
 
     def AddButton(*args, **kwargs):
         return _aui.AuiTabContainer_SetRect(*args, **kwargs)
 
     def AddButton(*args, **kwargs):

-        """AddButton(self, int id, int location, Bitmap bmp)"""
+        """
+        AddButton(self, int id, int location, Bitmap normal_bitmap=wxNullBitmap, 
+            Bitmap disabled_bitmap=wxNullBitmap)
+        """

         return _aui.AuiTabContainer_AddButton(*args, **kwargs)
 
         return _aui.AuiTabContainer_AddButton(*args, **kwargs)
 

+    def GetTabOffset(*args, **kwargs):
+        """GetTabOffset(self) -> size_t"""
+        return _aui.AuiTabContainer_GetTabOffset(*args, **kwargs)
+
+    def SetTabOffset(*args, **kwargs):
+        """SetTabOffset(self, size_t offset)"""
+        return _aui.AuiTabContainer_SetTabOffset(*args, **kwargs)
+

     ActivePage = property(GetActivePage,SetActivePage,doc="See `GetActivePage` and `SetActivePage`") 
     PageCount = property(GetPageCount,doc="See `GetPageCount`") 
     Pages = property(GetPages,doc="See `GetPages`") 
     ActivePage = property(GetActivePage,SetActivePage,doc="See `GetActivePage` and `SetActivePage`") 
     PageCount = property(GetPageCount,doc="See `GetPageCount`") 
     Pages = property(GetPages,doc="See `GetPages`") 


@@ -1753,7 +1794,7 @@ class PyDockArt(DefaultDockArt):
     __repr__ = _swig_repr
 _aui.PyDockArt_swigregister(PyDockArt)
 
     __repr__ = _swig_repr
 _aui.PyDockArt_swigregister(PyDockArt)
 

-class PyTabArt(TabArt):
+class PyTabArt(DefaultTabArt):

     """
     This version of the `TabArt` class has been instrumented to be
     subclassable in Python and to reflect all calls to the C++ base class
     """
     This version of the `TabArt` class has been instrumented to be
     subclassable in Python and to reflect all calls to the C++ base class

diff --git a/wxPython/src/mac/aui_wrap.cpp b/wxPython/src/mac/aui_wrap.cpp
index 7353b42c82948883aa1eeaa6b8b6ca175fba7908..07fae2ddf52817b0b194942e4f7ad621a0bfd86e 100644 (file)
--- a/wxPython/src/mac/aui_wrap.cpp
+++ b/wxPython/src/mac/aui_wrap.cpp
@@ -2929,6 +2929,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);
             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);


@@ -2950,6 +2951,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);
             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);


@@ -2974,6 +2976,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOO)",
                                                          odc, owin, otext, orect, opane));
             Py_DECREF(odc);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOO)",
                                                          odc, owin, otext, orect, opane));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(otext);
             Py_DECREF(orect);
             Py_DECREF(opane);
             Py_DECREF(otext);
             Py_DECREF(orect);
             Py_DECREF(opane);


@@ -3019,6 +3022,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane));
             Py_DECREF(odc);
             PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
             Py_DECREF(opane);
        }
             Py_DECREF(orect);
             Py_DECREF(opane);
        }


@@ -3045,6 +3049,7 @@ class wxPyDockArt :  public wxDefaultDockArt
                                                          odc, owin, button, button_state,
                                                          orect, opane));
             Py_DECREF(odc);
                                                          odc, owin, button, button_state,
                                                          orect, opane));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
             Py_DECREF(opane);
         }
             Py_DECREF(orect);
             Py_DECREF(opane);
         }


@@ -3071,6 +3076,7 @@ class wxPyTabArt :  public wxDefaultTabArt
 {
     wxPyTabArt() : wxDefaultTabArt() {}
 
 {
     wxPyTabArt() : wxDefaultTabArt() {}
 

+    

     virtual void DrawBackground( wxDC* dc,
                                  const wxRect& rect )
     {
     virtual void DrawBackground( wxDC* dc,
                                  const wxRect& rect )
     {


@@ -3134,9 +3140,90 @@ class wxPyTabArt :  public wxDefaultTabArt
     }
 
 
     }
 
 

+    virtual void DrawButton( wxDC* dc,
+                             const wxRect& in_rect,
+                             int bitmap_id,
+                             int button_state,
+                             int orientation,
+                             const wxBitmap& bitmap_override,
+                             wxRect* out_rect)
+    {
+        bool found;
+        const char* errmsg = "DrawButton should return a wxRect";
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) {
+            PyObject* odc = wxPyMake_wxObject(dc, false);
+            PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0);
+            PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0);
+            PyObject* ro;
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiiiO)", odc, orect,
+                                                                 bitmap_id, button_state, orientation,
+                                                                 obmp));
+            if (ro) {
+                if (!wxRect_helper(ro, &out_rect)) 
+                    PyErr_SetString(PyExc_TypeError, errmsg);
+                Py_DECREF(ro);
+            }
+
+            Py_DECREF(odc);
+            Py_DECREF(orect);
+            Py_DECREF(obmp);
+        }
+        wxPyEndBlockThreads(blocked);
+        if (!found)
+            wxDefaultTabArt::DrawButton(dc, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect);
+    }
+
+    
+    virtual wxSize GetTabSize( wxDC* dc,
+                               const wxString& caption,
+                               bool active,
+                               int* x_extent)
+    {
+        bool found;
+        wxSize rv, *prv = &rv;
+        const char* errmsg = "GetTabSize should return a sequence containing (size, x_extent)";
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) {
+            PyObject* odc = wxPyMake_wxObject(dc, false);
+            PyObject* otext = wx2PyString(caption);
+            PyObject* ro;
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOi)", odc, otext, (int)active));
+            if (ro) {
+                if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
+                    PyObject* o1 = PySequence_GetItem(ro, 0);
+                    PyObject* o2 = PySequence_GetItem(ro, 1);
+                    if (!wxSize_helper(o1, &prv)) 
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    else if (!PyInt_Check(o2)) 
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    else
+                        *x_extent = PyInt_AsLong(o2);
+                    
+                    Py_DECREF(o1);
+                    Py_DECREF(o2);
+                }
+                else {
+                    PyErr_SetString(PyExc_TypeError, errmsg);
+                }
+                Py_DECREF(ro);
+            }
+
+            Py_DECREF(odc);
+            Py_DECREF(otext);
+        }
+        wxPyEndBlockThreads(blocked);
+        if (!found)
+            rv = wxDefaultTabArt::GetTabSize(dc, caption, active, x_extent);
+        return rv;
+    }
+   
+   
+

     DEC_PYCALLBACK__FONT(SetNormalFont);
     DEC_PYCALLBACK__FONT(SetSelectedFont);
     DEC_PYCALLBACK__FONT(SetMeasuringFont);
     DEC_PYCALLBACK__FONT(SetNormalFont);
     DEC_PYCALLBACK__FONT(SetSelectedFont);
     DEC_PYCALLBACK__FONT(SetMeasuringFont);

+    DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize);

 
     PYPRIVATE;
 };
 
     PYPRIVATE;
 };


@@ -3145,7 +3232,7 @@ class wxPyTabArt :  public wxDefaultTabArt
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetNormalFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetSelectedFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetMeasuringFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetNormalFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetSelectedFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetMeasuringFont);

-
+IMP_PYCALLBACK_INT_WIN(wxPyTabArt, wxDefaultTabArt, GetBestTabCtrlSize);

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -11013,6 +11100,129 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_TabArt_SetNormalFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxTabArt *arg1 = (wxTabArt *) 0 ;
+  wxFont *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 *) "font", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetNormalFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetNormalFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxTabArt * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetNormalFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetNormalFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetNormalFont((wxFont const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TabArt_SetSelectedFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxTabArt *arg1 = (wxTabArt *) 0 ;
+  wxFont *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 *) "font", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetSelectedFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetSelectedFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxTabArt * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetSelectedFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetSelectedFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetSelectedFont((wxFont const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TabArt_SetMeasuringFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxTabArt *arg1 = (wxTabArt *) 0 ;
+  wxFont *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 *) "font", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetMeasuringFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetMeasuringFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxTabArt * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetMeasuringFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetMeasuringFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetMeasuringFont((wxFont const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_TabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxTabArt *arg1 = (wxTabArt *) 0 ;
 SWIGINTERN PyObject *_wrap_TabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxTabArt *arg1 = (wxTabArt *) 0 ;


@@ -11146,37 +11356,89 @@ fail:
 }
 
 
 }
 
 

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

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

-  wxFont *arg2 = 0 ;
+  wxDC *arg2 = (wxDC *) 0 ;
+  wxRect *arg3 = 0 ;
+  int arg4 ;
+  int arg5 ;
+  int arg6 ;
+  wxBitmap *arg7 = 0 ;
+  wxRect *arg8 = (wxRect *) 0 ;

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

+  wxRect temp3 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 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 *) "self",(char *) "font", NULL 
+    (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "bitmap_id",(char *) "button_state",(char *) "orientation",(char *) "bitmap_override",(char *) "out_rect", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetNormalFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO:TabArt_DrawButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetNormalFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_DrawButton" "', expected argument " "1"" of type '" "wxTabArt *""'"); 

   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);
   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetNormalFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC *""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetNormalFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  arg2 = reinterpret_cast< wxDC * >(argp2);
+  {
+    arg3 = &temp3;
+    if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TabArt_DrawButton" "', 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 '" "TabArt_DrawButton" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
+  ecode6 = SWIG_AsVal_int(obj5, &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "TabArt_DrawButton" "', expected argument " "6"" of type '" "int""'");
+  } 
+  arg6 = static_cast< int >(val6);
+  res7 = SWIG_ConvertPtr(obj6, &argp7, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "TabArt_DrawButton" "', expected argument " "7"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp7) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_DrawButton" "', expected argument " "7"" of type '" "wxBitmap const &""'"); 
+  }
+  arg7 = reinterpret_cast< wxBitmap * >(argp7);
+  res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_wxRect, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "TabArt_DrawButton" "', expected argument " "8"" of type '" "wxRect *""'"); 
+  }
+  arg8 = reinterpret_cast< wxRect * >(argp8);

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

-    (arg1)->SetNormalFont((wxFont const &)*arg2);
+    (arg1)->DrawButton(arg2,(wxRect const &)*arg3,arg4,arg5,arg6,(wxBitmap const &)*arg7,arg8);

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


@@ -11187,51 +11449,84 @@ fail:
 }
 
 
 }
 
 

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

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

-  wxFont *arg2 = 0 ;
+  wxDC *arg2 = (wxDC *) 0 ;
+  wxString *arg3 = 0 ;
+  bool arg4 ;
+  int *arg5 = (int *) 0 ;
+  wxSize result;

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

+  bool temp3 = false ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 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 *) "font", NULL 
+    (char *) "self",(char *) "dc",(char *) "caption",(char *) "active",(char *) "x_extent", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetSelectedFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:TabArt_GetTabSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetSelectedFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_GetTabSize" "', expected argument " "1"" of type '" "wxTabArt *""'"); 

   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);
   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetSelectedFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC *""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetSelectedFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  arg2 = reinterpret_cast< wxDC * >(argp2);
+  {
+    arg3 = wxString_in_helper(obj2);
+    if (arg3 == NULL) SWIG_fail;
+    temp3 = true;

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  ecode4 = SWIG_AsVal_bool(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TabArt_GetTabSize" "', expected argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  res5 = SWIG_ConvertPtr(obj4, &argp5,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "TabArt_GetTabSize" "', expected argument " "5"" of type '" "int *""'"); 
+  }
+  arg5 = reinterpret_cast< int * >(argp5);

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

-    (arg1)->SetSelectedFont((wxFont const &)*arg2);
+    result = (arg1)->GetTabSize(arg2,(wxString const &)*arg3,arg4,arg5);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  {
+    if (temp3)
+    delete arg3;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp3)
+    delete arg3;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

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

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

-  wxFont *arg2 = 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  int result;

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


@@ -11239,30 +11534,27 @@ SWIGINTERN PyObject *_wrap_TabArt_SetMeasuringFont(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "font", NULL 
+    (char *) "self",(char *) "wnd", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetMeasuringFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_GetBestTabCtrlSize",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetMeasuringFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_GetBestTabCtrlSize" "', expected argument " "1"" of type '" "wxTabArt *""'"); 

   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);
   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetMeasuringFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetMeasuringFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_GetBestTabCtrlSize" "', expected argument " "2"" of type '" "wxWindow *""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  arg2 = reinterpret_cast< wxWindow * >(argp2);

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

-    (arg1)->SetMeasuringFont((wxFont const &)*arg2);
+    result = (int)(arg1)->GetBestTabCtrlSize(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;


@@ -12126,6 +12418,59 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_AuiTabContainerButton_dis_bitmap_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiTabContainerButton *arg1 = (wxAuiTabContainerButton *) 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,"AuiTabContainerButton_dis_bitmap_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiTabContainerButton, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainerButton_dis_bitmap_set" "', expected argument " "1"" of type '" "wxAuiTabContainerButton *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiTabContainerButton * >(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 '" "AuiTabContainerButton_dis_bitmap_set" "', expected argument " "2"" of type '" "wxBitmap *""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  if (arg1) (arg1)->dis_bitmap = *arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiTabContainerButton_dis_bitmap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiTabContainerButton *arg1 = (wxAuiTabContainerButton *) 0 ;
+  wxBitmap *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_wxAuiTabContainerButton, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainerButton_dis_bitmap_get" "', expected argument " "1"" of type '" "wxAuiTabContainerButton *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiTabContainerButton * >(argp1);
+  result = (wxBitmap *)& ((arg1)->dis_bitmap);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBitmap, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_AuiTabContainerButton_rect_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiTabContainerButton *arg1 = (wxAuiTabContainerButton *) 0 ;
 SWIGINTERN PyObject *_wrap_AuiTabContainerButton_rect_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiTabContainerButton *arg1 = (wxAuiTabContainerButton *) 0 ;


@@ -13099,7 +13444,10 @@ SWIGINTERN PyObject *_wrap_AuiTabContainer_AddButton(PyObject *SWIGUNUSEDPARM(se
   wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ;
   int arg2 ;
   int arg3 ;
   wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ;
   int arg2 ;
   int arg3 ;

-  wxBitmap *arg4 = 0 ;
+  wxBitmap const &arg4_defvalue = wxNullBitmap ;
+  wxBitmap *arg4 = (wxBitmap *) &arg4_defvalue ;
+  wxBitmap const &arg5_defvalue = wxNullBitmap ;
+  wxBitmap *arg5 = (wxBitmap *) &arg5_defvalue ;

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


@@ -13108,15 +13456,18 @@ SWIGINTERN PyObject *_wrap_AuiTabContainer_AddButton(PyObject *SWIGUNUSEDPARM(se
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;

+  void *argp5 = 0 ;
+  int res5 = 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 *) "id",(char *) "location",(char *) "bmp", NULL 
+    (char *) "self",(char *) "id",(char *) "location",(char *) "normal_bitmap",(char *) "disabled_bitmap", NULL 

   };
   
   };
   

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

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


@@ -13132,17 +13483,95 @@ SWIGINTERN PyObject *_wrap_AuiTabContainer_AddButton(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AuiTabContainer_AddButton" "', expected argument " "3"" of type '" "int""'");
   } 
   arg3 = static_cast< int >(val3);
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AuiTabContainer_AddButton" "', expected argument " "3"" of type '" "int""'");
   } 
   arg3 = static_cast< int >(val3);

-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxBitmap,  0  | 0);
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "AuiTabContainer_AddButton" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+  if (obj3) {
+    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxBitmap,  0  | 0);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "AuiTabContainer_AddButton" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+    }
+    if (!argp4) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabContainer_AddButton" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+    }
+    arg4 = reinterpret_cast< wxBitmap * >(argp4);

   }
   }

-  if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabContainer_AddButton" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+  if (obj4) {
+    res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_wxBitmap,  0  | 0);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "AuiTabContainer_AddButton" "', expected argument " "5"" of type '" "wxBitmap const &""'"); 
+    }
+    if (!argp5) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabContainer_AddButton" "', expected argument " "5"" of type '" "wxBitmap const &""'"); 
+    }
+    arg5 = reinterpret_cast< wxBitmap * >(argp5);

   }
   }

-  arg4 = reinterpret_cast< wxBitmap * >(argp4);

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

-    (arg1)->AddButton(arg2,arg3,(wxBitmap const &)*arg4);
+    (arg1)->AddButton(arg2,arg3,(wxBitmap const &)*arg4,(wxBitmap const &)*arg5);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiTabContainer_GetTabOffset(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ;
+  size_t 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_wxAuiTabContainer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainer_GetTabOffset" "', expected argument " "1"" of type '" "wxAuiTabContainer const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiTabContainer * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (size_t)((wxAuiTabContainer const *)arg1)->GetTabOffset();
+    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_AuiTabContainer_SetTabOffset(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ;
+  size_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "offset", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AuiTabContainer_SetTabOffset",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabContainer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainer_SetTabOffset" "', expected argument " "1"" of type '" "wxAuiTabContainer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiTabContainer * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiTabContainer_SetTabOffset" "', expected argument " "2"" of type '" "size_t""'");
+  } 
+  arg2 = static_cast< size_t >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetTabOffset(arg2);

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


@@ -14198,11 +14627,14 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"FloatingPane_swigregister", FloatingPane_swigregister, METH_VARARGS, NULL},
         { (char *)"FloatingPane_swiginit", FloatingPane_swiginit, METH_VARARGS, NULL},
         { (char *)"delete_TabArt", (PyCFunction)_wrap_delete_TabArt, METH_O, NULL},
         { (char *)"FloatingPane_swigregister", FloatingPane_swigregister, METH_VARARGS, NULL},
         { (char *)"FloatingPane_swiginit", FloatingPane_swiginit, METH_VARARGS, NULL},
         { (char *)"delete_TabArt", (PyCFunction)_wrap_delete_TabArt, METH_O, NULL},

-        { (char *)"TabArt_DrawBackground", (PyCFunction) _wrap_TabArt_DrawBackground, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"TabArt_DrawTab", (PyCFunction) _wrap_TabArt_DrawTab, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"TabArt_SetNormalFont", (PyCFunction) _wrap_TabArt_SetNormalFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetSelectedFont", (PyCFunction) _wrap_TabArt_SetSelectedFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetMeasuringFont", (PyCFunction) _wrap_TabArt_SetMeasuringFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetNormalFont", (PyCFunction) _wrap_TabArt_SetNormalFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetSelectedFont", (PyCFunction) _wrap_TabArt_SetSelectedFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetMeasuringFont", (PyCFunction) _wrap_TabArt_SetMeasuringFont, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"TabArt_DrawBackground", (PyCFunction) _wrap_TabArt_DrawBackground, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TabArt_DrawTab", (PyCFunction) _wrap_TabArt_DrawTab, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TabArt_DrawButton", (PyCFunction) _wrap_TabArt_DrawButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TabArt_GetTabSize", (PyCFunction) _wrap_TabArt_GetTabSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TabArt_GetBestTabCtrlSize", (PyCFunction) _wrap_TabArt_GetBestTabCtrlSize, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"TabArt_swigregister", TabArt_swigregister, METH_VARARGS, NULL},
         { (char *)"new_DefaultTabArt", (PyCFunction)_wrap_new_DefaultTabArt, METH_NOARGS, NULL},
         { (char *)"delete_DefaultTabArt", (PyCFunction)_wrap_delete_DefaultTabArt, METH_O, NULL},
         { (char *)"TabArt_swigregister", TabArt_swigregister, METH_VARARGS, NULL},
         { (char *)"new_DefaultTabArt", (PyCFunction)_wrap_new_DefaultTabArt, METH_NOARGS, NULL},
         { (char *)"delete_DefaultTabArt", (PyCFunction)_wrap_delete_DefaultTabArt, METH_O, NULL},


@@ -14238,6 +14670,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"AuiTabContainerButton_location_get", (PyCFunction)_wrap_AuiTabContainerButton_location_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_bitmap_set", _wrap_AuiTabContainerButton_bitmap_set, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_bitmap_get", (PyCFunction)_wrap_AuiTabContainerButton_bitmap_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_location_get", (PyCFunction)_wrap_AuiTabContainerButton_location_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_bitmap_set", _wrap_AuiTabContainerButton_bitmap_set, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_bitmap_get", (PyCFunction)_wrap_AuiTabContainerButton_bitmap_get, METH_O, NULL},

+        { (char *)"AuiTabContainerButton_dis_bitmap_set", _wrap_AuiTabContainerButton_dis_bitmap_set, METH_VARARGS, NULL},
+        { (char *)"AuiTabContainerButton_dis_bitmap_get", (PyCFunction)_wrap_AuiTabContainerButton_dis_bitmap_get, METH_O, NULL},

         { (char *)"AuiTabContainerButton_rect_set", _wrap_AuiTabContainerButton_rect_set, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_rect_get", (PyCFunction)_wrap_AuiTabContainerButton_rect_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_swigregister", AuiTabContainerButton_swigregister, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_rect_set", _wrap_AuiTabContainerButton_rect_set, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_rect_get", (PyCFunction)_wrap_AuiTabContainerButton_rect_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_swigregister", AuiTabContainerButton_swigregister, METH_VARARGS, NULL},


@@ -14264,6 +14698,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"AuiTabContainer_DoShowHide", (PyCFunction)_wrap_AuiTabContainer_DoShowHide, METH_O, NULL},
         { (char *)"AuiTabContainer_SetRect", (PyCFunction) _wrap_AuiTabContainer_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"AuiTabContainer_AddButton", (PyCFunction) _wrap_AuiTabContainer_AddButton, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"AuiTabContainer_DoShowHide", (PyCFunction)_wrap_AuiTabContainer_DoShowHide, METH_O, NULL},
         { (char *)"AuiTabContainer_SetRect", (PyCFunction) _wrap_AuiTabContainer_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"AuiTabContainer_AddButton", (PyCFunction) _wrap_AuiTabContainer_AddButton, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"AuiTabContainer_GetTabOffset", (PyCFunction)_wrap_AuiTabContainer_GetTabOffset, METH_O, NULL},
+        { (char *)"AuiTabContainer_SetTabOffset", (PyCFunction) _wrap_AuiTabContainer_SetTabOffset, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"AuiTabContainer_swigregister", AuiTabContainer_swigregister, METH_VARARGS, NULL},
         { (char *)"AuiTabContainer_swiginit", AuiTabContainer_swiginit, METH_VARARGS, NULL},
         { (char *)"new_AuiTabCtrl", (PyCFunction) _wrap_new_AuiTabCtrl, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"AuiTabContainer_swigregister", AuiTabContainer_swigregister, METH_VARARGS, NULL},
         { (char *)"AuiTabContainer_swiginit", AuiTabContainer_swiginit, METH_VARARGS, NULL},
         { (char *)"new_AuiTabCtrl", (PyCFunction) _wrap_new_AuiTabCtrl, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -15499,11 +15935,14 @@ static void *_p_wxPyDockArtTo_p_wxDockArt(void *x) {
 static void *_p_wxPyDockArtTo_p_wxDefaultDockArt(void *x) {
     return (void *)((wxDefaultDockArt *)  ((wxPyDockArt *) x));
 }
 static void *_p_wxPyDockArtTo_p_wxDefaultDockArt(void *x) {
     return (void *)((wxDefaultDockArt *)  ((wxPyDockArt *) x));
 }

+static void *_p_wxPyTabArtTo_p_wxDefaultTabArt(void *x) {
+    return (void *)((wxDefaultTabArt *)  ((wxPyTabArt *) x));
+}

 static void *_p_wxDefaultTabArtTo_p_wxTabArt(void *x) {
     return (void *)((wxTabArt *)  ((wxDefaultTabArt *) x));
 }
 static void *_p_wxPyTabArtTo_p_wxTabArt(void *x) {
 static void *_p_wxDefaultTabArtTo_p_wxTabArt(void *x) {
     return (void *)((wxTabArt *)  ((wxDefaultTabArt *) x));
 }
 static void *_p_wxPyTabArtTo_p_wxTabArt(void *x) {

-    return (void *)((wxTabArt *)  ((wxPyTabArt *) x));
+    return (void *)((wxTabArt *) (wxDefaultTabArt *) ((wxPyTabArt *) x));

 }
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 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_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0};


@@ -16047,7 +16486,7 @@ static swig_cast_info _swigc__p_wxControlWithItems[] = {{&_swigt__p_wxControlWit
 static swig_cast_info _swigc__p_wxControl[] = {  {&_swigt__p_wxControl, 0, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0},  {&_swigt__p_wxAuiTabCtrl, _p_wxAuiTabCtrlTo_p_wxControl, 0, 0},  {&_swigt__p_wxAuiMultiNotebook, _p_wxAuiMultiNotebookTo_p_wxControl, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDC[] = {  {&_swigt__p_wxDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDefaultDockArt[] = {  {&_swigt__p_wxDefaultDockArt, 0, 0, 0},  {&_swigt__p_wxPyDockArt, _p_wxPyDockArtTo_p_wxDefaultDockArt, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxControl[] = {  {&_swigt__p_wxControl, 0, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0},  {&_swigt__p_wxAuiTabCtrl, _p_wxAuiTabCtrlTo_p_wxControl, 0, 0},  {&_swigt__p_wxAuiMultiNotebook, _p_wxAuiMultiNotebookTo_p_wxControl, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDC[] = {  {&_swigt__p_wxDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDefaultDockArt[] = {  {&_swigt__p_wxDefaultDockArt, 0, 0, 0},  {&_swigt__p_wxPyDockArt, _p_wxPyDockArtTo_p_wxDefaultDockArt, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxDefaultTabArt[] = {  {&_swigt__p_wxDefaultTabArt, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxDefaultTabArt[] = {  {&_swigt__p_wxDefaultTabArt, 0, 0, 0},  {&_swigt__p_wxPyTabArt, _p_wxPyTabArtTo_p_wxDefaultTabArt, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxDockArt[] = {  {&_swigt__p_wxDockArt, 0, 0, 0},  {&_swigt__p_wxDefaultDockArt, _p_wxDefaultDockArtTo_p_wxDockArt, 0, 0},  {&_swigt__p_wxPyDockArt, _p_wxPyDockArtTo_p_wxDockArt, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDockInfo[] = {  {&_swigt__p_wxDockInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDockUIPart[] = {  {&_swigt__p_wxDockUIPart, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDockArt[] = {  {&_swigt__p_wxDockArt, 0, 0, 0},  {&_swigt__p_wxDefaultDockArt, _p_wxDefaultDockArtTo_p_wxDockArt, 0, 0},  {&_swigt__p_wxPyDockArt, _p_wxPyDockArtTo_p_wxDockArt, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDockInfo[] = {  {&_swigt__p_wxDockInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDockUIPart[] = {  {&_swigt__p_wxDockUIPart, 0, 0, 0},{0, 0, 0, 0}};


@@ -16966,6 +17405,20 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_NORMAL",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_NORMAL)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_HOVER",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_HOVER)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_PRESSED",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_PRESSED)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_NORMAL",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_NORMAL)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_HOVER",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_HOVER)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_PRESSED",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_PRESSED)));

+  SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_DISABLED",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_DISABLED)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_HIDDEN",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_HIDDEN)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_CLOSE",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_CLOSE)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_MAXIMIZE",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_MAXIMIZE)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_MINIMIZE",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_MINIMIZE)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_PIN",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_PIN)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_OPTIONS",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_OPTIONS)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_LEFT",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_LEFT)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_RIGHT",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_RIGHT)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_UP",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_UP)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_DOWN",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_DOWN)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_CUSTOM1",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_CUSTOM1)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_CUSTOM2",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_CUSTOM2)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_CUSTOM3",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_CUSTOM3)));

   SWIG_Python_SetConstant(d, "AUI_INSERT_PANE",SWIG_From_int(static_cast< int >(wxAUI_INSERT_PANE)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_ROW",SWIG_From_int(static_cast< int >(wxAUI_INSERT_ROW)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_DOCK",SWIG_From_int(static_cast< int >(wxAUI_INSERT_DOCK)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_PANE",SWIG_From_int(static_cast< int >(wxAUI_INSERT_PANE)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_ROW",SWIG_From_int(static_cast< int >(wxAUI_INSERT_ROW)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_DOCK",SWIG_From_int(static_cast< int >(wxAUI_INSERT_DOCK)));

diff --git a/wxPython/src/mac/html.py b/wxPython/src/mac/html.py
index c928793c5421c193ca30bcd3868f2d6dbc60ad39..4af11a0939e9047a313108a04030689dfdc76b42 100644 (file)
--- a/wxPython/src/mac/html.py
+++ b/wxPython/src/mac/html.py
@@ -1664,23 +1664,57 @@ def PreHtmlHelpWindow(*args, **kwargs):
     self._setOORInfo(self)
     return val
 
     self._setOORInfo(self)
     return val
 

-class HtmlWindowEvent(_core.NotifyEvent):
-    """Proxy of C++ HtmlWindowEvent class"""
+wxEVT_COMMAND_HTML_CELL_CLICKED = _html.wxEVT_COMMAND_HTML_CELL_CLICKED
+wxEVT_COMMAND_HTML_CELL_HOVER = _html.wxEVT_COMMAND_HTML_CELL_HOVER
+wxEVT_COMMAND_HTML_LINK_CLICKED = _html.wxEVT_COMMAND_HTML_LINK_CLICKED
+class HtmlCellEvent(_core.CommandEvent):
+    """Proxy of C++ HtmlCellEvent class"""

     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 

-        """__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> HtmlWindowEvent"""
-        _html.HtmlWindowEvent_swiginit(self,_html.new_HtmlWindowEvent(*args, **kwargs))
-    def SetURL(*args, **kwargs):
-        """SetURL(self, String url)"""
-        return _html.HtmlWindowEvent_SetURL(*args, **kwargs)
-
-    def GetURL(*args, **kwargs):
-        """GetURL(self) -> String"""
-        return _html.HtmlWindowEvent_GetURL(*args, **kwargs)
-
-    URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") 
-_html.HtmlWindowEvent_swigregister(HtmlWindowEvent)
+        """
+        __init__(self, EventType commandType, int id, HtmlCell cell, Point pt, 
+            MouseEvent ev) -> HtmlCellEvent
+        """
+        _html.HtmlCellEvent_swiginit(self,_html.new_HtmlCellEvent(*args, **kwargs))
+    def GetCell(*args, **kwargs):
+        """GetCell(self) -> HtmlCell"""
+        return _html.HtmlCellEvent_GetCell(*args, **kwargs)
+
+    def GetPoint(*args, **kwargs):
+        """GetPoint(self) -> Point"""
+        return _html.HtmlCellEvent_GetPoint(*args, **kwargs)
+
+    def GetMouseEvent(*args, **kwargs):
+        """GetMouseEvent(self) -> MouseEvent"""
+        return _html.HtmlCellEvent_GetMouseEvent(*args, **kwargs)
+
+    def SetLinkClicked(*args, **kwargs):
+        """SetLinkClicked(self, bool linkclicked)"""
+        return _html.HtmlCellEvent_SetLinkClicked(*args, **kwargs)
+
+    def GetLinkClicked(*args, **kwargs):
+        """GetLinkClicked(self) -> bool"""
+        return _html.HtmlCellEvent_GetLinkClicked(*args, **kwargs)
+
+_html.HtmlCellEvent_swigregister(HtmlCellEvent)
+
+class HtmlLinkEvent(_core.CommandEvent):
+    """Proxy of C++ HtmlLinkEvent class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """__init__(self, int id, HtmlLinkInfo linkinfo) -> HtmlLinkEvent"""
+        _html.HtmlLinkEvent_swiginit(self,_html.new_HtmlLinkEvent(*args, **kwargs))
+    def GetLinkInfo(*args, **kwargs):
+        """GetLinkInfo(self) -> HtmlLinkInfo"""
+        return _html.HtmlLinkEvent_GetLinkInfo(*args, **kwargs)
+
+_html.HtmlLinkEvent_swigregister(HtmlLinkEvent)
+
+EVT_HTML_CELL_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_CLICKED, 1 )
+EVT_HTML_CELL_HOVER   = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_HOVER, 1 )
+EVT_HTML_LINK_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_LINK_CLICKED, 1 )

 
 class HtmlHelpFrame(_windows.Frame):
     """Proxy of C++ HtmlHelpFrame class"""
 
 class HtmlHelpFrame(_windows.Frame):
     """Proxy of C++ HtmlHelpFrame class"""

diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp
index 0980c54612db99ec8fd8e08c1cfa3eae730765d3..4c1fe93548f9982ee7a48d06df7b35053faefc25 100644 (file)
--- a/wxPython/src/mac/html_wrap.cpp
+++ b/wxPython/src/mac/html_wrap.cpp
@@ -2523,147 +2523,148 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxHtmlBookRecArray swig_types[57]
 #define SWIGTYPE_p_wxHtmlBookRecord swig_types[58]
 #define SWIGTYPE_p_wxHtmlCell swig_types[59]
 #define SWIGTYPE_p_wxHtmlBookRecArray swig_types[57]
 #define SWIGTYPE_p_wxHtmlBookRecord swig_types[58]
 #define SWIGTYPE_p_wxHtmlCell swig_types[59]

-#define SWIGTYPE_p_wxHtmlColourCell swig_types[60]
-#define SWIGTYPE_p_wxHtmlContainerCell swig_types[61]
-#define SWIGTYPE_p_wxHtmlDCRenderer swig_types[62]
-#define SWIGTYPE_p_wxHtmlEasyPrinting swig_types[63]
-#define SWIGTYPE_p_wxHtmlFilter swig_types[64]
-#define SWIGTYPE_p_wxHtmlFontCell swig_types[65]
-#define SWIGTYPE_p_wxHtmlHelpController swig_types[66]
-#define SWIGTYPE_p_wxHtmlHelpData swig_types[67]
-#define SWIGTYPE_p_wxHtmlHelpDialog swig_types[68]
-#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[69]
-#define SWIGTYPE_p_wxHtmlHelpFrameCfg swig_types[70]
-#define SWIGTYPE_p_wxHtmlHelpWindow swig_types[71]
-#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[72]
-#define SWIGTYPE_p_wxHtmlModalHelp swig_types[73]
-#define SWIGTYPE_p_wxHtmlParser swig_types[74]
-#define SWIGTYPE_p_wxHtmlPrintout swig_types[75]
-#define SWIGTYPE_p_wxHtmlRenderingInfo swig_types[76]
-#define SWIGTYPE_p_wxHtmlRenderingState swig_types[77]
-#define SWIGTYPE_p_wxHtmlRenderingStyle swig_types[78]
-#define SWIGTYPE_p_wxHtmlSearchStatus swig_types[79]
-#define SWIGTYPE_p_wxHtmlSelection swig_types[80]
-#define SWIGTYPE_p_wxHtmlTag swig_types[81]
-#define SWIGTYPE_p_wxHtmlTagHandler swig_types[82]
-#define SWIGTYPE_p_wxHtmlWidgetCell swig_types[83]
-#define SWIGTYPE_p_wxHtmlWinParser swig_types[84]
-#define SWIGTYPE_p_wxHtmlWindow swig_types[85]
-#define SWIGTYPE_p_wxHtmlWindowEvent swig_types[86]
-#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[87]
-#define SWIGTYPE_p_wxHtmlWordCell swig_types[88]
-#define SWIGTYPE_p_wxICOHandler swig_types[89]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[90]
-#define SWIGTYPE_p_wxIdleEvent swig_types[91]
-#define SWIGTYPE_p_wxImage swig_types[92]
-#define SWIGTYPE_p_wxImageHandler swig_types[93]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[94]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[95]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[96]
-#define SWIGTYPE_p_wxKeyEvent swig_types[97]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[98]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[99]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[100]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[101]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[102]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[103]
-#define SWIGTYPE_p_wxMenu swig_types[104]
-#define SWIGTYPE_p_wxMenuBar swig_types[105]
-#define SWIGTYPE_p_wxMenuEvent swig_types[106]
-#define SWIGTYPE_p_wxMenuItem swig_types[107]
-#define SWIGTYPE_p_wxMessageDialog swig_types[108]
-#define SWIGTYPE_p_wxMiniFrame swig_types[109]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[110]
-#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[111]
-#define SWIGTYPE_p_wxMouseEvent swig_types[112]
-#define SWIGTYPE_p_wxMoveEvent swig_types[113]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[114]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[115]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[116]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[117]
-#define SWIGTYPE_p_wxNumberEntryDialog swig_types[118]
-#define SWIGTYPE_p_wxObject swig_types[119]
-#define SWIGTYPE_p_wxPCXHandler swig_types[120]
-#define SWIGTYPE_p_wxPNGHandler swig_types[121]
-#define SWIGTYPE_p_wxPNMHandler swig_types[122]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[123]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[124]
-#define SWIGTYPE_p_wxPaintEvent swig_types[125]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[126]
-#define SWIGTYPE_p_wxPanel swig_types[127]
-#define SWIGTYPE_p_wxPaperSize swig_types[128]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[129]
-#define SWIGTYPE_p_wxPoint swig_types[130]
-#define SWIGTYPE_p_wxPopupWindow swig_types[131]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[132]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[133]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[134]
-#define SWIGTYPE_p_wxPrintData swig_types[135]
-#define SWIGTYPE_p_wxPrintDialog swig_types[136]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[137]
-#define SWIGTYPE_p_wxPrintPreview swig_types[138]
-#define SWIGTYPE_p_wxPrinter swig_types[139]
-#define SWIGTYPE_p_wxProgressDialog swig_types[140]
-#define SWIGTYPE_p_wxPyApp swig_types[141]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[142]
-#define SWIGTYPE_p_wxPyEvent swig_types[143]
-#define SWIGTYPE_p_wxPyHtmlFilter swig_types[144]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[145]
-#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[146]
-#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[147]
-#define SWIGTYPE_p_wxPyHtmlWindow swig_types[148]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[149]
-#define SWIGTYPE_p_wxPyPanel swig_types[150]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[151]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[152]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[153]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[154]
-#define SWIGTYPE_p_wxPyPrintout swig_types[155]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[156]
-#define SWIGTYPE_p_wxPySizer swig_types[157]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[158]
-#define SWIGTYPE_p_wxPyVListBox swig_types[159]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[160]
-#define SWIGTYPE_p_wxPyValidator swig_types[161]
-#define SWIGTYPE_p_wxPyWindow swig_types[162]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[163]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[164]
-#define SWIGTYPE_p_wxSashEvent swig_types[165]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[166]
-#define SWIGTYPE_p_wxSashWindow swig_types[167]
-#define SWIGTYPE_p_wxScrollEvent swig_types[168]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[169]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[170]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[171]
-#define SWIGTYPE_p_wxShowEvent swig_types[172]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[173]
-#define SWIGTYPE_p_wxSize swig_types[174]
-#define SWIGTYPE_p_wxSizeEvent swig_types[175]
-#define SWIGTYPE_p_wxSizer swig_types[176]
-#define SWIGTYPE_p_wxSizerItem swig_types[177]
-#define SWIGTYPE_p_wxSplashScreen swig_types[178]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[179]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[180]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[181]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[182]
-#define SWIGTYPE_p_wxStatusBar swig_types[183]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[184]
-#define SWIGTYPE_p_wxString swig_types[185]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[186]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[187]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[188]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[189]
-#define SWIGTYPE_p_wxTipWindow swig_types[190]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[191]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[192]
-#define SWIGTYPE_p_wxValidator swig_types[193]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[194]
-#define SWIGTYPE_p_wxWindow swig_types[195]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[196]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[197]
-#define SWIGTYPE_p_wxXPMHandler swig_types[198]
-static swig_type_info *swig_types[200];
-static swig_module_info swig_module = {swig_types, 199, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxHtmlCellEvent swig_types[60]
+#define SWIGTYPE_p_wxHtmlColourCell swig_types[61]
+#define SWIGTYPE_p_wxHtmlContainerCell swig_types[62]
+#define SWIGTYPE_p_wxHtmlDCRenderer swig_types[63]
+#define SWIGTYPE_p_wxHtmlEasyPrinting swig_types[64]
+#define SWIGTYPE_p_wxHtmlFilter swig_types[65]
+#define SWIGTYPE_p_wxHtmlFontCell swig_types[66]
+#define SWIGTYPE_p_wxHtmlHelpController swig_types[67]
+#define SWIGTYPE_p_wxHtmlHelpData swig_types[68]
+#define SWIGTYPE_p_wxHtmlHelpDialog swig_types[69]
+#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[70]
+#define SWIGTYPE_p_wxHtmlHelpFrameCfg swig_types[71]
+#define SWIGTYPE_p_wxHtmlHelpWindow swig_types[72]
+#define SWIGTYPE_p_wxHtmlLinkEvent swig_types[73]
+#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[74]
+#define SWIGTYPE_p_wxHtmlModalHelp swig_types[75]
+#define SWIGTYPE_p_wxHtmlParser swig_types[76]
+#define SWIGTYPE_p_wxHtmlPrintout swig_types[77]
+#define SWIGTYPE_p_wxHtmlRenderingInfo swig_types[78]
+#define SWIGTYPE_p_wxHtmlRenderingState swig_types[79]
+#define SWIGTYPE_p_wxHtmlRenderingStyle swig_types[80]
+#define SWIGTYPE_p_wxHtmlSearchStatus swig_types[81]
+#define SWIGTYPE_p_wxHtmlSelection swig_types[82]
+#define SWIGTYPE_p_wxHtmlTag swig_types[83]
+#define SWIGTYPE_p_wxHtmlTagHandler swig_types[84]
+#define SWIGTYPE_p_wxHtmlWidgetCell swig_types[85]
+#define SWIGTYPE_p_wxHtmlWinParser swig_types[86]
+#define SWIGTYPE_p_wxHtmlWindow swig_types[87]
+#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[88]
+#define SWIGTYPE_p_wxHtmlWordCell swig_types[89]
+#define SWIGTYPE_p_wxICOHandler swig_types[90]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[91]
+#define SWIGTYPE_p_wxIdleEvent swig_types[92]
+#define SWIGTYPE_p_wxImage swig_types[93]
+#define SWIGTYPE_p_wxImageHandler swig_types[94]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[95]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[96]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[97]
+#define SWIGTYPE_p_wxKeyEvent swig_types[98]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[99]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[100]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[101]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[102]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[103]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[104]
+#define SWIGTYPE_p_wxMenu swig_types[105]
+#define SWIGTYPE_p_wxMenuBar swig_types[106]
+#define SWIGTYPE_p_wxMenuEvent swig_types[107]
+#define SWIGTYPE_p_wxMenuItem swig_types[108]
+#define SWIGTYPE_p_wxMessageDialog swig_types[109]
+#define SWIGTYPE_p_wxMiniFrame swig_types[110]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[111]
+#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[112]
+#define SWIGTYPE_p_wxMouseEvent swig_types[113]
+#define SWIGTYPE_p_wxMoveEvent swig_types[114]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[115]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[116]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[117]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[118]
+#define SWIGTYPE_p_wxNumberEntryDialog swig_types[119]
+#define SWIGTYPE_p_wxObject swig_types[120]
+#define SWIGTYPE_p_wxPCXHandler swig_types[121]
+#define SWIGTYPE_p_wxPNGHandler swig_types[122]
+#define SWIGTYPE_p_wxPNMHandler swig_types[123]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[124]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[125]
+#define SWIGTYPE_p_wxPaintEvent swig_types[126]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[127]
+#define SWIGTYPE_p_wxPanel swig_types[128]
+#define SWIGTYPE_p_wxPaperSize swig_types[129]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[130]
+#define SWIGTYPE_p_wxPoint swig_types[131]
+#define SWIGTYPE_p_wxPopupWindow swig_types[132]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[133]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[134]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[135]
+#define SWIGTYPE_p_wxPrintData swig_types[136]
+#define SWIGTYPE_p_wxPrintDialog swig_types[137]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[138]
+#define SWIGTYPE_p_wxPrintPreview swig_types[139]
+#define SWIGTYPE_p_wxPrinter swig_types[140]
+#define SWIGTYPE_p_wxProgressDialog swig_types[141]
+#define SWIGTYPE_p_wxPyApp swig_types[142]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[143]
+#define SWIGTYPE_p_wxPyEvent swig_types[144]
+#define SWIGTYPE_p_wxPyHtmlFilter swig_types[145]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[146]
+#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[147]
+#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[148]
+#define SWIGTYPE_p_wxPyHtmlWindow swig_types[149]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[150]
+#define SWIGTYPE_p_wxPyPanel swig_types[151]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[152]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[153]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[154]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[155]
+#define SWIGTYPE_p_wxPyPrintout swig_types[156]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[157]
+#define SWIGTYPE_p_wxPySizer swig_types[158]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[159]
+#define SWIGTYPE_p_wxPyVListBox swig_types[160]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[161]
+#define SWIGTYPE_p_wxPyValidator swig_types[162]
+#define SWIGTYPE_p_wxPyWindow swig_types[163]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[164]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[165]
+#define SWIGTYPE_p_wxSashEvent swig_types[166]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[167]
+#define SWIGTYPE_p_wxSashWindow swig_types[168]
+#define SWIGTYPE_p_wxScrollEvent swig_types[169]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[170]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[171]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[172]
+#define SWIGTYPE_p_wxShowEvent swig_types[173]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[174]
+#define SWIGTYPE_p_wxSize swig_types[175]
+#define SWIGTYPE_p_wxSizeEvent swig_types[176]
+#define SWIGTYPE_p_wxSizer swig_types[177]
+#define SWIGTYPE_p_wxSizerItem swig_types[178]
+#define SWIGTYPE_p_wxSplashScreen swig_types[179]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[180]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[181]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[182]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[183]
+#define SWIGTYPE_p_wxStatusBar swig_types[184]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[185]
+#define SWIGTYPE_p_wxString swig_types[186]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[187]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[188]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[189]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[190]
+#define SWIGTYPE_p_wxTipWindow swig_types[191]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[192]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[193]
+#define SWIGTYPE_p_wxValidator swig_types[194]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[195]
+#define SWIGTYPE_p_wxWindow swig_types[196]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[197]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[198]
+#define SWIGTYPE_p_wxXPMHandler swig_types[199]
+static swig_type_info *swig_types[201];
+static swig_module_info swig_module = {swig_types, 200, 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)
 


@@ -14914,139 +14915,319 @@ SWIGINTERN PyObject *HtmlHelpWindow_swiginit(PyObject *SWIGUNUSEDPARM(self), PyO
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

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

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

-  wxEventType arg1 = (wxEventType) wxEVT_NULL ;
-  int arg2 = (int) 0 ;
-  wxHtmlWindowEvent *result = 0 ;
+  wxEventType arg1 ;
+  int arg2 ;
+  wxHtmlCell *arg3 = (wxHtmlCell *) 0 ;
+  wxPoint *arg4 = 0 ;
+  wxMouseEvent *arg5 = 0 ;
+  wxHtmlCellEvent *result = 0 ;

   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;

+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  wxPoint temp4 ;
+  void *argp5 = 0 ;
+  int res5 = 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 *) "commandType",(char *) "id", NULL 
+    (char *) "commandType",(char *) "id",(char *) "cell",(char *) "pt",(char *) "ev", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_HtmlWindowEvent",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_HtmlWindowEvent" "', expected argument " "1"" of type '" "wxEventType""'");
-    } 
-    arg1 = static_cast< wxEventType >(val1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_HtmlCellEvent",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_HtmlCellEvent" "', expected argument " "1"" of type '" "wxEventType""'");
+  } 
+  arg1 = static_cast< wxEventType >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_HtmlCellEvent" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_HtmlCellEvent" "', expected argument " "3"" of type '" "wxHtmlCell *""'"); 

   }
   }

-  if (obj1) {
-    ecode2 = SWIG_AsVal_int(obj1, &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_HtmlWindowEvent" "', expected argument " "2"" of type '" "int""'");
-    } 
-    arg2 = static_cast< int >(val2);
+  arg3 = reinterpret_cast< wxHtmlCell * >(argp3);
+  {
+    arg4 = &temp4;
+    if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail;
+  }
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_wxMouseEvent,  0  | 0);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_HtmlCellEvent" "', expected argument " "5"" of type '" "wxMouseEvent const &""'"); 

   }
   }

+  if (!argp5) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_HtmlCellEvent" "', expected argument " "5"" of type '" "wxMouseEvent const &""'"); 
+  }
+  arg5 = reinterpret_cast< wxMouseEvent * >(argp5);

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

-    result = (wxHtmlWindowEvent *)new wxHtmlWindowEvent(arg1,arg2);
+    result = (wxHtmlCellEvent *)new wxHtmlCellEvent(arg1,arg2,arg3,(wxPoint const &)*arg4,(wxMouseEvent const &)*arg5);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlWindowEvent, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlCellEvent, SWIG_POINTER_NEW |  0 );

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

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

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

-  wxHtmlWindowEvent *arg1 = (wxHtmlWindowEvent *) 0 ;
-  wxString *arg2 = 0 ;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 0 ;
+  wxHtmlCell *result = 0 ;

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

-  bool temp2 = false ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlCellEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_GetCell" "', expected argument " "1"" of type '" "wxHtmlCellEvent const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxHtmlCell *)((wxHtmlCellEvent const *)arg1)->GetCell();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCellEvent_GetPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 0 ;
+  wxPoint 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_wxHtmlCellEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_GetPoint" "', expected argument " "1"" of type '" "wxHtmlCellEvent const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlCellEvent const *)arg1)->GetPoint();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCellEvent_GetMouseEvent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 0 ;
+  wxMouseEvent 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_wxHtmlCellEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_GetMouseEvent" "', expected argument " "1"" of type '" "wxHtmlCellEvent const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlCellEvent const *)arg1)->GetMouseEvent();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxMouseEvent(static_cast< const wxMouseEvent& >(result))), SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCellEvent_SetLinkClicked(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;

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

-    (char *) "self",(char *) "url", NULL 
+    (char *) "self",(char *) "linkclicked", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowEvent_SetURL",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowEvent, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCellEvent_SetLinkClicked",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCellEvent, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowEvent_SetURL" "', expected argument " "1"" of type '" "wxHtmlWindowEvent *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_SetLinkClicked" "', expected argument " "1"" of type '" "wxHtmlCellEvent *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxHtmlWindowEvent * >(argp1);
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HtmlCellEvent_SetLinkClicked" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
   {

-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetLinkClicked(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCellEvent_GetLinkClicked(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 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_wxHtmlCellEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_GetLinkClicked" "', expected argument " "1"" of type '" "wxHtmlCellEvent const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);

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

-    (arg1)->SetURL((wxString const &)*arg2);
+    result = (bool)((wxHtmlCellEvent const *)arg1)->GetLinkClicked();

     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:

+  return NULL;
+}
+
+
+SWIGINTERN PyObject *HtmlCellEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxHtmlCellEvent, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *HtmlCellEvent_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_HtmlLinkEvent(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  wxHtmlLinkInfo *arg2 = 0 ;
+  wxHtmlLinkEvent *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "id",(char *) "linkinfo", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_HtmlLinkEvent",kwnames,&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_HtmlLinkEvent" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxHtmlLinkInfo,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_HtmlLinkEvent" "', expected argument " "2"" of type '" "wxHtmlLinkInfo const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_HtmlLinkEvent" "', expected argument " "2"" of type '" "wxHtmlLinkInfo const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlLinkInfo * >(argp2);

   {
   {

-    if (temp2)
-    delete arg2;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxHtmlLinkEvent *)new wxHtmlLinkEvent(arg1,(wxHtmlLinkInfo const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlLinkEvent, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_HtmlWindowEvent_GetURL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HtmlLinkEvent_GetLinkInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

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

-  wxHtmlWindowEvent *arg1 = (wxHtmlWindowEvent *) 0 ;
-  wxString *result = 0 ;
+  wxHtmlLinkEvent *arg1 = (wxHtmlLinkEvent *) 0 ;
+  wxHtmlLinkInfo *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_wxHtmlWindowEvent, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlLinkEvent, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowEvent_GetURL" "', expected argument " "1"" of type '" "wxHtmlWindowEvent const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlLinkEvent_GetLinkInfo" "', expected argument " "1"" of type '" "wxHtmlLinkEvent const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxHtmlWindowEvent * >(argp1);
+  arg1 = reinterpret_cast< wxHtmlLinkEvent * >(argp1);

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

-      wxString const &_result_ref = ((wxHtmlWindowEvent const *)arg1)->GetURL();
-      result = (wxString *) &_result_ref;
+      wxHtmlLinkInfo const &_result_ref = ((wxHtmlLinkEvent const *)arg1)->GetLinkInfo();
+      result = (wxHtmlLinkInfo *) &_result_ref;

     }
     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_wxHtmlLinkInfo, 0 |  0 );

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

-SWIGINTERN PyObject *HtmlWindowEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *HtmlLinkEvent_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_wxHtmlWindowEvent, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxHtmlLinkEvent, SWIG_NewClientData(obj));

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

-SWIGINTERN PyObject *HtmlWindowEvent_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *HtmlLinkEvent_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

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


@@ -17894,11 +18075,18 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlHelpWindow_GetTreeCtrl", (PyCFunction)_wrap_HtmlHelpWindow_GetTreeCtrl, METH_O, NULL},
         { (char *)"HtmlHelpWindow_swigregister", HtmlHelpWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlHelpWindow_swiginit", HtmlHelpWindow_swiginit, METH_VARARGS, NULL},
         { (char *)"HtmlHelpWindow_GetTreeCtrl", (PyCFunction)_wrap_HtmlHelpWindow_GetTreeCtrl, METH_O, NULL},
         { (char *)"HtmlHelpWindow_swigregister", HtmlHelpWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlHelpWindow_swiginit", HtmlHelpWindow_swiginit, METH_VARARGS, NULL},

-        { (char *)"new_HtmlWindowEvent", (PyCFunction) _wrap_new_HtmlWindowEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"HtmlWindowEvent_SetURL", (PyCFunction) _wrap_HtmlWindowEvent_SetURL, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"HtmlWindowEvent_GetURL", (PyCFunction)_wrap_HtmlWindowEvent_GetURL, METH_O, NULL},
-        { (char *)"HtmlWindowEvent_swigregister", HtmlWindowEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"HtmlWindowEvent_swiginit", HtmlWindowEvent_swiginit, METH_VARARGS, NULL},
+        { (char *)"new_HtmlCellEvent", (PyCFunction) _wrap_new_HtmlCellEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlCellEvent_GetCell", (PyCFunction)_wrap_HtmlCellEvent_GetCell, METH_O, NULL},
+        { (char *)"HtmlCellEvent_GetPoint", (PyCFunction)_wrap_HtmlCellEvent_GetPoint, METH_O, NULL},
+        { (char *)"HtmlCellEvent_GetMouseEvent", (PyCFunction)_wrap_HtmlCellEvent_GetMouseEvent, METH_O, NULL},
+        { (char *)"HtmlCellEvent_SetLinkClicked", (PyCFunction) _wrap_HtmlCellEvent_SetLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlCellEvent_GetLinkClicked", (PyCFunction)_wrap_HtmlCellEvent_GetLinkClicked, METH_O, NULL},
+        { (char *)"HtmlCellEvent_swigregister", HtmlCellEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"HtmlCellEvent_swiginit", HtmlCellEvent_swiginit, METH_VARARGS, NULL},
+        { (char *)"new_HtmlLinkEvent", (PyCFunction) _wrap_new_HtmlLinkEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlLinkEvent_GetLinkInfo", (PyCFunction)_wrap_HtmlLinkEvent_GetLinkInfo, METH_O, NULL},
+        { (char *)"HtmlLinkEvent_swigregister", HtmlLinkEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"HtmlLinkEvent_swiginit", HtmlLinkEvent_swiginit, METH_VARARGS, NULL},

         { (char *)"new_HtmlHelpFrame", (PyCFunction) _wrap_new_HtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreHtmlHelpFrame", (PyCFunction) _wrap_new_PreHtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlHelpFrame_Create", (PyCFunction) _wrap_HtmlHelpFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_HtmlHelpFrame", (PyCFunction) _wrap_new_HtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreHtmlHelpFrame", (PyCFunction) _wrap_new_PreHtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlHelpFrame_Create", (PyCFunction) _wrap_HtmlHelpFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -17999,6 +18187,9 @@ static void *_p_wxScrollEventTo_p_wxEvent(void *x) {
 static void *_p_wxFindDialogEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxFindDialogEvent *) x));
 }
 static void *_p_wxFindDialogEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxFindDialogEvent *) x));
 }

+static void *_p_wxHtmlCellEventTo_p_wxEvent(void *x) {
+    return (void *)((wxEvent *) (wxCommandEvent *) ((wxHtmlCellEvent *) x));
+}

 static void *_p_wxNotifyEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxNotifyEvent *) x));
 }
 static void *_p_wxNotifyEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxNotifyEvent *) x));
 }


@@ -18062,6 +18253,9 @@ static void *_p_wxMouseCaptureChangedEventTo_p_wxEvent(void *x) {
 static void *_p_wxSysColourChangedEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxSysColourChangedEvent *) x));
 }
 static void *_p_wxSysColourChangedEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxSysColourChangedEvent *) x));
 }

+static void *_p_wxHtmlLinkEventTo_p_wxEvent(void *x) {
+    return (void *)((wxEvent *) (wxCommandEvent *) ((wxHtmlLinkEvent *) x));
+}

 static void *_p_wxDropFilesEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxDropFilesEvent *) x));
 }
 static void *_p_wxDropFilesEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxDropFilesEvent *) x));
 }


@@ -18080,9 +18274,6 @@ static void *_p_wxQueryLayoutInfoEventTo_p_wxEvent(void *x) {
 static void *_p_wxShowEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxShowEvent *) x));
 }
 static void *_p_wxShowEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxShowEvent *) x));
 }

-static void *_p_wxHtmlWindowEventTo_p_wxEvent(void *x) {
-    return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *) ((wxHtmlWindowEvent *) x));
-}

 static void *_p_wxCommandEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxCommandEvent *) x));
 }
 static void *_p_wxCommandEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxCommandEvent *) x));
 }


@@ -18119,12 +18310,6 @@ static void *_p_wxHtmlWordCellTo_p_wxHtmlCell(void *x) {
 static void *_p_wxHtmlFontCellTo_p_wxHtmlCell(void *x) {
     return (void *)((wxHtmlCell *)  ((wxHtmlFontCell *) x));
 }
 static void *_p_wxHtmlFontCellTo_p_wxHtmlCell(void *x) {
     return (void *)((wxHtmlCell *)  ((wxHtmlFontCell *) x));
 }

-static void *_p_wxHtmlWindowEventTo_p_wxNotifyEvent(void *x) {
-    return (void *)((wxNotifyEvent *)  ((wxHtmlWindowEvent *) x));
-}
-static void *_p_wxSplitterEventTo_p_wxNotifyEvent(void *x) {
-    return (void *)((wxNotifyEvent *)  ((wxSplitterEvent *) x));
-}

 static void *_p_wxSplashScreenTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x));
 }
 static void *_p_wxSplashScreenTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x));
 }


@@ -18398,6 +18583,9 @@ static void *_p_wxCloseEventTo_p_wxObject(void *x) {
 static void *_p_wxHtmlEasyPrintingTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxHtmlEasyPrinting *) x));
 }
 static void *_p_wxHtmlEasyPrintingTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxHtmlEasyPrinting *) x));
 }

+static void *_p_wxHtmlCellEventTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxHtmlCellEvent *) 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));
 }


@@ -18653,9 +18841,6 @@ static void *_p_wxJPEGHandlerTo_p_wxObject(void *x) {
 static void *_p_wxPNMHandlerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxImageHandler *) ((wxPNMHandler *) x));
 }
 static void *_p_wxPNMHandlerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxImageHandler *) ((wxPNMHandler *) x));
 }

-static void *_p_wxHtmlWindowEventTo_p_wxObject(void *x) {
-    return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *) ((wxHtmlWindowEvent *) x));
-}

 static void *_p_wxShowEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxShowEvent *) x));
 }
 static void *_p_wxShowEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxShowEvent *) x));
 }


@@ -18758,6 +18943,9 @@ static void *_p_wxPaletteChangedEventTo_p_wxObject(void *x) {
 static void *_p_wxHtmlHelpControllerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxHelpControllerBase *) ((wxHtmlHelpController *) x));
 }
 static void *_p_wxHtmlHelpControllerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxHelpControllerBase *) ((wxHtmlHelpController *) x));
 }

+static void *_p_wxHtmlLinkEventTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxHtmlLinkEvent *) x));
+}

 static void *_p_wxPanelTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxPanel *) x));
 }
 static void *_p_wxPanelTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxPanel *) x));
 }


@@ -18806,6 +18994,75 @@ static void *_p_wxHtmlWordCellTo_p_wxObject(void *x) {
 static void *_p_wxMenuBarTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x));
 }
 static void *_p_wxMenuBarTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x));
 }

+static void *_p_wxFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *)  ((wxFrame *) x));
+}
+static void *_p_wxMiniFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMiniFrame *) x));
+}
+static void *_p_wxFontDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFontDialog *) x));
+}
+static void *_p_wxDirDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxDirDialog *) x));
+}
+static void *_p_wxColourDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxColourDialog *) x));
+}
+static void *_p_wxDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *)  ((wxDialog *) x));
+}
+static void *_p_wxHtmlHelpDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxHtmlHelpDialog *) x));
+}
+static void *_p_wxSplashScreenTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxSplashScreen *) x));
+}
+static void *_p_wxTipWindowTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxTipWindow *) x));
+}
+static void *_p_wxMDIParentFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIParentFrame *) x));
+}
+static void *_p_wxMDIChildFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIChildFrame *) x));
+}
+static void *_p_wxNumberEntryDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxNumberEntryDialog *) x));
+}
+static void *_p_wxPasswordEntryDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x));
+}
+static void *_p_wxTextEntryDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxTextEntryDialog *) x));
+}
+static void *_p_wxSingleChoiceDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxSingleChoiceDialog *) x));
+}
+static void *_p_wxMultiChoiceDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMultiChoiceDialog *) x));
+}
+static void *_p_wxFileDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFileDialog *) x));
+}
+static void *_p_wxMessageDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMessageDialog *) x));
+}
+static void *_p_wxProgressDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxProgressDialog *) x));
+}
+static void *_p_wxFindReplaceDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFindReplaceDialog *) x));
+}
+static void *_p_wxHtmlHelpFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxHtmlHelpFrame *) x));
+}
+static void *_p_wxPreviewFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxPreviewFrame *) x));
+}
+static void *_p_wxPyPreviewFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x));
+}

 static void *_p_wxSplashScreenTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x));
 }
 static void *_p_wxSplashScreenTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x));
 }


@@ -18959,75 +19216,6 @@ static void *_p_wxPyHtmlWindowTo_p_wxScrolledWindow(void *x) {
 static void *_p_wxPreviewCanvasTo_p_wxScrolledWindow(void *x) {
     return (void *)((wxScrolledWindow *)  ((wxPreviewCanvas *) x));
 }
 static void *_p_wxPreviewCanvasTo_p_wxScrolledWindow(void *x) {
     return (void *)((wxScrolledWindow *)  ((wxPreviewCanvas *) x));
 }

-static void *_p_wxFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *)  ((wxFrame *) x));
-}
-static void *_p_wxMiniFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMiniFrame *) x));
-}
-static void *_p_wxFontDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFontDialog *) x));
-}
-static void *_p_wxDirDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxDirDialog *) x));
-}
-static void *_p_wxColourDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxColourDialog *) x));
-}
-static void *_p_wxDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *)  ((wxDialog *) x));
-}
-static void *_p_wxHtmlHelpDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxHtmlHelpDialog *) x));
-}
-static void *_p_wxSplashScreenTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxSplashScreen *) x));
-}
-static void *_p_wxTipWindowTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxTipWindow *) x));
-}
-static void *_p_wxMDIParentFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIParentFrame *) x));
-}
-static void *_p_wxMDIChildFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIChildFrame *) x));
-}
-static void *_p_wxNumberEntryDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxNumberEntryDialog *) x));
-}
-static void *_p_wxPasswordEntryDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x));
-}
-static void *_p_wxTextEntryDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxTextEntryDialog *) x));
-}
-static void *_p_wxSingleChoiceDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxSingleChoiceDialog *) x));
-}
-static void *_p_wxMultiChoiceDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMultiChoiceDialog *) x));
-}
-static void *_p_wxFileDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFileDialog *) x));
-}
-static void *_p_wxMessageDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMessageDialog *) x));
-}
-static void *_p_wxProgressDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxProgressDialog *) x));
-}
-static void *_p_wxFindReplaceDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFindReplaceDialog *) x));
-}
-static void *_p_wxHtmlHelpFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxHtmlHelpFrame *) x));
-}
-static void *_p_wxPreviewFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxPreviewFrame *) x));
-}
-static void *_p_wxPyPreviewFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x));
-}

 static void *_p_wxColourDialogTo_p_wxDialog(void *x) {
     return (void *)((wxDialog *)  ((wxColourDialog *) x));
 }
 static void *_p_wxColourDialogTo_p_wxDialog(void *x) {
     return (void *)((wxDialog *)  ((wxColourDialog *) x));
 }


@@ -19106,12 +19294,18 @@ static void *_p_wxSashEventTo_p_wxCommandEvent(void *x) {
 static void *_p_wxWindowDestroyEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxWindowDestroyEvent *) x));
 }
 static void *_p_wxWindowDestroyEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxWindowDestroyEvent *) x));
 }

+static void *_p_wxHtmlLinkEventTo_p_wxCommandEvent(void *x) {
+    return (void *)((wxCommandEvent *)  ((wxHtmlLinkEvent *) x));
+}

 static void *_p_wxSplitterEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *) (wxNotifyEvent *) ((wxSplitterEvent *) x));
 }
 static void *_p_wxClipboardTextEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxClipboardTextEvent *) x));
 }
 static void *_p_wxSplitterEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *) (wxNotifyEvent *) ((wxSplitterEvent *) x));
 }
 static void *_p_wxClipboardTextEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxClipboardTextEvent *) x));
 }

+static void *_p_wxHtmlCellEventTo_p_wxCommandEvent(void *x) {
+    return (void *)((wxCommandEvent *)  ((wxHtmlCellEvent *) x));
+}

 static void *_p_wxScrollEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxScrollEvent *) x));
 }
 static void *_p_wxScrollEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxScrollEvent *) x));
 }


@@ -19133,9 +19327,6 @@ static void *_p_wxWindowCreateEventTo_p_wxCommandEvent(void *x) {
 static void *_p_wxNotifyEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxNotifyEvent *) x));
 }
 static void *_p_wxNotifyEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxNotifyEvent *) x));
 }

-static void *_p_wxHtmlWindowEventTo_p_wxCommandEvent(void *x) {
-    return (void *)((wxCommandEvent *) (wxNotifyEvent *) ((wxHtmlWindowEvent *) x));
-}

 static void *_p_wxFindDialogEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxFindDialogEvent *) x));
 }
 static void *_p_wxFindDialogEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxFindDialogEvent *) x));
 }


@@ -19163,6 +19354,7 @@ static swig_type_info _swigt__p_wxContextMenuEvent = {"_p_wxContextMenuEvent", 0
 static swig_type_info _swigt__p_wxChildFocusEvent = {"_p_wxChildFocusEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxDateEvent = {"_p_wxDateEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxWindowCreateEvent = {"_p_wxWindowCreateEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxChildFocusEvent = {"_p_wxChildFocusEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxDateEvent = {"_p_wxDateEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxWindowCreateEvent = {"_p_wxWindowCreateEvent", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxFindDialogEvent = {"_p_wxFindDialogEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxUpdateUIEvent = {"_p_wxUpdateUIEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxConfigBase = {"_p_wxConfigBase", "wxConfigBase *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFindDialogEvent = {"_p_wxFindDialogEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxUpdateUIEvent = {"_p_wxUpdateUIEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxConfigBase = {"_p_wxConfigBase", "wxConfigBase *", 0, 0, (void*)0, 0};


@@ -19204,8 +19396,8 @@ static swig_type_info _swigt__p_wxPaletteChangedEvent = {"_p_wxPaletteChangedEve
 static swig_type_info _swigt__p_wxDisplayChangedEvent = {"_p_wxDisplayChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMouseCaptureChangedEvent = {"_p_wxMouseCaptureChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxSysColourChangedEvent = {"_p_wxSysColourChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxDisplayChangedEvent = {"_p_wxDisplayChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMouseCaptureChangedEvent = {"_p_wxMouseCaptureChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxSysColourChangedEvent = {"_p_wxSysColourChangedEvent", 0, 0, 0, 0, 0};

-static swig_type_info _swigt__p_wxFocusEvent = {"_p_wxFocusEvent", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxDropFilesEvent = {"_p_wxDropFilesEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxDropFilesEvent = {"_p_wxDropFilesEvent", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxFocusEvent = {"_p_wxFocusEvent", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxQueryLayoutInfoEvent = {"_p_wxQueryLayoutInfoEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxNavigationKeyEvent = {"_p_wxNavigationKeyEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxQueryLayoutInfoEvent = {"_p_wxQueryLayoutInfoEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxNavigationKeyEvent = {"_p_wxNavigationKeyEvent", 0, 0, 0, 0, 0};


@@ -19253,6 +19445,7 @@ static swig_type_info _swigt__p_wxHelpSearchMode = {"_p_wxHelpSearchMode", "wxHe
 static swig_type_info _swigt__p_wxHtmlBookRecArray = {"_p_wxHtmlBookRecArray", "wxHtmlBookRecArray *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlBookRecord = {"_p_wxHtmlBookRecord", "wxHtmlBookRecord *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlCell = {"_p_wxHtmlCell", "wxHtmlCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlBookRecArray = {"_p_wxHtmlBookRecArray", "wxHtmlBookRecArray *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlBookRecord = {"_p_wxHtmlBookRecord", "wxHtmlBookRecord *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlCell = {"_p_wxHtmlCell", "wxHtmlCell *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHtmlCellEvent = {"_p_wxHtmlCellEvent", "wxHtmlCellEvent *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlColourCell = {"_p_wxHtmlColourCell", "wxHtmlColourCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlContainerCell = {"_p_wxHtmlContainerCell", "wxHtmlContainerCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlDCRenderer = {"_p_wxHtmlDCRenderer", "wxHtmlDCRenderer *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlColourCell = {"_p_wxHtmlColourCell", "wxHtmlColourCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlContainerCell = {"_p_wxHtmlContainerCell", "wxHtmlContainerCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlDCRenderer = {"_p_wxHtmlDCRenderer", "wxHtmlDCRenderer *", 0, 0, (void*)0, 0};


@@ -19265,6 +19458,7 @@ static swig_type_info _swigt__p_wxHtmlHelpDialog = {"_p_wxHtmlHelpDialog", "wxHt
 static swig_type_info _swigt__p_wxHtmlHelpFrame = {"_p_wxHtmlHelpFrame", "wxHtmlHelpFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpFrameCfg = {"_p_wxHtmlHelpFrameCfg", "wxHtmlHelpFrameCfg *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpWindow = {"_p_wxHtmlHelpWindow", "wxHtmlHelpWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpFrame = {"_p_wxHtmlHelpFrame", "wxHtmlHelpFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpFrameCfg = {"_p_wxHtmlHelpFrameCfg", "wxHtmlHelpFrameCfg *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpWindow = {"_p_wxHtmlHelpWindow", "wxHtmlHelpWindow *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHtmlLinkEvent = {"_p_wxHtmlLinkEvent", "wxHtmlLinkEvent *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlLinkInfo = {"_p_wxHtmlLinkInfo", "wxHtmlLinkInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlModalHelp = {"_p_wxHtmlModalHelp", "wxHtmlModalHelp *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlParser = {"_p_wxHtmlParser", "wxHtmlParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlLinkInfo = {"_p_wxHtmlLinkInfo", "wxHtmlLinkInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlModalHelp = {"_p_wxHtmlModalHelp", "wxHtmlModalHelp *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlParser = {"_p_wxHtmlParser", "wxHtmlParser *", 0, 0, (void*)0, 0};


@@ -19279,11 +19473,9 @@ static swig_type_info _swigt__p_wxHtmlTagHandler = {"_p_wxHtmlTagHandler", "wxHt
 static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHtmlWidgetCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHtmlWidgetCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};

-static swig_type_info _swigt__p_wxHtmlWindowEvent = {"_p_wxHtmlWindowEvent", "wxHtmlWindowEvent *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};

-static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", "wxNotifyEvent *", 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_wxIndividualLayoutConstraint = {"_p_wxIndividualLayoutConstraint", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMenuItem = {"_p_wxMenuItem", 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_wxIndividualLayoutConstraint = {"_p_wxIndividualLayoutConstraint", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMenuItem = {"_p_wxMenuItem", 0, 0, 0, 0, 0};


@@ -19293,8 +19485,8 @@ static swig_type_info _swigt__p_wxLayoutAlgorithm = {"_p_wxLayoutAlgorithm", 0,
 static swig_type_info _swigt__p_wxFindReplaceData = {"_p_wxFindReplaceData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPrintDialogData = {"_p_wxPrintDialogData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPrinter = {"_p_wxPrinter", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxFindReplaceData = {"_p_wxFindReplaceData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPrintDialogData = {"_p_wxPrintDialogData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPrinter = {"_p_wxPrinter", 0, 0, 0, 0, 0};

-static swig_type_info _swigt__p_wxGridSizer = {"_p_wxGridSizer", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxGridSizer = {"_p_wxGridSizer", 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_wxColourData = {"_p_wxColourData", 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_wxColourData = {"_p_wxColourData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxStdDialogButtonSizer = {"_p_wxStdDialogButtonSizer", 0, 0, 0, 0, 0};


@@ -19403,6 +19595,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlBookRecArray,
   &_swigt__p_wxHtmlBookRecord,
   &_swigt__p_wxHtmlCell,
   &_swigt__p_wxHtmlBookRecArray,
   &_swigt__p_wxHtmlBookRecord,
   &_swigt__p_wxHtmlCell,

+  &_swigt__p_wxHtmlCellEvent,

   &_swigt__p_wxHtmlColourCell,
   &_swigt__p_wxHtmlContainerCell,
   &_swigt__p_wxHtmlDCRenderer,
   &_swigt__p_wxHtmlColourCell,
   &_swigt__p_wxHtmlContainerCell,
   &_swigt__p_wxHtmlDCRenderer,


@@ -19415,6 +19608,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlHelpFrame,
   &_swigt__p_wxHtmlHelpFrameCfg,
   &_swigt__p_wxHtmlHelpWindow,
   &_swigt__p_wxHtmlHelpFrame,
   &_swigt__p_wxHtmlHelpFrameCfg,
   &_swigt__p_wxHtmlHelpWindow,

+  &_swigt__p_wxHtmlLinkEvent,

   &_swigt__p_wxHtmlLinkInfo,
   &_swigt__p_wxHtmlModalHelp,
   &_swigt__p_wxHtmlParser,
   &_swigt__p_wxHtmlLinkInfo,
   &_swigt__p_wxHtmlModalHelp,
   &_swigt__p_wxHtmlParser,


@@ -19429,7 +19623,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlWidgetCell,
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlWindow,
   &_swigt__p_wxHtmlWidgetCell,
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlWindow,

-  &_swigt__p_wxHtmlWindowEvent,

   &_swigt__p_wxHtmlWindowInterface,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxHtmlWindowInterface,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,


@@ -19564,9 +19757,10 @@ static swig_cast_info _swigc__p_wxContextMenuEvent[] = {{&_swigt__p_wxContextMen
 static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxNotifyEvent[] = {{&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxFindDialogEvent[] = {{&_swigt__p_wxFindDialogEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFindDialogEvent[] = {{&_swigt__p_wxFindDialogEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxCommandEvent[] = {  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxCommandEvent, 0, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxCommandEvent[] = {  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxHtmlLinkEvent, _p_wxHtmlLinkEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxHtmlCellEvent, _p_wxHtmlCellEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxCommandEvent, 0, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxConfigBase[] = {  {&_swigt__p_wxConfigBase, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxCursor[] = {  {&_swigt__p_wxCursor, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDC[] = {  {&_swigt__p_wxDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxConfigBase[] = {  {&_swigt__p_wxConfigBase, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxCursor[] = {  {&_swigt__p_wxCursor, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDC[] = {  {&_swigt__p_wxDC, 0, 0, 0},{0, 0, 0, 0}};


@@ -19605,15 +19799,15 @@ static swig_cast_info _swigc__p_wxPaletteChangedEvent[] = {{&_swigt__p_wxPalette
 static swig_cast_info _swigc__p_wxDisplayChangedEvent[] = {{&_swigt__p_wxDisplayChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseCaptureChangedEvent[] = {{&_swigt__p_wxMouseCaptureChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSysColourChangedEvent[] = {{&_swigt__p_wxSysColourChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDisplayChangedEvent[] = {{&_swigt__p_wxDisplayChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseCaptureChangedEvent[] = {{&_swigt__p_wxMouseCaptureChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSysColourChangedEvent[] = {{&_swigt__p_wxSysColourChangedEvent, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxFocusEvent[] = {{&_swigt__p_wxFocusEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxDropFilesEvent[] = {{&_swigt__p_wxDropFilesEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDropFilesEvent[] = {{&_swigt__p_wxDropFilesEvent, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxFocusEvent[] = {{&_swigt__p_wxFocusEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxQueryLayoutInfoEvent[] = {{&_swigt__p_wxQueryLayoutInfoEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxShowEvent[] = {{&_swigt__p_wxShowEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigationKeyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxKeyEvent[] = {{&_swigt__p_wxKeyEvent, 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_wxTaskBarIconEvent[] = {{&_swigt__p_wxTaskBarIconEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxQueryLayoutInfoEvent[] = {{&_swigt__p_wxQueryLayoutInfoEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxShowEvent[] = {{&_swigt__p_wxShowEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigationKeyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxKeyEvent[] = {{&_swigt__p_wxKeyEvent, 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_wxTaskBarIconEvent[] = {{&_swigt__p_wxTaskBarIconEvent, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxEvent[] = {  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEvent, 0, 0, 0},  {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxEvent[] = {  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxHtmlCellEvent, _p_wxHtmlCellEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEvent, 0, 0, 0},  {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxHtmlLinkEvent, _p_wxHtmlLinkEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxSplashScreen[] = {{&_swigt__p_wxSplashScreen, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMiniFrame[] = {{&_swigt__p_wxMiniFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyPanel[] = {{&_swigt__p_wxPyPanel, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSplashScreen[] = {{&_swigt__p_wxSplashScreen, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMiniFrame[] = {{&_swigt__p_wxMiniFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyPanel[] = {{&_swigt__p_wxPyPanel, 0, 0, 0},{0, 0, 0, 0}};


@@ -19655,6 +19849,7 @@ static swig_cast_info _swigc__p_wxHelpSearchMode[] = {  {&_swigt__p_wxHelpSearch
 static swig_cast_info _swigc__p_wxHtmlBookRecArray[] = {  {&_swigt__p_wxHtmlBookRecArray, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlBookRecord[] = {  {&_swigt__p_wxHtmlBookRecord, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlCell[] = {  {&_swigt__p_wxHtmlCell, 0, 0, 0},  {&_swigt__p_wxHtmlContainerCell, _p_wxHtmlContainerCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlWidgetCell, _p_wxHtmlWidgetCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlColourCell, _p_wxHtmlColourCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlWordCell, _p_wxHtmlWordCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlFontCell, _p_wxHtmlFontCellTo_p_wxHtmlCell, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlBookRecArray[] = {  {&_swigt__p_wxHtmlBookRecArray, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlBookRecord[] = {  {&_swigt__p_wxHtmlBookRecord, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlCell[] = {  {&_swigt__p_wxHtmlCell, 0, 0, 0},  {&_swigt__p_wxHtmlContainerCell, _p_wxHtmlContainerCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlWidgetCell, _p_wxHtmlWidgetCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlColourCell, _p_wxHtmlColourCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlWordCell, _p_wxHtmlWordCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlFontCell, _p_wxHtmlFontCellTo_p_wxHtmlCell, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHtmlCellEvent[] = {  {&_swigt__p_wxHtmlCellEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlColourCell[] = {  {&_swigt__p_wxHtmlColourCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlContainerCell[] = {  {&_swigt__p_wxHtmlContainerCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlDCRenderer[] = {  {&_swigt__p_wxHtmlDCRenderer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlColourCell[] = {  {&_swigt__p_wxHtmlColourCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlContainerCell[] = {  {&_swigt__p_wxHtmlContainerCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlDCRenderer[] = {  {&_swigt__p_wxHtmlDCRenderer, 0, 0, 0},{0, 0, 0, 0}};


@@ -19667,6 +19862,7 @@ static swig_cast_info _swigc__p_wxHtmlHelpDialog[] = {  {&_swigt__p_wxHtmlHelpDi
 static swig_cast_info _swigc__p_wxHtmlHelpFrame[] = {  {&_swigt__p_wxHtmlHelpFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpFrameCfg[] = {  {&_swigt__p_wxHtmlHelpFrameCfg, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpWindow[] = {  {&_swigt__p_wxHtmlHelpWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpFrame[] = {  {&_swigt__p_wxHtmlHelpFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpFrameCfg[] = {  {&_swigt__p_wxHtmlHelpFrameCfg, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpWindow[] = {  {&_swigt__p_wxHtmlHelpWindow, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHtmlLinkEvent[] = {  {&_swigt__p_wxHtmlLinkEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlLinkInfo[] = {  {&_swigt__p_wxHtmlLinkInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlModalHelp[] = {  {&_swigt__p_wxHtmlModalHelp, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlParser[] = {  {&_swigt__p_wxHtmlParser, 0, 0, 0},  {&_swigt__p_wxHtmlWinParser, _p_wxHtmlWinParserTo_p_wxHtmlParser, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlLinkInfo[] = {  {&_swigt__p_wxHtmlLinkInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlModalHelp[] = {  {&_swigt__p_wxHtmlModalHelp, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlParser[] = {  {&_swigt__p_wxHtmlParser, 0, 0, 0},  {&_swigt__p_wxHtmlWinParser, _p_wxHtmlWinParserTo_p_wxHtmlParser, 0, 0},{0, 0, 0, 0}};


@@ -19681,11 +19877,9 @@ static swig_cast_info _swigc__p_wxHtmlTagHandler[] = {  {&_swigt__p_wxHtmlTagHan
 static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidgetCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidgetCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxHtmlWindowEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxNotifyEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, 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_wxMenuItem[] = {{&_swigt__p_wxMenuItem, 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_wxIndividualLayoutConstraint[] = {{&_swigt__p_wxIndividualLayoutConstraint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMenuItem[] = {{&_swigt__p_wxMenuItem, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxImage[] = {{&_swigt__p_wxImage, 0, 0, 0},{0, 0, 0, 0}};


@@ -19694,8 +19888,8 @@ static swig_cast_info _swigc__p_wxLayoutAlgorithm[] = {{&_swigt__p_wxLayoutAlgor
 static swig_cast_info _swigc__p_wxFindReplaceData[] = {{&_swigt__p_wxFindReplaceData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrintDialogData[] = {{&_swigt__p_wxPrintDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrinter[] = {{&_swigt__p_wxPrinter, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFindReplaceData[] = {{&_swigt__p_wxFindReplaceData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrintDialogData[] = {{&_swigt__p_wxPrintDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrinter[] = {{&_swigt__p_wxPrinter, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxGridSizer[] = {{&_swigt__p_wxGridSizer, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxGridSizer[] = {{&_swigt__p_wxGridSizer, 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_wxColourData[] = {{&_swigt__p_wxColourData, 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_wxColourData[] = {{&_swigt__p_wxColourData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxStdDialogButtonSizer[] = {{&_swigt__p_wxStdDialogButtonSizer, 0, 0, 0},{0, 0, 0, 0}};


@@ -19725,7 +19919,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_wxObject[] = {  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlFontCell, _p_wxHtmlFontCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlTag, _p_wxHtmlTagTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlFilter, _p_wxPyHtmlFilterTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_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_wxHtmlEasyPrinting, _p_wxHtmlEasyPrintingTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0},  {&_swigt__p_wxObject, 0, 0, 0},  {&_swigt__p_wxHtmlParser, _p_wxHtmlParserTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWinParser, _p_wxHtmlWinParserTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpFrame, _p_wxHtmlHelpFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWidgetCell, _p_wxHtmlWidgetCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourData, _p_wxColourDataTo_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_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlPrintout, _p_wxHtmlPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_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_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlContainerCell, _p_wxHtmlContainerCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpDialog, _p_wxHtmlHelpDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlWinTagHandler, _p_wxPyHtmlWinTagHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlTagHandler, _p_wxPyHtmlTagHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_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_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpWindow, _p_wxHtmlHelpWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlWindow, _p_wxPyHtmlWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxHelpControllerBase, _p_wxHelpControllerBaseTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlDCRenderer, _p_wxHtmlDCRendererTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlLinkInfo, _p_wxHtmlLinkInfoTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_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_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpController, _p_wxHtmlHelpControllerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlCell, _p_wxHtmlCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlColourCell, _p_wxHtmlColourCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWordCell, _p_wxHtmlWordCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxObject[] = {  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlFontCell, _p_wxHtmlFontCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlTag, _p_wxHtmlTagTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlFilter, _p_wxPyHtmlFilterTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_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_wxHtmlEasyPrinting, _p_wxHtmlEasyPrintingTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlCellEvent, _p_wxHtmlCellEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0},  {&_swigt__p_wxObject, 0, 0, 0},  {&_swigt__p_wxHtmlWinParser, _p_wxHtmlWinParserTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlParser, _p_wxHtmlParserTo_p_wxObject, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpFrame, _p_wxHtmlHelpFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWidgetCell, _p_wxHtmlWidgetCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourData, _p_wxColourDataTo_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_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlPrintout, _p_wxHtmlPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_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_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlContainerCell, _p_wxHtmlContainerCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpDialog, _p_wxHtmlHelpDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlWinTagHandler, _p_wxPyHtmlWinTagHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlTagHandler, _p_wxPyHtmlTagHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_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_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpWindow, _p_wxHtmlHelpWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlWindow, _p_wxPyHtmlWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxHelpControllerBase, _p_wxHelpControllerBaseTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlDCRenderer, _p_wxHtmlDCRendererTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlLinkInfo, _p_wxHtmlLinkInfoTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_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_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpController, _p_wxHtmlHelpControllerTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlLinkEvent, _p_wxHtmlLinkEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlCell, _p_wxHtmlCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlColourCell, _p_wxHtmlColourCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_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_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWordCell, _p_wxHtmlWordCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxPageSetupDialogData[] = {  {&_swigt__p_wxPageSetupDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPanel[] = {  {&_swigt__p_wxPanel, 0, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlWindow, _p_wxPyHtmlWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 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_wxPageSetupDialogData[] = {  {&_swigt__p_wxPageSetupDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPanel[] = {  {&_swigt__p_wxPanel, 0, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlWindow, _p_wxPyHtmlWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPaperSize[] = {  {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}};


@@ -19805,6 +19999,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlBookRecArray,
   _swigc__p_wxHtmlBookRecord,
   _swigc__p_wxHtmlCell,
   _swigc__p_wxHtmlBookRecArray,
   _swigc__p_wxHtmlBookRecord,
   _swigc__p_wxHtmlCell,

+  _swigc__p_wxHtmlCellEvent,

   _swigc__p_wxHtmlColourCell,
   _swigc__p_wxHtmlContainerCell,
   _swigc__p_wxHtmlDCRenderer,
   _swigc__p_wxHtmlColourCell,
   _swigc__p_wxHtmlContainerCell,
   _swigc__p_wxHtmlDCRenderer,


@@ -19817,6 +20012,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlHelpFrame,
   _swigc__p_wxHtmlHelpFrameCfg,
   _swigc__p_wxHtmlHelpWindow,
   _swigc__p_wxHtmlHelpFrame,
   _swigc__p_wxHtmlHelpFrameCfg,
   _swigc__p_wxHtmlHelpWindow,

+  _swigc__p_wxHtmlLinkEvent,

   _swigc__p_wxHtmlLinkInfo,
   _swigc__p_wxHtmlModalHelp,
   _swigc__p_wxHtmlParser,
   _swigc__p_wxHtmlLinkInfo,
   _swigc__p_wxHtmlModalHelp,
   _swigc__p_wxHtmlParser,


@@ -19831,7 +20027,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlWidgetCell,
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlWindow,
   _swigc__p_wxHtmlWidgetCell,
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlWindow,

-  _swigc__p_wxHtmlWindowEvent,

   _swigc__p_wxHtmlWindowInterface,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,
   _swigc__p_wxHtmlWindowInterface,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,


@@ -20537,6 +20732,9 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "ID_HTML_SEARCHBUTTON",SWIG_From_int(static_cast< int >(wxID_HTML_SEARCHBUTTON)));
   SWIG_Python_SetConstant(d, "ID_HTML_SEARCHCHOICE",SWIG_From_int(static_cast< int >(wxID_HTML_SEARCHCHOICE)));
   SWIG_Python_SetConstant(d, "ID_HTML_COUNTINFO",SWIG_From_int(static_cast< int >(wxID_HTML_COUNTINFO)));
   SWIG_Python_SetConstant(d, "ID_HTML_SEARCHBUTTON",SWIG_From_int(static_cast< int >(wxID_HTML_SEARCHBUTTON)));
   SWIG_Python_SetConstant(d, "ID_HTML_SEARCHCHOICE",SWIG_From_int(static_cast< int >(wxID_HTML_SEARCHCHOICE)));
   SWIG_Python_SetConstant(d, "ID_HTML_COUNTINFO",SWIG_From_int(static_cast< int >(wxID_HTML_COUNTINFO)));

+  PyDict_SetItemString(d, "wxEVT_COMMAND_HTML_CELL_CLICKED", PyInt_FromLong(wxEVT_COMMAND_HTML_CELL_CLICKED));
+  PyDict_SetItemString(d, "wxEVT_COMMAND_HTML_CELL_HOVER", PyInt_FromLong(wxEVT_COMMAND_HTML_CELL_HOVER));
+  PyDict_SetItemString(d, "wxEVT_COMMAND_HTML_LINK_CLICKED", PyInt_FromLong(wxEVT_COMMAND_HTML_LINK_CLICKED));

   
   wxPyPtrTypeMap_Add("wxHtmlTagHandler",    "wxPyHtmlTagHandler");
   wxPyPtrTypeMap_Add("wxHtmlWinTagHandler", "wxPyHtmlWinTagHandler");
   
   wxPyPtrTypeMap_Add("wxHtmlTagHandler",    "wxPyHtmlTagHandler");
   wxPyPtrTypeMap_Add("wxHtmlWinTagHandler", "wxPyHtmlWinTagHandler");

diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py
index a479078fabea4b7b924abf925869c49d7979bfa5..8ba8f9aeab008af058cdfa8fcdd59783ab582029 100644 (file)
--- a/wxPython/src/msw/_controls.py
+++ b/wxPython/src/msw/_controls.py
@@ -3479,6 +3479,10 @@ TOOL_STYLE_SEPARATOR = _controls_.TOOL_STYLE_SEPARATOR
 TOOL_STYLE_CONTROL = _controls_.TOOL_STYLE_CONTROL
 TB_HORIZONTAL = _controls_.TB_HORIZONTAL
 TB_VERTICAL = _controls_.TB_VERTICAL
 TOOL_STYLE_CONTROL = _controls_.TOOL_STYLE_CONTROL
 TB_HORIZONTAL = _controls_.TB_HORIZONTAL
 TB_VERTICAL = _controls_.TB_VERTICAL

+TB_TOP = _controls_.TB_TOP
+TB_LEFT = _controls_.TB_LEFT
+TB_BOTTOM = _controls_.TB_BOTTOM
+TB_RIGHT = _controls_.TB_RIGHT

 TB_3DBUTTONS = _controls_.TB_3DBUTTONS
 TB_FLAT = _controls_.TB_FLAT
 TB_DOCKABLE = _controls_.TB_DOCKABLE
 TB_3DBUTTONS = _controls_.TB_3DBUTTONS
 TB_FLAT = _controls_.TB_FLAT
 TB_DOCKABLE = _controls_.TB_DOCKABLE


@@ -3489,7 +3493,6 @@ TB_NOALIGN = _controls_.TB_NOALIGN
 TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
 TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
 TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS
 TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
 TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
 TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS

-TB_BOTTOM = _controls_.TB_BOTTOM

 class ToolBarToolBase(_core.Object):
     """Proxy of C++ ToolBarToolBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class ToolBarToolBase(_core.Object):
     """Proxy of C++ ToolBarToolBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')

diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp
index 89df018a693b164a9fe65543aa3d78dd02a7cdf4..c89f8ffd469782675321aa4f0df64f546421abbb 100644 (file)
--- a/wxPython/src/msw/_controls_wrap.cpp
+++ b/wxPython/src/msw/_controls_wrap.cpp
@@ -49267,6 +49267,10 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TOOL_STYLE_CONTROL",SWIG_From_int(static_cast< int >(wxTOOL_STYLE_CONTROL)));
   SWIG_Python_SetConstant(d, "TB_HORIZONTAL",SWIG_From_int(static_cast< int >(wxTB_HORIZONTAL)));
   SWIG_Python_SetConstant(d, "TB_VERTICAL",SWIG_From_int(static_cast< int >(wxTB_VERTICAL)));
   SWIG_Python_SetConstant(d, "TOOL_STYLE_CONTROL",SWIG_From_int(static_cast< int >(wxTOOL_STYLE_CONTROL)));
   SWIG_Python_SetConstant(d, "TB_HORIZONTAL",SWIG_From_int(static_cast< int >(wxTB_HORIZONTAL)));
   SWIG_Python_SetConstant(d, "TB_VERTICAL",SWIG_From_int(static_cast< int >(wxTB_VERTICAL)));

+  SWIG_Python_SetConstant(d, "TB_TOP",SWIG_From_int(static_cast< int >(wxTB_TOP)));
+  SWIG_Python_SetConstant(d, "TB_LEFT",SWIG_From_int(static_cast< int >(wxTB_LEFT)));
+  SWIG_Python_SetConstant(d, "TB_BOTTOM",SWIG_From_int(static_cast< int >(wxTB_BOTTOM)));
+  SWIG_Python_SetConstant(d, "TB_RIGHT",SWIG_From_int(static_cast< int >(wxTB_RIGHT)));

   SWIG_Python_SetConstant(d, "TB_3DBUTTONS",SWIG_From_int(static_cast< int >(wxTB_3DBUTTONS)));
   SWIG_Python_SetConstant(d, "TB_FLAT",SWIG_From_int(static_cast< int >(wxTB_FLAT)));
   SWIG_Python_SetConstant(d, "TB_DOCKABLE",SWIG_From_int(static_cast< int >(wxTB_DOCKABLE)));
   SWIG_Python_SetConstant(d, "TB_3DBUTTONS",SWIG_From_int(static_cast< int >(wxTB_3DBUTTONS)));
   SWIG_Python_SetConstant(d, "TB_FLAT",SWIG_From_int(static_cast< int >(wxTB_FLAT)));
   SWIG_Python_SetConstant(d, "TB_DOCKABLE",SWIG_From_int(static_cast< int >(wxTB_DOCKABLE)));


@@ -49277,7 +49281,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TB_HORZ_LAYOUT",SWIG_From_int(static_cast< int >(wxTB_HORZ_LAYOUT)));
   SWIG_Python_SetConstant(d, "TB_HORZ_TEXT",SWIG_From_int(static_cast< int >(wxTB_HORZ_TEXT)));
   SWIG_Python_SetConstant(d, "TB_NO_TOOLTIPS",SWIG_From_int(static_cast< int >(wxTB_NO_TOOLTIPS)));
   SWIG_Python_SetConstant(d, "TB_HORZ_LAYOUT",SWIG_From_int(static_cast< int >(wxTB_HORZ_LAYOUT)));
   SWIG_Python_SetConstant(d, "TB_HORZ_TEXT",SWIG_From_int(static_cast< int >(wxTB_HORZ_TEXT)));
   SWIG_Python_SetConstant(d, "TB_NO_TOOLTIPS",SWIG_From_int(static_cast< int >(wxTB_NO_TOOLTIPS)));

-  SWIG_Python_SetConstant(d, "TB_BOTTOM",SWIG_From_int(static_cast< int >(wxTB_BOTTOM)));

   SWIG_addvarlink(SWIG_globals(),(char*)"ListCtrlNameStr",ListCtrlNameStr_get, ListCtrlNameStr_set);
   SWIG_Python_SetConstant(d, "LC_VRULES",SWIG_From_int(static_cast< int >(wxLC_VRULES)));
   SWIG_Python_SetConstant(d, "LC_HRULES",SWIG_From_int(static_cast< int >(wxLC_HRULES)));
   SWIG_addvarlink(SWIG_globals(),(char*)"ListCtrlNameStr",ListCtrlNameStr_get, ListCtrlNameStr_set);
   SWIG_Python_SetConstant(d, "LC_VRULES",SWIG_From_int(static_cast< int >(wxLC_VRULES)));
   SWIG_Python_SetConstant(d, "LC_HRULES",SWIG_From_int(static_cast< int >(wxLC_HRULES)));

diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py
index b19f2cfe3ccd36d4758d68a5c9a6004316ab72f4..440db5e57ebb142e4d54b14e7903b57368f03cc3 100644 (file)
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -708,6 +708,16 @@ class Object(object):
         args[0].this.own(False)
         return _core_.Object_Destroy(*args, **kwargs)
 
         args[0].this.own(False)
         return _core_.Object_Destroy(*args, **kwargs)
 

+    def IsSameAs(*args, **kwargs):
+        """
+        IsSameAs(self, Object p) -> bool
+
+        For wx.Objects that use C++ reference counting internally, this method
+        can be used to determine if two objects are referencing the same data
+        object.
+        """
+        return _core_.Object_IsSameAs(*args, **kwargs)
+

     ClassName = property(GetClassName,doc="See `GetClassName`") 
 _core_.Object_swigregister(Object)
 _wxPySetDictionary = _core_._wxPySetDictionary
     ClassName = property(GetClassName,doc="See `GetClassName`") 
 _core_.Object_swigregister(Object)
 _wxPySetDictionary = _core_._wxPySetDictionary


@@ -734,6 +744,7 @@ BITMAP_TYPE_PICT = _core_.BITMAP_TYPE_PICT
 BITMAP_TYPE_ICON = _core_.BITMAP_TYPE_ICON
 BITMAP_TYPE_ANI = _core_.BITMAP_TYPE_ANI
 BITMAP_TYPE_IFF = _core_.BITMAP_TYPE_IFF
 BITMAP_TYPE_ICON = _core_.BITMAP_TYPE_ICON
 BITMAP_TYPE_ANI = _core_.BITMAP_TYPE_ANI
 BITMAP_TYPE_IFF = _core_.BITMAP_TYPE_IFF

+BITMAP_TYPE_TGA = _core_.BITMAP_TYPE_TGA

 BITMAP_TYPE_MACCURSOR = _core_.BITMAP_TYPE_MACCURSOR
 BITMAP_TYPE_ANY = _core_.BITMAP_TYPE_ANY
 CURSOR_NONE = _core_.CURSOR_NONE
 BITMAP_TYPE_MACCURSOR = _core_.BITMAP_TYPE_MACCURSOR
 BITMAP_TYPE_ANY = _core_.BITMAP_TYPE_ANY
 CURSOR_NONE = _core_.CURSOR_NONE


@@ -8594,18 +8605,11 @@ class Window(EvtHandler):
         """
         return _core_.Window_GetBestFittingSize(*args, **kwargs)
 
         """
         return _core_.Window_GetBestFittingSize(*args, **kwargs)
 

-    def GetAdjustedBestSize(*args, **kwargs):
-        """
-        GetAdjustedBestSize(self) -> Size
-
-        This method is similar to GetBestSize, except in one
-        thing. GetBestSize should return the minimum untruncated size of the
-        window, while this method will return the largest of BestSize and any
-        user specified minimum size. ie. it is the minimum size the window
-        should currently be drawn at, not the minimal size it can possibly
-        tolerate.
-        """
-        return _core_.Window_GetAdjustedBestSize(*args, **kwargs)
+    def GetAdjustedBestSize(self):
+        s = self.GetBestSize()
+        return wx.Size(max(s.width,  self.GetMinWidth()),
+                       max(s.height, self.GetMinHeight()))
+    GetAdjustedBestSize = wx._deprecated(GetAdjustedBestSize, 'Use `GetBestFittingSize` instead.')

 
     def Center(*args, **kwargs):
         """
 
     def Center(*args, **kwargs):
         """

diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp
index 9756289a33a887e1ba9516160864db17b80533cd..c989d797c7cc0f88f6b06d0ea61d070c40ec46ab 100644 (file)
--- a/wxPython/src/msw/_core_wrap.cpp
+++ b/wxPython/src/msw/_core_wrap.cpp
@@ -4495,6 +4495,50 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_Object_IsSameAs(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxObject *arg1 = (wxObject *) 0 ;
+  wxObject *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 *) "p", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Object_IsSameAs",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxObject, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Object_IsSameAs" "', expected argument " "1"" of type '" "wxObject const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxObject * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxObject,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Object_IsSameAs" "', expected argument " "2"" of type '" "wxObject const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Object_IsSameAs" "', expected argument " "2"" of type '" "wxObject const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxObject * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)((wxObject const *)arg1)->IsSameAs((wxObject 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 *Object_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *Object_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -34615,34 +34659,6 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Window_GetAdjustedBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxWindow *arg1 = (wxWindow *) 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_wxWindow, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetAdjustedBestSize" "', expected argument " "1"" of type '" "wxWindow const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxWindow * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = ((wxWindow const *)arg1)->GetAdjustedBestSize();
-    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_Window_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_Window_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;


@@ -56418,6 +56434,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS, NULL},
         { (char *)"Object_GetClassName", (PyCFunction)_wrap_Object_GetClassName, METH_O, NULL},
         { (char *)"Object_Destroy", (PyCFunction)_wrap_Object_Destroy, METH_O, NULL},
         { (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS, NULL},
         { (char *)"Object_GetClassName", (PyCFunction)_wrap_Object_GetClassName, METH_O, NULL},
         { (char *)"Object_Destroy", (PyCFunction)_wrap_Object_Destroy, METH_O, NULL},

+        { (char *)"Object_IsSameAs", (PyCFunction) _wrap_Object_IsSameAs, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"Object_swigregister", Object_swigregister, METH_VARARGS, NULL},
         { (char *)"Size_width_set", _wrap_Size_width_set, METH_VARARGS, NULL},
         { (char *)"Size_width_get", (PyCFunction)_wrap_Size_width_get, METH_O, NULL},
         { (char *)"Object_swigregister", Object_swigregister, METH_VARARGS, NULL},
         { (char *)"Size_width_set", _wrap_Size_width_set, METH_VARARGS, NULL},
         { (char *)"Size_width_get", (PyCFunction)_wrap_Size_width_get, METH_O, NULL},


@@ -57391,7 +57408,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Window_InvalidateBestSize", (PyCFunction)_wrap_Window_InvalidateBestSize, METH_O, NULL},
         { (char *)"Window_CacheBestSize", (PyCFunction) _wrap_Window_CacheBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_GetBestFittingSize", (PyCFunction)_wrap_Window_GetBestFittingSize, METH_O, NULL},
         { (char *)"Window_InvalidateBestSize", (PyCFunction)_wrap_Window_InvalidateBestSize, METH_O, NULL},
         { (char *)"Window_CacheBestSize", (PyCFunction) _wrap_Window_CacheBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_GetBestFittingSize", (PyCFunction)_wrap_Window_GetBestFittingSize, METH_O, NULL},

-        { (char *)"Window_GetAdjustedBestSize", (PyCFunction)_wrap_Window_GetAdjustedBestSize, METH_O, NULL},

         { (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_Fit", (PyCFunction)_wrap_Window_Fit, METH_O, NULL},
         { (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_Fit", (PyCFunction)_wrap_Window_Fit, METH_O, NULL},


@@ -60178,6 +60194,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ICON",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ICON)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANI",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANI)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_IFF",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_IFF)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ICON",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ICON)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANI",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANI)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_IFF",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_IFF)));

+  SWIG_Python_SetConstant(d, "BITMAP_TYPE_TGA",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_TGA)));

   SWIG_Python_SetConstant(d, "BITMAP_TYPE_MACCURSOR",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_MACCURSOR)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANY",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANY)));
   SWIG_Python_SetConstant(d, "CURSOR_NONE",SWIG_From_int(static_cast< int >(wxCURSOR_NONE)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_MACCURSOR",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_MACCURSOR)));
   SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANY",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANY)));
   SWIG_Python_SetConstant(d, "CURSOR_NONE",SWIG_From_int(static_cast< int >(wxCURSOR_NONE)));

diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py
index bc2056a53509aeefbb6378ea270cd7ac850458b3..2206b5554e35226b96653dd95c12af5df1a925ec 100644 (file)
--- a/wxPython/src/msw/_gdi.py
+++ b/wxPython/src/msw/_gdi.py
@@ -693,6 +693,24 @@ class Bitmap(GDIObject):
         """CopyFromCursor(self, Cursor cursor) -> bool"""
         return _gdi_.Bitmap_CopyFromCursor(*args, **kwargs)
 
         """CopyFromCursor(self, Cursor cursor) -> bool"""
         return _gdi_.Bitmap_CopyFromCursor(*args, **kwargs)
 

+    def CopyFromBuffer(*args, **kwargs):
+        """
+        CopyFromBuffer(self, buffer data)
+
+        Copy data from a RGB buffer object to replace the bitmap pixel data.
+        See `wxBitmapFromBuffer` for more .
+        """
+        return _gdi_.Bitmap_CopyFromBuffer(*args, **kwargs)
+
+    def CopyFromBufferRGBA(*args, **kwargs):
+        """
+        CopyFromBufferRGBA(self, buffer data)
+
+        Copy data from a RGBA buffer object to replace the bitmap pixel data.
+        See `wxBitmapFromBufferRGBA` for more .
+        """
+        return _gdi_.Bitmap_CopyFromBufferRGBA(*args, **kwargs)
+

     def __nonzero__(self): return self.IsOk() 
     def __eq__(*args, **kwargs):
         """__eq__(self, Bitmap other) -> bool"""
     def __nonzero__(self): return self.IsOk() 
     def __eq__(*args, **kwargs):
         """__eq__(self, Bitmap other) -> bool"""


@@ -3456,6 +3474,10 @@ class DC(_core.Object):
         """
         return _gdi_.DC_BlitPointSize(*args, **kwargs)
 
         """
         return _gdi_.DC_BlitPointSize(*args, **kwargs)
 

+    def GetAsBitmap(*args, **kwargs):
+        """GetAsBitmap(self, Rect subrect=None) -> Bitmap"""
+        return _gdi_.DC_GetAsBitmap(*args, **kwargs)
+

     def SetClippingRegion(*args, **kwargs):
         """
         SetClippingRegion(self, int x, int y, int width, int height)
     def SetClippingRegion(*args, **kwargs):
         """
         SetClippingRegion(self, int x, int y, int width, int height)


@@ -4604,6 +4626,10 @@ class MemoryDC(DC):
         """
         return _gdi_.MemoryDC_SelectObject(*args, **kwargs)
 
         """
         return _gdi_.MemoryDC_SelectObject(*args, **kwargs)
 

+    def SelectObjectAsSource(*args, **kwargs):
+        """SelectObjectAsSource(self, Bitmap bmp)"""
+        return _gdi_.MemoryDC_SelectObjectAsSource(*args, **kwargs)
+

 _gdi_.MemoryDC_swigregister(MemoryDC)
 
 def MemoryDCFromDC(*args, **kwargs):
 _gdi_.MemoryDC_swigregister(MemoryDC)
 
 def MemoryDCFromDC(*args, **kwargs):


@@ -5091,8 +5117,10 @@ _gdi_.GraphicsFont_swigregister(GraphicsFont)
 class GraphicsMatrix(GraphicsObject):
     """Proxy of C++ GraphicsMatrix class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class GraphicsMatrix(GraphicsObject):
     """Proxy of C++ GraphicsMatrix class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')

-    def __init__(self): raise AttributeError, "No constructor defined"

     __repr__ = _swig_repr
     __repr__ = _swig_repr

+    def __init__(self, *args, **kwargs): 
+        """__init__(self) -> GraphicsMatrix"""
+        _gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs))

     __swig_destroy__ = _gdi_.delete_GraphicsMatrix
     __del__ = lambda self : None;
     def Concat(*args, **kwargs):
     __swig_destroy__ = _gdi_.delete_GraphicsMatrix
     __del__ = lambda self : None;
     def Concat(*args, **kwargs):


@@ -5197,8 +5225,10 @@ _gdi_.GraphicsMatrix_swigregister(GraphicsMatrix)
 class GraphicsPath(GraphicsObject):
     """Proxy of C++ GraphicsPath class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class GraphicsPath(GraphicsObject):
     """Proxy of C++ GraphicsPath class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')

-    def __init__(self): raise AttributeError, "No constructor defined"

     __repr__ = _swig_repr
     __repr__ = _swig_repr

+    def __init__(self, *args, **kwargs): 
+        """__init__(self) -> GraphicsPath"""
+        _gdi_.GraphicsPath_swiginit(self,_gdi_.new_GraphicsPath(*args, **kwargs))

     __swig_destroy__ = _gdi_.delete_GraphicsPath
     __del__ = lambda self : None;
     def MoveToPoint(*args):
     __swig_destroy__ = _gdi_.delete_GraphicsPath
     __del__ = lambda self : None;
     def MoveToPoint(*args):


@@ -5351,8 +5381,8 @@ class GraphicsPath(GraphicsObject):
 
     def Contains(*args):
         """
 
     def Contains(*args):
         """

-        Contains(self, Double x, Double y, int fillStyle=WINDING_RULE) -> bool
-        Contains(self, wxPoint2DDouble c, int fillStyle=WINDING_RULE) -> bool
+        Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool
+        Contains(self, wxPoint2DDouble c, int fillStyle=ODDEVEN_RULE) -> bool

         """
         return _gdi_.GraphicsPath_Contains(*args)
 
         """
         return _gdi_.GraphicsPath_Contains(*args)
 


@@ -5573,7 +5603,7 @@ class GraphicsContext(GraphicsObject):
 
     def FillPath(*args, **kwargs):
         """
 
     def FillPath(*args, **kwargs):
         """

-        FillPath(self, GraphicsPath path, int fillStyle=WINDING_RULE)
+        FillPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE)

 
         fills a path with the current brush
         """
 
         fills a path with the current brush
         """


@@ -5581,7 +5611,7 @@ class GraphicsContext(GraphicsObject):
 
     def DrawPath(*args, **kwargs):
         """
 
     def DrawPath(*args, **kwargs):
         """

-        DrawPath(self, GraphicsPath path, int fillStyle=WINDING_RULE)
+        DrawPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE)

 
         draws a path by first filling and then stroking
         """
 
         draws a path by first filling and then stroking
         """


@@ -5641,7 +5671,7 @@ class GraphicsContext(GraphicsObject):
 
     def DrawLines(*args, **kwargs):
         """
 
     def DrawLines(*args, **kwargs):
         """

-        DrawLines(self, size_t points, int fillStyle=WINDING_RULE)
+        DrawLines(self, size_t points, int fillStyle=ODDEVEN_RULE)

 
         draws a polygon
         """
 
         draws a polygon
         """

diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp
index c16c80e99487377bda2477606b2df9fd36559237..2e68c1e0c8d72e58c13e326202de974e49507d55 100644 (file)
--- a/wxPython/src/msw/_gdi_wrap.cpp
+++ b/wxPython/src/msw/_gdi_wrap.cpp
@@ -2926,6 +2926,18 @@ SWIGINTERN bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*s
 #include <wx/rawbmp.h>
 
 
 #include <wx/rawbmp.h>
 
 

+// 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
+
+

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


@@ -2977,20 +2989,67 @@ SWIGINTERN void wxBitmap_SetSize(wxBitmap *self,wxSize const &size){
             self->SetWidth(size.x);
             self->SetHeight(size.y);
         }
             self->SetWidth(size.x);
             self->SetHeight(size.y);
         }

-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 void wxBitmap_CopyFromBuffer(wxBitmap *self,buffer data,int DATASIZE){
+            int height=self->GetHeight();
+            int width=self->GetWidth();

 
 

-// 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
+            if (DATASIZE != width * height * 3) {
+                wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
+            }
+            wxNativePixelData pixData(*self, wxPoint(0,0), wxSize(width, height));
+            if (! pixData) {
+                // raise an exception...
+                wxPyErr_SetString(PyExc_RuntimeError,
+                                  "Failed to gain raw access to bitmap data.");
+                return;
+            }

 
 

+            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);
+            }
+        }
+SWIGINTERN void wxBitmap_CopyFromBufferRGBA(wxBitmap *self,buffer data,int DATASIZE){
+            int height=self->GetHeight();
+            int width=self->GetWidth();
+            
+            if (DATASIZE != width * height * 4) {
+                wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
+            }
+            wxAlphaPixelData pixData(*self, wxPoint(0,0), wxSize(width, height));
+            if (! pixData) {
+                // raise an exception...
+                wxPyErr_SetString(PyExc_RuntimeError,
+                                  "Failed to gain raw access to bitmap data.");
+                return;
+            }
+
+            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);
+            }
+        }
+SWIGINTERN bool wxBitmap___eq__(wxBitmap *self,wxBitmap const *other){ return other ? self->IsSameAs(*other) : false; }
+SWIGINTERN bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? !self->IsSameAs(*other) : true;  }

 
     wxBitmap* _BitmapFromBufferAlpha(int width, int height,
                                     buffer data, int DATASIZE,
 
     wxBitmap* _BitmapFromBufferAlpha(int width, int height,
                                     buffer data, int DATASIZE,


@@ -7086,6 +7145,76 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_Bitmap_CopyFromBuffer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxBitmap *arg1 = (wxBitmap *) 0 ;
+  buffer arg2 ;
+  int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  Py_ssize_t temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "data", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_CopyFromBuffer",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 '" "Bitmap_CopyFromBuffer" "', expected argument " "1"" of type '" "wxBitmap *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  {
+    if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail;
+    arg3 = (int)temp2;
+  }
+  {
+    wxBitmap_CopyFromBuffer(arg1,arg2,arg3);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Bitmap_CopyFromBufferRGBA(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxBitmap *arg1 = (wxBitmap *) 0 ;
+  buffer arg2 ;
+  int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  Py_ssize_t temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "data", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_CopyFromBufferRGBA",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 '" "Bitmap_CopyFromBufferRGBA" "', expected argument " "1"" of type '" "wxBitmap *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBitmap * >(argp1);
+  {
+    if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail;
+    arg3 = (int)temp2;
+  }
+  {
+    wxBitmap_CopyFromBufferRGBA(arg1,arg2,arg3);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_Bitmap___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBitmap *arg1 = (wxBitmap *) 0 ;
 SWIGINTERN PyObject *_wrap_Bitmap___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBitmap *arg1 = (wxBitmap *) 0 ;


@@ -20337,6 +20466,47 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_DC_GetAsBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxDC *arg1 = (wxDC *) 0 ;
+  wxRect *arg2 = (wxRect *) NULL ;
+  SwigValueWrapper<wxBitmap > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "subrect", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DC_GetAsBitmap",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_GetAsBitmap" "', expected argument " "1"" of type '" "wxDC const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDC * >(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 '" "DC_GetAsBitmap" "', expected argument " "2"" of type '" "wxRect const *""'"); 
+    }
+    arg2 = reinterpret_cast< wxRect * >(argp2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxDC const *)arg1)->GetAsBitmap((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 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_DC_SetClippingRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;
 SWIGINTERN PyObject *_wrap_DC_SetClippingRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;


@@ -24433,7 +24603,7 @@ SWIGINTERN PyObject *DCClipper_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
 
 SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
 
 SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;

-  wxBitmap const &arg1_defvalue = wxNullBitmap ;
+  wxBitmap &arg1_defvalue = wxNullBitmap ;

   wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ;
   wxMemoryDC *result = 0 ;
   void *argp1 = 0 ;
   wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ;
   wxMemoryDC *result = 0 ;
   void *argp1 = 0 ;


@@ -24445,19 +24615,19 @@ SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail;
   if (obj0) {
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail;
   if (obj0) {

-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0  | 0);
+    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap,  0 );

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

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

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

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

     }
     arg1 = reinterpret_cast< wxBitmap * >(argp1);
   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     arg1 = reinterpret_cast< wxBitmap * >(argp1);
   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxMemoryDC *)new wxMemoryDC((wxBitmap const &)*arg1);
+    result = (wxMemoryDC *)new wxMemoryDC(*arg1);

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


@@ -24519,17 +24689,58 @@ SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); 
   }
   arg1 = reinterpret_cast< wxMemoryDC * >(argp1);
     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 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SelectObject(*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_MemoryDC_SelectObjectAsSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxMemoryDC *arg1 = (wxMemoryDC *) 0 ;
+  wxBitmap *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 *) "bmp", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObjectAsSource",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObjectAsSource" "', 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)) {
   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(res2), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 

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

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

   }
   arg2 = reinterpret_cast< wxBitmap * >(argp2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg2 = reinterpret_cast< wxBitmap * >(argp2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SelectObject((wxBitmap const &)*arg2);
+    (arg1)->SelectObjectAsSource((wxBitmap const &)*arg2);

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


@@ -26100,6 +26311,22 @@ SWIGINTERN PyObject *GraphicsFont_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObj
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

+SWIGINTERN PyObject *_wrap_new_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGraphicsMatrix *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_GraphicsMatrix",0,0,0)) SWIG_fail;
+  {
+    result = (wxGraphicsMatrix *)new wxGraphicsMatrix();
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsMatrix, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_delete_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ;
 SWIGINTERN PyObject *_wrap_delete_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ;


@@ -26376,11 +26603,11 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_IsIdentity(PyObject *SWIGUNUSEDPARM(se
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_IsIdentity" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_IsIdentity" "', expected argument " "1"" of type '" "wxGraphicsMatrix const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1);
   {

-    result = (bool)(arg1)->IsIdentity();
+    result = (bool)((wxGraphicsMatrix const *)arg1)->IsIdentity();

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


@@ -26539,7 +26766,7 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_TransformPoint(PyObject *SWIGUNUSEDPAR
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsMatrix_TransformPoint",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsMatrix_TransformPoint",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_TransformPoint" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_TransformPoint" "', expected argument " "1"" of type '" "wxGraphicsMatrix const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1);
   if (!(SWIG_IsOK((res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2),SWIGTYPE_p_double,0))))) {
   }
   arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1);
   if (!(SWIG_IsOK((res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2),SWIGTYPE_p_double,0))))) {


@@ -26563,7 +26790,7 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_TransformPoint(PyObject *SWIGUNUSEDPAR
     res3 = SWIG_AddTmpMask(ecode);
   }
   {
     res3 = SWIG_AddTmpMask(ecode);
   }
   {

-    (arg1)->TransformPoint(arg2,arg3);
+    ((wxGraphicsMatrix const *)arg1)->TransformPoint(arg2,arg3);

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


@@ -26606,7 +26833,7 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_TransformDistance(PyObject *SWIGUNUSED
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsMatrix_TransformDistance",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsMatrix_TransformDistance",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_TransformDistance" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_TransformDistance" "', expected argument " "1"" of type '" "wxGraphicsMatrix const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1);
   if (!(SWIG_IsOK((res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2),SWIGTYPE_p_double,0))))) {
   }
   arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1);
   if (!(SWIG_IsOK((res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2),SWIGTYPE_p_double,0))))) {


@@ -26630,7 +26857,7 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_TransformDistance(PyObject *SWIGUNUSED
     res3 = SWIG_AddTmpMask(ecode);
   }
   {
     res3 = SWIG_AddTmpMask(ecode);
   }
   {

-    (arg1)->TransformDistance(arg2,arg3);
+    ((wxGraphicsMatrix const *)arg1)->TransformDistance(arg2,arg3);

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


@@ -26685,6 +26912,29 @@ SWIGINTERN PyObject *GraphicsMatrix_swigregister(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

+SWIGINTERN PyObject *GraphicsMatrix_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGraphicsPath *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_GraphicsPath",0,0,0)) SWIG_fail;
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxGraphicsPath *)new wxGraphicsPath();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsPath, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_delete_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
 SWIGINTERN PyObject *_wrap_delete_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;


@@ -27092,11 +27342,11 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_GetCurrentPoint(PyObject *SWIGUNUSEDPARM
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_GetCurrentPoint" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_GetCurrentPoint" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   {

-    result = (arg1)->GetCurrentPoint();
+    result = ((wxGraphicsPath const *)arg1)->GetCurrentPoint();

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


@@ -27686,7 +27936,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_UnGetNativePath(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsPath_UnGetNativePath",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsPath_UnGetNativePath",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_UnGetNativePath" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_UnGetNativePath" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);


@@ -27694,7 +27944,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_UnGetNativePath(PyObject *SWIGUNUSEDPARM
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsPath_UnGetNativePath" "', expected argument " "2"" of type '" "void *""'"); 
   }
   {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsPath_UnGetNativePath" "', expected argument " "2"" of type '" "void *""'"); 
   }
   {

-    (arg1)->UnGetNativePath(arg2);
+    ((wxGraphicsPath const *)arg1)->UnGetNativePath(arg2);

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


@@ -27755,11 +28005,11 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), P
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_GetBox" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_GetBox" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   {

-    result = (arg1)->GetBox();
+    result = ((wxGraphicsPath const *)arg1)->GetBox();

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


@@ -27774,7 +28024,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_0(PyObject *SWIGUNUSEDPAR
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
   wxDouble arg2 ;
   wxDouble arg3 ;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
   wxDouble arg2 ;
   wxDouble arg3 ;

-  int arg4 = (int) wxWINDING_RULE ;
+  int arg4 = (int) wxODDEVEN_RULE ;

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


@@ -27788,7 +28038,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_0(PyObject *SWIGUNUSEDPAR
   if ((nobjs < 3) || (nobjs > 4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if ((nobjs < 3) || (nobjs > 4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);


@@ -27809,7 +28059,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_0(PyObject *SWIGUNUSEDPAR
     arg4 = static_cast< int >(val4);
   }
   {
     arg4 = static_cast< int >(val4);
   }
   {

-    result = (bool)(arg1)->Contains(arg2,arg3,arg4);
+    result = (bool)((wxGraphicsPath const *)arg1)->Contains(arg2,arg3,arg4);

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


@@ -27825,7 +28075,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
   wxPoint2DDouble *arg2 = 0 ;
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
   wxPoint2DDouble *arg2 = 0 ;

-  int arg3 = (int) wxWINDING_RULE ;
+  int arg3 = (int) wxODDEVEN_RULE ;

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


@@ -27837,7 +28087,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR
   if ((nobjs < 2) || (nobjs > 3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if ((nobjs < 2) || (nobjs > 3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); 

   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxPoint2DDouble,  0  | 0);
   }
   arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
   res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxPoint2DDouble,  0  | 0);


@@ -27856,7 +28106,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR
     arg3 = static_cast< int >(val3);
   }
   {
     arg3 = static_cast< int >(val3);
   }
   {

-    result = (bool)(arg1)->Contains((wxPoint2DDouble const &)*arg2,arg3);
+    result = (bool)((wxGraphicsPath const *)arg1)->Contains((wxPoint2DDouble const &)*arg2,arg3);

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


@@ -27911,6 +28161,10 @@ SWIGINTERN PyObject *GraphicsPath_swigregister(PyObject *SWIGUNUSEDPARM(self), P
   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

+SWIGINTERN PyObject *GraphicsPath_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+

 SWIGINTERN int NullGraphicsPen_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NullGraphicsPen is read-only.");
   return 1;
 SWIGINTERN int NullGraphicsPen_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NullGraphicsPen is read-only.");
   return 1;


@@ -29322,7 +29576,7 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_FillPath(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ;
   wxGraphicsPath *arg2 = 0 ;
   PyObject *resultobj = 0;
   wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ;
   wxGraphicsPath *arg2 = 0 ;

-  int arg3 = (int) wxWINDING_RULE ;
+  int arg3 = (int) wxODDEVEN_RULE ;

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


@@ -29372,7 +29626,7 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_DrawPath(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ;
   wxGraphicsPath *arg2 = 0 ;
   PyObject *resultobj = 0;
   wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ;
   wxGraphicsPath *arg2 = 0 ;

-  int arg3 = (int) wxWINDING_RULE ;
+  int arg3 = (int) wxODDEVEN_RULE ;

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


@@ -30013,7 +30267,7 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_DrawLines(PyObject *SWIGUNUSEDPARM(se
   wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ;
   size_t arg2 ;
   wxPoint2D *arg3 = (wxPoint2D *) 0 ;
   wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ;
   size_t arg2 ;
   wxPoint2D *arg3 = (wxPoint2D *) 0 ;

-  int arg4 = (int) wxWINDING_RULE ;
+  int arg4 = (int) wxODDEVEN_RULE ;

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


@@ -38878,6 +39132,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetSize", (PyCFunction) _wrap_Bitmap_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_CopyFromCursor", (PyCFunction) _wrap_Bitmap_CopyFromCursor, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_SetSize", (PyCFunction) _wrap_Bitmap_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_CopyFromCursor", (PyCFunction) _wrap_Bitmap_CopyFromCursor, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"Bitmap_CopyFromBuffer", (PyCFunction) _wrap_Bitmap_CopyFromBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Bitmap_CopyFromBufferRGBA", (PyCFunction) _wrap_Bitmap_CopyFromBufferRGBA, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS, NULL},
         { (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS, NULL},


@@ -39234,6 +39490,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DC_DrawRotatedTextPoint", (PyCFunction) _wrap_DC_DrawRotatedTextPoint, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_Blit", (PyCFunction) _wrap_DC_Blit, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_BlitPointSize", (PyCFunction) _wrap_DC_BlitPointSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_DrawRotatedTextPoint", (PyCFunction) _wrap_DC_DrawRotatedTextPoint, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_Blit", (PyCFunction) _wrap_DC_Blit, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_BlitPointSize", (PyCFunction) _wrap_DC_BlitPointSize, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"DC_GetAsBitmap", (PyCFunction) _wrap_DC_GetAsBitmap, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -39344,6 +39601,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"MemoryDC_SelectObjectAsSource", (PyCFunction) _wrap_MemoryDC_SelectObjectAsSource, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL},
         { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL},
         { (char *)"new_ScreenDC", (PyCFunction)_wrap_new_ScreenDC, METH_NOARGS, NULL},
         { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL},
         { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL},
         { (char *)"new_ScreenDC", (PyCFunction)_wrap_new_ScreenDC, METH_NOARGS, NULL},


@@ -39418,6 +39676,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"delete_GraphicsFont", (PyCFunction)_wrap_delete_GraphicsFont, METH_O, NULL},
         { (char *)"GraphicsFont_swigregister", GraphicsFont_swigregister, METH_VARARGS, NULL},
         { (char *)"GraphicsFont_swiginit", GraphicsFont_swiginit, METH_VARARGS, NULL},
         { (char *)"delete_GraphicsFont", (PyCFunction)_wrap_delete_GraphicsFont, METH_O, NULL},
         { (char *)"GraphicsFont_swigregister", GraphicsFont_swigregister, METH_VARARGS, NULL},
         { (char *)"GraphicsFont_swiginit", GraphicsFont_swiginit, METH_VARARGS, NULL},

+        { (char *)"new_GraphicsMatrix", (PyCFunction)_wrap_new_GraphicsMatrix, METH_NOARGS, NULL},

         { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL},
         { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GraphicsMatrix_Copy", (PyCFunction) _wrap_GraphicsMatrix_Copy, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL},
         { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GraphicsMatrix_Copy", (PyCFunction) _wrap_GraphicsMatrix_Copy, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -39432,6 +39691,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GraphicsMatrix_TransformDistance", (PyCFunction) _wrap_GraphicsMatrix_TransformDistance, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GraphicsMatrix_GetNativeMatrix", (PyCFunction)_wrap_GraphicsMatrix_GetNativeMatrix, METH_O, NULL},
         { (char *)"GraphicsMatrix_swigregister", GraphicsMatrix_swigregister, METH_VARARGS, NULL},
         { (char *)"GraphicsMatrix_TransformDistance", (PyCFunction) _wrap_GraphicsMatrix_TransformDistance, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GraphicsMatrix_GetNativeMatrix", (PyCFunction)_wrap_GraphicsMatrix_GetNativeMatrix, METH_O, NULL},
         { (char *)"GraphicsMatrix_swigregister", GraphicsMatrix_swigregister, METH_VARARGS, NULL},

+        { (char *)"GraphicsMatrix_swiginit", GraphicsMatrix_swiginit, METH_VARARGS, NULL},
+        { (char *)"new_GraphicsPath", (PyCFunction)_wrap_new_GraphicsPath, METH_NOARGS, NULL},

         { (char *)"delete_GraphicsPath", (PyCFunction)_wrap_delete_GraphicsPath, METH_O, NULL},
         { (char *)"GraphicsPath_MoveToPoint", _wrap_GraphicsPath_MoveToPoint, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_AddLineToPoint", _wrap_GraphicsPath_AddLineToPoint, METH_VARARGS, NULL},
         { (char *)"delete_GraphicsPath", (PyCFunction)_wrap_delete_GraphicsPath, METH_O, NULL},
         { (char *)"GraphicsPath_MoveToPoint", _wrap_GraphicsPath_MoveToPoint, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_AddLineToPoint", _wrap_GraphicsPath_AddLineToPoint, METH_VARARGS, NULL},


@@ -39452,6 +39713,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GraphicsPath_GetBox", (PyCFunction)_wrap_GraphicsPath_GetBox, METH_O, NULL},
         { (char *)"GraphicsPath_Contains", _wrap_GraphicsPath_Contains, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_GetBox", (PyCFunction)_wrap_GraphicsPath_GetBox, METH_O, NULL},
         { (char *)"GraphicsPath_Contains", _wrap_GraphicsPath_Contains, METH_VARARGS, NULL},
         { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL},

+        { (char *)"GraphicsPath_swiginit", GraphicsPath_swiginit, METH_VARARGS, NULL},

         { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL},
         { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL},
         { (char *)"GraphicsContext_CreateFromNative", (PyCFunction) _wrap_GraphicsContext_CreateFromNative, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL},
         { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL},
         { (char *)"GraphicsContext_CreateFromNative", (PyCFunction) _wrap_GraphicsContext_CreateFromNative, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py
index ad5eaba23c378feadbe348414b580caa45054190..40d2696f9906be67a2a232668a4e3da102c852a9 100644 (file)
--- a/wxPython/src/msw/_misc.py
+++ b/wxPython/src/msw/_misc.py
@@ -1886,6 +1886,16 @@ class Process(_core.EvtHandler):
         _misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))
         self._setCallbackInfo(self, Process)
 
         _misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))
         self._setCallbackInfo(self, Process)
 

+    __swig_destroy__ = _misc_.delete_Process
+    __del__ = lambda self : None;
+    def GetPid(*args, **kwargs):
+        """
+        GetPid(self) -> long
+
+        get the process ID of the process executed by Open()
+        """
+        return _misc_.Process_GetPid(*args, **kwargs)
+

     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.Process__setCallbackInfo(*args, **kwargs)
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.Process__setCallbackInfo(*args, **kwargs)


@@ -3369,6 +3379,7 @@ class DateTime(object):
     GMT10 = _misc_.DateTime_GMT10
     GMT11 = _misc_.DateTime_GMT11
     GMT12 = _misc_.DateTime_GMT12
     GMT10 = _misc_.DateTime_GMT10
     GMT11 = _misc_.DateTime_GMT11
     GMT12 = _misc_.DateTime_GMT12

+    GMT13 = _misc_.DateTime_GMT13

     WET = _misc_.DateTime_WET
     WEST = _misc_.DateTime_WEST
     CET = _misc_.DateTime_CET
     WET = _misc_.DateTime_WET
     WEST = _misc_.DateTime_WEST
     CET = _misc_.DateTime_CET


@@ -3394,6 +3405,8 @@ class DateTime(object):
     A_CST = _misc_.DateTime_A_CST
     A_EST = _misc_.DateTime_A_EST
     A_ESST = _misc_.DateTime_A_ESST
     A_CST = _misc_.DateTime_A_CST
     A_EST = _misc_.DateTime_A_EST
     A_ESST = _misc_.DateTime_A_ESST

+    NZST = _misc_.DateTime_NZST
+    NZDT = _misc_.DateTime_NZDT

     UTC = _misc_.DateTime_UTC
     Gregorian = _misc_.DateTime_Gregorian
     Julian = _misc_.DateTime_Julian
     UTC = _misc_.DateTime_UTC
     Gregorian = _misc_.DateTime_Gregorian
     Julian = _misc_.DateTime_Julian

diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp
index fe3f444b86ac7958e71bc934bb1e513a7bfab82a..f6fd4aa8eb46ffacef44d61d7c3ba41f2c97ca34 100644 (file)
--- a/wxPython/src/msw/_misc_wrap.cpp
+++ b/wxPython/src/msw/_misc_wrap.cpp
@@ -14407,6 +14407,62 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_delete_Process(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyProcess *arg1 = (wxPyProcess *) 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_wxPyProcess, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Process" "', expected argument " "1"" of type '" "wxPyProcess *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyProcess * >(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_Process_GetPid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyProcess *arg1 = (wxPyProcess *) 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_wxPyProcess, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Process_GetPid" "', expected argument " "1"" of type '" "wxPyProcess const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyProcess * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (long)((wxPyProcess const *)arg1)->GetPid();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_long(static_cast< long >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_Process__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPyProcess *arg1 = (wxPyProcess *) 0 ;
 SWIGINTERN PyObject *_wrap_Process__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPyProcess *arg1 = (wxPyProcess *) 0 ;


@@ -39427,6 +39483,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Process_Exists", (PyCFunction) _wrap_Process_Exists, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Open", (PyCFunction) _wrap_Process_Open, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_Process", (PyCFunction) _wrap_new_Process, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Exists", (PyCFunction) _wrap_Process_Exists, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Open", (PyCFunction) _wrap_Process_Open, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_Process", (PyCFunction) _wrap_new_Process, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"delete_Process", (PyCFunction)_wrap_delete_Process, METH_O, NULL},
+        { (char *)"Process_GetPid", (PyCFunction)_wrap_Process_GetPid, METH_O, NULL},

         { (char *)"Process__setCallbackInfo", (PyCFunction) _wrap_Process__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_OnTerminate", (PyCFunction) _wrap_Process_OnTerminate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Redirect", (PyCFunction)_wrap_Process_Redirect, METH_O, NULL},
         { (char *)"Process__setCallbackInfo", (PyCFunction) _wrap_Process__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_OnTerminate", (PyCFunction) _wrap_Process_OnTerminate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Process_Redirect", (PyCFunction)_wrap_Process_Redirect, METH_O, NULL},


@@ -42163,6 +42221,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "DateTime_GMT10",SWIG_From_int(static_cast< int >(wxDateTime::GMT10)));
   SWIG_Python_SetConstant(d, "DateTime_GMT11",SWIG_From_int(static_cast< int >(wxDateTime::GMT11)));
   SWIG_Python_SetConstant(d, "DateTime_GMT12",SWIG_From_int(static_cast< int >(wxDateTime::GMT12)));
   SWIG_Python_SetConstant(d, "DateTime_GMT10",SWIG_From_int(static_cast< int >(wxDateTime::GMT10)));
   SWIG_Python_SetConstant(d, "DateTime_GMT11",SWIG_From_int(static_cast< int >(wxDateTime::GMT11)));
   SWIG_Python_SetConstant(d, "DateTime_GMT12",SWIG_From_int(static_cast< int >(wxDateTime::GMT12)));

+  SWIG_Python_SetConstant(d, "DateTime_GMT13",SWIG_From_int(static_cast< int >(wxDateTime::GMT13)));

   SWIG_Python_SetConstant(d, "DateTime_WET",SWIG_From_int(static_cast< int >(wxDateTime::WET)));
   SWIG_Python_SetConstant(d, "DateTime_WEST",SWIG_From_int(static_cast< int >(wxDateTime::WEST)));
   SWIG_Python_SetConstant(d, "DateTime_CET",SWIG_From_int(static_cast< int >(wxDateTime::CET)));
   SWIG_Python_SetConstant(d, "DateTime_WET",SWIG_From_int(static_cast< int >(wxDateTime::WET)));
   SWIG_Python_SetConstant(d, "DateTime_WEST",SWIG_From_int(static_cast< int >(wxDateTime::WEST)));
   SWIG_Python_SetConstant(d, "DateTime_CET",SWIG_From_int(static_cast< int >(wxDateTime::CET)));


@@ -42188,6 +42247,8 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "DateTime_A_CST",SWIG_From_int(static_cast< int >(wxDateTime::A_CST)));
   SWIG_Python_SetConstant(d, "DateTime_A_EST",SWIG_From_int(static_cast< int >(wxDateTime::A_EST)));
   SWIG_Python_SetConstant(d, "DateTime_A_ESST",SWIG_From_int(static_cast< int >(wxDateTime::A_ESST)));
   SWIG_Python_SetConstant(d, "DateTime_A_CST",SWIG_From_int(static_cast< int >(wxDateTime::A_CST)));
   SWIG_Python_SetConstant(d, "DateTime_A_EST",SWIG_From_int(static_cast< int >(wxDateTime::A_EST)));
   SWIG_Python_SetConstant(d, "DateTime_A_ESST",SWIG_From_int(static_cast< int >(wxDateTime::A_ESST)));

+  SWIG_Python_SetConstant(d, "DateTime_NZST",SWIG_From_int(static_cast< int >(wxDateTime::NZST)));
+  SWIG_Python_SetConstant(d, "DateTime_NZDT",SWIG_From_int(static_cast< int >(wxDateTime::NZDT)));

   SWIG_Python_SetConstant(d, "DateTime_UTC",SWIG_From_int(static_cast< int >(wxDateTime::UTC)));
   SWIG_Python_SetConstant(d, "DateTime_Gregorian",SWIG_From_int(static_cast< int >(wxDateTime::Gregorian)));
   SWIG_Python_SetConstant(d, "DateTime_Julian",SWIG_From_int(static_cast< int >(wxDateTime::Julian)));
   SWIG_Python_SetConstant(d, "DateTime_UTC",SWIG_From_int(static_cast< int >(wxDateTime::UTC)));
   SWIG_Python_SetConstant(d, "DateTime_Gregorian",SWIG_From_int(static_cast< int >(wxDateTime::Gregorian)));
   SWIG_Python_SetConstant(d, "DateTime_Julian",SWIG_From_int(static_cast< int >(wxDateTime::Julian)));

diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py
index 3a0fb3b85b81b6e9381a7f5489510832b78841ed..cb5f0c87ab91844fd095188045404293d12a7fc2 100644 (file)
--- a/wxPython/src/msw/_windows.py
+++ b/wxPython/src/msw/_windows.py
@@ -3911,6 +3911,10 @@ class PrintData(_core.Object):
         """GetPrintMode(self) -> int"""
         return _windows_.PrintData_GetPrintMode(*args, **kwargs)
 
         """GetPrintMode(self) -> int"""
         return _windows_.PrintData_GetPrintMode(*args, **kwargs)
 

+    def GetMedia(*args, **kwargs):
+        """GetMedia(self) -> int"""
+        return _windows_.PrintData_GetMedia(*args, **kwargs)
+

     def SetNoCopies(*args, **kwargs):
         """SetNoCopies(self, int v)"""
         return _windows_.PrintData_SetNoCopies(*args, **kwargs)
     def SetNoCopies(*args, **kwargs):
         """SetNoCopies(self, int v)"""
         return _windows_.PrintData_SetNoCopies(*args, **kwargs)


@@ -3955,6 +3959,10 @@ class PrintData(_core.Object):
         """SetPrintMode(self, int printMode)"""
         return _windows_.PrintData_SetPrintMode(*args, **kwargs)
 
         """SetPrintMode(self, int printMode)"""
         return _windows_.PrintData_SetPrintMode(*args, **kwargs)
 

+    def SetMedia(*args, **kwargs):
+        """SetMedia(self, int media)"""
+        return _windows_.PrintData_SetMedia(*args, **kwargs)
+

     def GetFilename(*args, **kwargs):
         """GetFilename(self) -> String"""
         return _windows_.PrintData_GetFilename(*args, **kwargs)
     def GetFilename(*args, **kwargs):
         """GetFilename(self) -> String"""
         return _windows_.PrintData_GetFilename(*args, **kwargs)

diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp
index 6f52c8e611da70fdf35f77c7939a09633112823d..d52710f9e4b541a50a02d092048c1eaa80e8d43f 100644 (file)
--- a/wxPython/src/msw/_windows_wrap.cpp
+++ b/wxPython/src/msw/_windows_wrap.cpp
@@ -24205,6 +24205,34 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_PrintData_GetMedia(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPrintData *arg1 = (wxPrintData *) 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_wxPrintData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetMedia" "', expected argument " "1"" of type '" "wxPrintData const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxPrintData const *)arg1)->GetMedia();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_PrintData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
 SWIGINTERN PyObject *_wrap_PrintData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;


@@ -24628,6 +24656,44 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_PrintData_SetMedia(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPrintData *arg1 = (wxPrintData *) 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 *) "media", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetMedia",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetMedia" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetMedia" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetMedia(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_PrintData_GetFilename(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
 SWIGINTERN PyObject *_wrap_PrintData_GetFilename(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;


@@ -32114,6 +32180,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PrintData_GetQuality", (PyCFunction)_wrap_PrintData_GetQuality, METH_O, NULL},
         { (char *)"PrintData_GetBin", (PyCFunction)_wrap_PrintData_GetBin, METH_O, NULL},
         { (char *)"PrintData_GetPrintMode", (PyCFunction)_wrap_PrintData_GetPrintMode, METH_O, NULL},
         { (char *)"PrintData_GetQuality", (PyCFunction)_wrap_PrintData_GetQuality, METH_O, NULL},
         { (char *)"PrintData_GetBin", (PyCFunction)_wrap_PrintData_GetBin, METH_O, NULL},
         { (char *)"PrintData_GetPrintMode", (PyCFunction)_wrap_PrintData_GetPrintMode, METH_O, NULL},

+        { (char *)"PrintData_GetMedia", (PyCFunction)_wrap_PrintData_GetMedia, METH_O, NULL},

         { (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -32125,6 +32192,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetBin", (PyCFunction) _wrap_PrintData_SetBin, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetBin", (PyCFunction) _wrap_PrintData_SetBin, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"PrintData_SetMedia", (PyCFunction) _wrap_PrintData_SetMedia, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"PrintData_GetFilename", (PyCFunction)_wrap_PrintData_GetFilename, METH_O, NULL},
         { (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_GetPrivData", (PyCFunction)_wrap_PrintData_GetPrivData, METH_O, NULL},
         { (char *)"PrintData_GetFilename", (PyCFunction)_wrap_PrintData_GetFilename, METH_O, NULL},
         { (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_GetPrivData", (PyCFunction)_wrap_PrintData_GetPrivData, METH_O, NULL},

diff --git a/wxPython/src/msw/aui.py b/wxPython/src/msw/aui.py
index 4336192ba129a40929c4f594f777719e2b3f2bd7..8409a53e2adbf4792992d6b373de4b69bd1e06f2 100644 (file)
--- a/wxPython/src/msw/aui.py
+++ b/wxPython/src/msw/aui.py
@@ -194,6 +194,20 @@ AUI_GRADIENT_HORIZONTAL = _aui.AUI_GRADIENT_HORIZONTAL
 AUI_BUTTON_STATE_NORMAL = _aui.AUI_BUTTON_STATE_NORMAL
 AUI_BUTTON_STATE_HOVER = _aui.AUI_BUTTON_STATE_HOVER
 AUI_BUTTON_STATE_PRESSED = _aui.AUI_BUTTON_STATE_PRESSED
 AUI_BUTTON_STATE_NORMAL = _aui.AUI_BUTTON_STATE_NORMAL
 AUI_BUTTON_STATE_HOVER = _aui.AUI_BUTTON_STATE_HOVER
 AUI_BUTTON_STATE_PRESSED = _aui.AUI_BUTTON_STATE_PRESSED

+AUI_BUTTON_STATE_DISABLED = _aui.AUI_BUTTON_STATE_DISABLED
+AUI_BUTTON_STATE_HIDDEN = _aui.AUI_BUTTON_STATE_HIDDEN
+AUI_BUTTON_CLOSE = _aui.AUI_BUTTON_CLOSE
+AUI_BUTTON_MAXIMIZE = _aui.AUI_BUTTON_MAXIMIZE
+AUI_BUTTON_MINIMIZE = _aui.AUI_BUTTON_MINIMIZE
+AUI_BUTTON_PIN = _aui.AUI_BUTTON_PIN
+AUI_BUTTON_OPTIONS = _aui.AUI_BUTTON_OPTIONS
+AUI_BUTTON_LEFT = _aui.AUI_BUTTON_LEFT
+AUI_BUTTON_RIGHT = _aui.AUI_BUTTON_RIGHT
+AUI_BUTTON_UP = _aui.AUI_BUTTON_UP
+AUI_BUTTON_DOWN = _aui.AUI_BUTTON_DOWN
+AUI_BUTTON_CUSTOM1 = _aui.AUI_BUTTON_CUSTOM1
+AUI_BUTTON_CUSTOM2 = _aui.AUI_BUTTON_CUSTOM2
+AUI_BUTTON_CUSTOM3 = _aui.AUI_BUTTON_CUSTOM3

 AUI_INSERT_PANE = _aui.AUI_INSERT_PANE
 AUI_INSERT_ROW = _aui.AUI_INSERT_ROW
 AUI_INSERT_DOCK = _aui.AUI_INSERT_DOCK
 AUI_INSERT_PANE = _aui.AUI_INSERT_PANE
 AUI_INSERT_ROW = _aui.AUI_INSERT_ROW
 AUI_INSERT_DOCK = _aui.AUI_INSERT_DOCK


@@ -1442,6 +1456,18 @@ class TabArt(object):
     __repr__ = _swig_repr
     __swig_destroy__ = _aui.delete_TabArt
     __del__ = lambda self : None;
     __repr__ = _swig_repr
     __swig_destroy__ = _aui.delete_TabArt
     __del__ = lambda self : None;

+    def SetNormalFont(*args, **kwargs):
+        """SetNormalFont(self, Font font)"""
+        return _aui.TabArt_SetNormalFont(*args, **kwargs)
+
+    def SetSelectedFont(*args, **kwargs):
+        """SetSelectedFont(self, Font font)"""
+        return _aui.TabArt_SetSelectedFont(*args, **kwargs)
+
+    def SetMeasuringFont(*args, **kwargs):
+        """SetMeasuringFont(self, Font font)"""
+        return _aui.TabArt_SetMeasuringFont(*args, **kwargs)
+

     def DrawBackground(*args, **kwargs):
         """DrawBackground(self, DC dc, Rect rect)"""
         return _aui.TabArt_DrawBackground(*args, **kwargs)
     def DrawBackground(*args, **kwargs):
         """DrawBackground(self, DC dc, Rect rect)"""
         return _aui.TabArt_DrawBackground(*args, **kwargs)


@@ -1453,17 +1479,20 @@ class TabArt(object):
         """
         return _aui.TabArt_DrawTab(*args, **kwargs)
 
         """
         return _aui.TabArt_DrawTab(*args, **kwargs)
 

-    def SetNormalFont(*args, **kwargs):
-        """SetNormalFont(self, Font font)"""
-        return _aui.TabArt_SetNormalFont(*args, **kwargs)
+    def DrawButton(*args, **kwargs):
+        """
+        DrawButton(self, DC dc, Rect in_rect, int bitmap_id, int button_state, 
+            int orientation, Bitmap bitmap_override, Rect out_rect)
+        """
+        return _aui.TabArt_DrawButton(*args, **kwargs)

 
 

-    def SetSelectedFont(*args, **kwargs):
-        """SetSelectedFont(self, Font font)"""
-        return _aui.TabArt_SetSelectedFont(*args, **kwargs)
+    def GetTabSize(*args, **kwargs):
+        """GetTabSize(self, DC dc, String caption, bool active, int x_extent) -> Size"""
+        return _aui.TabArt_GetTabSize(*args, **kwargs)

 
 

-    def SetMeasuringFont(*args, **kwargs):
-        """SetMeasuringFont(self, Font font)"""
-        return _aui.TabArt_SetMeasuringFont(*args, **kwargs)
+    def GetBestTabCtrlSize(*args, **kwargs):
+        """GetBestTabCtrlSize(self, Window wnd) -> int"""
+        return _aui.TabArt_GetBestTabCtrlSize(*args, **kwargs)

 
 _aui.TabArt_swigregister(TabArt)
 
 
 _aui.TabArt_swigregister(TabArt)
 


@@ -1533,6 +1562,7 @@ class AuiTabContainerButton(object):
     cur_state = property(_aui.AuiTabContainerButton_cur_state_get, _aui.AuiTabContainerButton_cur_state_set)
     location = property(_aui.AuiTabContainerButton_location_get, _aui.AuiTabContainerButton_location_set)
     bitmap = property(_aui.AuiTabContainerButton_bitmap_get, _aui.AuiTabContainerButton_bitmap_set)
     cur_state = property(_aui.AuiTabContainerButton_cur_state_get, _aui.AuiTabContainerButton_cur_state_set)
     location = property(_aui.AuiTabContainerButton_location_get, _aui.AuiTabContainerButton_location_set)
     bitmap = property(_aui.AuiTabContainerButton_bitmap_get, _aui.AuiTabContainerButton_bitmap_set)

+    dis_bitmap = property(_aui.AuiTabContainerButton_dis_bitmap_get, _aui.AuiTabContainerButton_dis_bitmap_set)

     rect = property(_aui.AuiTabContainerButton_rect_get, _aui.AuiTabContainerButton_rect_set)
 _aui.AuiTabContainerButton_swigregister(AuiTabContainerButton)
 
     rect = property(_aui.AuiTabContainerButton_rect_get, _aui.AuiTabContainerButton_rect_set)
 _aui.AuiTabContainerButton_swigregister(AuiTabContainerButton)
 


@@ -1629,9 +1659,20 @@ class AuiTabContainer(object):
         return _aui.AuiTabContainer_SetRect(*args, **kwargs)
 
     def AddButton(*args, **kwargs):
         return _aui.AuiTabContainer_SetRect(*args, **kwargs)
 
     def AddButton(*args, **kwargs):

-        """AddButton(self, int id, int location, Bitmap bmp)"""
+        """
+        AddButton(self, int id, int location, Bitmap normal_bitmap=wxNullBitmap, 
+            Bitmap disabled_bitmap=wxNullBitmap)
+        """

         return _aui.AuiTabContainer_AddButton(*args, **kwargs)
 
         return _aui.AuiTabContainer_AddButton(*args, **kwargs)
 

+    def GetTabOffset(*args, **kwargs):
+        """GetTabOffset(self) -> size_t"""
+        return _aui.AuiTabContainer_GetTabOffset(*args, **kwargs)
+
+    def SetTabOffset(*args, **kwargs):
+        """SetTabOffset(self, size_t offset)"""
+        return _aui.AuiTabContainer_SetTabOffset(*args, **kwargs)
+

     ActivePage = property(GetActivePage,SetActivePage,doc="See `GetActivePage` and `SetActivePage`") 
     PageCount = property(GetPageCount,doc="See `GetPageCount`") 
     Pages = property(GetPages,doc="See `GetPages`") 
     ActivePage = property(GetActivePage,SetActivePage,doc="See `GetActivePage` and `SetActivePage`") 
     PageCount = property(GetPageCount,doc="See `GetPageCount`") 
     Pages = property(GetPages,doc="See `GetPages`") 

diff --git a/wxPython/src/msw/aui_wrap.cpp b/wxPython/src/msw/aui_wrap.cpp
index b5850e49e781600a3db89cada3eb6b324d196f7b..ef2c56631097b5c20619d39e47895c52ca1617fb 100644 (file)
--- a/wxPython/src/msw/aui_wrap.cpp
+++ b/wxPython/src/msw/aui_wrap.cpp
@@ -2929,6 +2929,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);
             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);


@@ -2950,6 +2951,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);
             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);


@@ -2974,6 +2976,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOO)",
                                                          odc, owin, otext, orect, opane));
             Py_DECREF(odc);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOO)",
                                                          odc, owin, otext, orect, opane));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(otext);
             Py_DECREF(orect);
             Py_DECREF(opane);
             Py_DECREF(otext);
             Py_DECREF(orect);
             Py_DECREF(opane);


@@ -3019,6 +3022,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane));
             Py_DECREF(odc);
             PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
             Py_DECREF(opane);
        }
             Py_DECREF(orect);
             Py_DECREF(opane);
        }


@@ -3045,6 +3049,7 @@ class wxPyDockArt :  public wxDefaultDockArt
                                                          odc, owin, button, button_state,
                                                          orect, opane));
             Py_DECREF(odc);
                                                          odc, owin, button, button_state,
                                                          orect, opane));
             Py_DECREF(odc);

+            Py_DECREF(owin);

             Py_DECREF(orect);
             Py_DECREF(opane);
         }
             Py_DECREF(orect);
             Py_DECREF(opane);
         }


@@ -3071,6 +3076,7 @@ class wxPyTabArt :  public wxDefaultTabArt
 {
     wxPyTabArt() : wxDefaultTabArt() {}
 
 {
     wxPyTabArt() : wxDefaultTabArt() {}
 

+    

     virtual void DrawBackground( wxDC* dc,
                                  const wxRect& rect )
     {
     virtual void DrawBackground( wxDC* dc,
                                  const wxRect& rect )
     {


@@ -3134,9 +3140,90 @@ class wxPyTabArt :  public wxDefaultTabArt
     }
 
 
     }
 
 

+    virtual void DrawButton( wxDC* dc,
+                             const wxRect& in_rect,
+                             int bitmap_id,
+                             int button_state,
+                             int orientation,
+                             const wxBitmap& bitmap_override,
+                             wxRect* out_rect)
+    {
+        bool found;
+        const char* errmsg = "DrawButton should return a wxRect";
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) {
+            PyObject* odc = wxPyMake_wxObject(dc, false);
+            PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0);
+            PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0);
+            PyObject* ro;
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiiiO)", odc, orect,
+                                                                 bitmap_id, button_state, orientation,
+                                                                 obmp));
+            if (ro) {
+                if (!wxRect_helper(ro, &out_rect)) 
+                    PyErr_SetString(PyExc_TypeError, errmsg);
+                Py_DECREF(ro);
+            }
+
+            Py_DECREF(odc);
+            Py_DECREF(orect);
+            Py_DECREF(obmp);
+        }
+        wxPyEndBlockThreads(blocked);
+        if (!found)
+            wxDefaultTabArt::DrawButton(dc, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect);
+    }
+
+    
+    virtual wxSize GetTabSize( wxDC* dc,
+                               const wxString& caption,
+                               bool active,
+                               int* x_extent)
+    {
+        bool found;
+        wxSize rv, *prv = &rv;
+        const char* errmsg = "GetTabSize should return a sequence containing (size, x_extent)";
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) {
+            PyObject* odc = wxPyMake_wxObject(dc, false);
+            PyObject* otext = wx2PyString(caption);
+            PyObject* ro;
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOi)", odc, otext, (int)active));
+            if (ro) {
+                if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
+                    PyObject* o1 = PySequence_GetItem(ro, 0);
+                    PyObject* o2 = PySequence_GetItem(ro, 1);
+                    if (!wxSize_helper(o1, &prv)) 
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    else if (!PyInt_Check(o2)) 
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    else
+                        *x_extent = PyInt_AsLong(o2);
+                    
+                    Py_DECREF(o1);
+                    Py_DECREF(o2);
+                }
+                else {
+                    PyErr_SetString(PyExc_TypeError, errmsg);
+                }
+                Py_DECREF(ro);
+            }
+
+            Py_DECREF(odc);
+            Py_DECREF(otext);
+        }
+        wxPyEndBlockThreads(blocked);
+        if (!found)
+            rv = wxDefaultTabArt::GetTabSize(dc, caption, active, x_extent);
+        return rv;
+    }
+   
+   
+

     DEC_PYCALLBACK__FONT(SetNormalFont);
     DEC_PYCALLBACK__FONT(SetSelectedFont);
     DEC_PYCALLBACK__FONT(SetMeasuringFont);
     DEC_PYCALLBACK__FONT(SetNormalFont);
     DEC_PYCALLBACK__FONT(SetSelectedFont);
     DEC_PYCALLBACK__FONT(SetMeasuringFont);

+    DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize);

 
     PYPRIVATE;
 };
 
     PYPRIVATE;
 };


@@ -3145,7 +3232,7 @@ class wxPyTabArt :  public wxDefaultTabArt
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetNormalFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetSelectedFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetMeasuringFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetNormalFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetSelectedFont);
 IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetMeasuringFont);

-
+IMP_PYCALLBACK_INT_WIN(wxPyTabArt, wxDefaultTabArt, GetBestTabCtrlSize);

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -11013,6 +11100,129 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_TabArt_SetNormalFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxTabArt *arg1 = (wxTabArt *) 0 ;
+  wxFont *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 *) "font", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetNormalFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetNormalFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxTabArt * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetNormalFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetNormalFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetNormalFont((wxFont const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TabArt_SetSelectedFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxTabArt *arg1 = (wxTabArt *) 0 ;
+  wxFont *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 *) "font", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetSelectedFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetSelectedFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxTabArt * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetSelectedFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetSelectedFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetSelectedFont((wxFont const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TabArt_SetMeasuringFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxTabArt *arg1 = (wxTabArt *) 0 ;
+  wxFont *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 *) "font", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetMeasuringFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetMeasuringFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxTabArt * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetMeasuringFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetMeasuringFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxFont * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetMeasuringFont((wxFont const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_TabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxTabArt *arg1 = (wxTabArt *) 0 ;
 SWIGINTERN PyObject *_wrap_TabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxTabArt *arg1 = (wxTabArt *) 0 ;


@@ -11146,37 +11356,89 @@ fail:
 }
 
 
 }
 
 

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

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

-  wxFont *arg2 = 0 ;
+  wxDC *arg2 = (wxDC *) 0 ;
+  wxRect *arg3 = 0 ;
+  int arg4 ;
+  int arg5 ;
+  int arg6 ;
+  wxBitmap *arg7 = 0 ;
+  wxRect *arg8 = (wxRect *) 0 ;

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

+  wxRect temp3 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 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 *) "self",(char *) "font", NULL 
+    (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "bitmap_id",(char *) "button_state",(char *) "orientation",(char *) "bitmap_override",(char *) "out_rect", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetNormalFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO:TabArt_DrawButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetNormalFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_DrawButton" "', expected argument " "1"" of type '" "wxTabArt *""'"); 

   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);
   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetNormalFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC *""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetNormalFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  arg2 = reinterpret_cast< wxDC * >(argp2);
+  {
+    arg3 = &temp3;
+    if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TabArt_DrawButton" "', 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 '" "TabArt_DrawButton" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
+  ecode6 = SWIG_AsVal_int(obj5, &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "TabArt_DrawButton" "', expected argument " "6"" of type '" "int""'");
+  } 
+  arg6 = static_cast< int >(val6);
+  res7 = SWIG_ConvertPtr(obj6, &argp7, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "TabArt_DrawButton" "', expected argument " "7"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp7) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_DrawButton" "', expected argument " "7"" of type '" "wxBitmap const &""'"); 
+  }
+  arg7 = reinterpret_cast< wxBitmap * >(argp7);
+  res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_wxRect, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "TabArt_DrawButton" "', expected argument " "8"" of type '" "wxRect *""'"); 
+  }
+  arg8 = reinterpret_cast< wxRect * >(argp8);

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

-    (arg1)->SetNormalFont((wxFont const &)*arg2);
+    (arg1)->DrawButton(arg2,(wxRect const &)*arg3,arg4,arg5,arg6,(wxBitmap const &)*arg7,arg8);

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


@@ -11187,51 +11449,84 @@ fail:
 }
 
 
 }
 
 

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

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

-  wxFont *arg2 = 0 ;
+  wxDC *arg2 = (wxDC *) 0 ;
+  wxString *arg3 = 0 ;
+  bool arg4 ;
+  int *arg5 = (int *) 0 ;
+  wxSize result;

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

+  bool temp3 = false ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 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 *) "font", NULL 
+    (char *) "self",(char *) "dc",(char *) "caption",(char *) "active",(char *) "x_extent", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetSelectedFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:TabArt_GetTabSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetSelectedFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_GetTabSize" "', expected argument " "1"" of type '" "wxTabArt *""'"); 

   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);
   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetSelectedFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC *""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetSelectedFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+  arg2 = reinterpret_cast< wxDC * >(argp2);
+  {
+    arg3 = wxString_in_helper(obj2);
+    if (arg3 == NULL) SWIG_fail;
+    temp3 = true;

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  ecode4 = SWIG_AsVal_bool(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TabArt_GetTabSize" "', expected argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  res5 = SWIG_ConvertPtr(obj4, &argp5,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "TabArt_GetTabSize" "', expected argument " "5"" of type '" "int *""'"); 
+  }
+  arg5 = reinterpret_cast< int * >(argp5);

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

-    (arg1)->SetSelectedFont((wxFont const &)*arg2);
+    result = (arg1)->GetTabSize(arg2,(wxString const &)*arg3,arg4,arg5);

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

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  {
+    if (temp3)
+    delete arg3;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp3)
+    delete arg3;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

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

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

-  wxFont *arg2 = 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  int result;

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


@@ -11239,30 +11534,27 @@ SWIGINTERN PyObject *_wrap_TabArt_SetMeasuringFont(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "font", NULL 
+    (char *) "self",(char *) "wnd", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_SetMeasuringFont",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TabArt_GetBestTabCtrlSize",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTabArt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_SetMeasuringFont" "', expected argument " "1"" of type '" "wxTabArt *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TabArt_GetBestTabCtrlSize" "', expected argument " "1"" of type '" "wxTabArt *""'"); 

   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);
   }
   arg1 = reinterpret_cast< wxTabArt * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFont,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_SetMeasuringFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TabArt_SetMeasuringFont" "', expected argument " "2"" of type '" "wxFont const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TabArt_GetBestTabCtrlSize" "', expected argument " "2"" of type '" "wxWindow *""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxFont * >(argp2);
+  arg2 = reinterpret_cast< wxWindow * >(argp2);

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

-    (arg1)->SetMeasuringFont((wxFont const &)*arg2);
+    result = (int)(arg1)->GetBestTabCtrlSize(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;


@@ -12126,6 +12418,59 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_AuiTabContainerButton_dis_bitmap_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiTabContainerButton *arg1 = (wxAuiTabContainerButton *) 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,"AuiTabContainerButton_dis_bitmap_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiTabContainerButton, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainerButton_dis_bitmap_set" "', expected argument " "1"" of type '" "wxAuiTabContainerButton *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiTabContainerButton * >(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 '" "AuiTabContainerButton_dis_bitmap_set" "', expected argument " "2"" of type '" "wxBitmap *""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  if (arg1) (arg1)->dis_bitmap = *arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiTabContainerButton_dis_bitmap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiTabContainerButton *arg1 = (wxAuiTabContainerButton *) 0 ;
+  wxBitmap *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_wxAuiTabContainerButton, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainerButton_dis_bitmap_get" "', expected argument " "1"" of type '" "wxAuiTabContainerButton *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiTabContainerButton * >(argp1);
+  result = (wxBitmap *)& ((arg1)->dis_bitmap);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBitmap, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_AuiTabContainerButton_rect_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiTabContainerButton *arg1 = (wxAuiTabContainerButton *) 0 ;
 SWIGINTERN PyObject *_wrap_AuiTabContainerButton_rect_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiTabContainerButton *arg1 = (wxAuiTabContainerButton *) 0 ;


@@ -13099,7 +13444,10 @@ SWIGINTERN PyObject *_wrap_AuiTabContainer_AddButton(PyObject *SWIGUNUSEDPARM(se
   wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ;
   int arg2 ;
   int arg3 ;
   wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ;
   int arg2 ;
   int arg3 ;

-  wxBitmap *arg4 = 0 ;
+  wxBitmap const &arg4_defvalue = wxNullBitmap ;
+  wxBitmap *arg4 = (wxBitmap *) &arg4_defvalue ;
+  wxBitmap const &arg5_defvalue = wxNullBitmap ;
+  wxBitmap *arg5 = (wxBitmap *) &arg5_defvalue ;

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


@@ -13108,15 +13456,18 @@ SWIGINTERN PyObject *_wrap_AuiTabContainer_AddButton(PyObject *SWIGUNUSEDPARM(se
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;

+  void *argp5 = 0 ;
+  int res5 = 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 *) "id",(char *) "location",(char *) "bmp", NULL 
+    (char *) "self",(char *) "id",(char *) "location",(char *) "normal_bitmap",(char *) "disabled_bitmap", NULL 

   };
   
   };
   

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

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


@@ -13132,17 +13483,95 @@ SWIGINTERN PyObject *_wrap_AuiTabContainer_AddButton(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AuiTabContainer_AddButton" "', expected argument " "3"" of type '" "int""'");
   } 
   arg3 = static_cast< int >(val3);
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AuiTabContainer_AddButton" "', expected argument " "3"" of type '" "int""'");
   } 
   arg3 = static_cast< int >(val3);

-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxBitmap,  0  | 0);
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "AuiTabContainer_AddButton" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+  if (obj3) {
+    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxBitmap,  0  | 0);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "AuiTabContainer_AddButton" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+    }
+    if (!argp4) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabContainer_AddButton" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+    }
+    arg4 = reinterpret_cast< wxBitmap * >(argp4);

   }
   }

-  if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabContainer_AddButton" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+  if (obj4) {
+    res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_wxBitmap,  0  | 0);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "AuiTabContainer_AddButton" "', expected argument " "5"" of type '" "wxBitmap const &""'"); 
+    }
+    if (!argp5) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabContainer_AddButton" "', expected argument " "5"" of type '" "wxBitmap const &""'"); 
+    }
+    arg5 = reinterpret_cast< wxBitmap * >(argp5);

   }
   }

-  arg4 = reinterpret_cast< wxBitmap * >(argp4);

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

-    (arg1)->AddButton(arg2,arg3,(wxBitmap const &)*arg4);
+    (arg1)->AddButton(arg2,arg3,(wxBitmap const &)*arg4,(wxBitmap const &)*arg5);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiTabContainer_GetTabOffset(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ;
+  size_t 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_wxAuiTabContainer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainer_GetTabOffset" "', expected argument " "1"" of type '" "wxAuiTabContainer const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiTabContainer * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (size_t)((wxAuiTabContainer const *)arg1)->GetTabOffset();
+    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_AuiTabContainer_SetTabOffset(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ;
+  size_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "offset", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AuiTabContainer_SetTabOffset",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabContainer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainer_SetTabOffset" "', expected argument " "1"" of type '" "wxAuiTabContainer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiTabContainer * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiTabContainer_SetTabOffset" "', expected argument " "2"" of type '" "size_t""'");
+  } 
+  arg2 = static_cast< size_t >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetTabOffset(arg2);

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


@@ -14198,11 +14627,14 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"FloatingPane_swigregister", FloatingPane_swigregister, METH_VARARGS, NULL},
         { (char *)"FloatingPane_swiginit", FloatingPane_swiginit, METH_VARARGS, NULL},
         { (char *)"delete_TabArt", (PyCFunction)_wrap_delete_TabArt, METH_O, NULL},
         { (char *)"FloatingPane_swigregister", FloatingPane_swigregister, METH_VARARGS, NULL},
         { (char *)"FloatingPane_swiginit", FloatingPane_swiginit, METH_VARARGS, NULL},
         { (char *)"delete_TabArt", (PyCFunction)_wrap_delete_TabArt, METH_O, NULL},

-        { (char *)"TabArt_DrawBackground", (PyCFunction) _wrap_TabArt_DrawBackground, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"TabArt_DrawTab", (PyCFunction) _wrap_TabArt_DrawTab, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"TabArt_SetNormalFont", (PyCFunction) _wrap_TabArt_SetNormalFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetSelectedFont", (PyCFunction) _wrap_TabArt_SetSelectedFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetMeasuringFont", (PyCFunction) _wrap_TabArt_SetMeasuringFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetNormalFont", (PyCFunction) _wrap_TabArt_SetNormalFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetSelectedFont", (PyCFunction) _wrap_TabArt_SetSelectedFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TabArt_SetMeasuringFont", (PyCFunction) _wrap_TabArt_SetMeasuringFont, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"TabArt_DrawBackground", (PyCFunction) _wrap_TabArt_DrawBackground, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TabArt_DrawTab", (PyCFunction) _wrap_TabArt_DrawTab, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TabArt_DrawButton", (PyCFunction) _wrap_TabArt_DrawButton, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TabArt_GetTabSize", (PyCFunction) _wrap_TabArt_GetTabSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TabArt_GetBestTabCtrlSize", (PyCFunction) _wrap_TabArt_GetBestTabCtrlSize, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"TabArt_swigregister", TabArt_swigregister, METH_VARARGS, NULL},
         { (char *)"new_DefaultTabArt", (PyCFunction)_wrap_new_DefaultTabArt, METH_NOARGS, NULL},
         { (char *)"delete_DefaultTabArt", (PyCFunction)_wrap_delete_DefaultTabArt, METH_O, NULL},
         { (char *)"TabArt_swigregister", TabArt_swigregister, METH_VARARGS, NULL},
         { (char *)"new_DefaultTabArt", (PyCFunction)_wrap_new_DefaultTabArt, METH_NOARGS, NULL},
         { (char *)"delete_DefaultTabArt", (PyCFunction)_wrap_delete_DefaultTabArt, METH_O, NULL},


@@ -14238,6 +14670,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"AuiTabContainerButton_location_get", (PyCFunction)_wrap_AuiTabContainerButton_location_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_bitmap_set", _wrap_AuiTabContainerButton_bitmap_set, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_bitmap_get", (PyCFunction)_wrap_AuiTabContainerButton_bitmap_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_location_get", (PyCFunction)_wrap_AuiTabContainerButton_location_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_bitmap_set", _wrap_AuiTabContainerButton_bitmap_set, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_bitmap_get", (PyCFunction)_wrap_AuiTabContainerButton_bitmap_get, METH_O, NULL},

+        { (char *)"AuiTabContainerButton_dis_bitmap_set", _wrap_AuiTabContainerButton_dis_bitmap_set, METH_VARARGS, NULL},
+        { (char *)"AuiTabContainerButton_dis_bitmap_get", (PyCFunction)_wrap_AuiTabContainerButton_dis_bitmap_get, METH_O, NULL},

         { (char *)"AuiTabContainerButton_rect_set", _wrap_AuiTabContainerButton_rect_set, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_rect_get", (PyCFunction)_wrap_AuiTabContainerButton_rect_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_swigregister", AuiTabContainerButton_swigregister, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_rect_set", _wrap_AuiTabContainerButton_rect_set, METH_VARARGS, NULL},
         { (char *)"AuiTabContainerButton_rect_get", (PyCFunction)_wrap_AuiTabContainerButton_rect_get, METH_O, NULL},
         { (char *)"AuiTabContainerButton_swigregister", AuiTabContainerButton_swigregister, METH_VARARGS, NULL},


@@ -14264,6 +14698,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"AuiTabContainer_DoShowHide", (PyCFunction)_wrap_AuiTabContainer_DoShowHide, METH_O, NULL},
         { (char *)"AuiTabContainer_SetRect", (PyCFunction) _wrap_AuiTabContainer_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"AuiTabContainer_AddButton", (PyCFunction) _wrap_AuiTabContainer_AddButton, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"AuiTabContainer_DoShowHide", (PyCFunction)_wrap_AuiTabContainer_DoShowHide, METH_O, NULL},
         { (char *)"AuiTabContainer_SetRect", (PyCFunction) _wrap_AuiTabContainer_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"AuiTabContainer_AddButton", (PyCFunction) _wrap_AuiTabContainer_AddButton, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"AuiTabContainer_GetTabOffset", (PyCFunction)_wrap_AuiTabContainer_GetTabOffset, METH_O, NULL},
+        { (char *)"AuiTabContainer_SetTabOffset", (PyCFunction) _wrap_AuiTabContainer_SetTabOffset, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"AuiTabContainer_swigregister", AuiTabContainer_swigregister, METH_VARARGS, NULL},
         { (char *)"AuiTabContainer_swiginit", AuiTabContainer_swiginit, METH_VARARGS, NULL},
         { (char *)"new_AuiTabCtrl", (PyCFunction) _wrap_new_AuiTabCtrl, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"AuiTabContainer_swigregister", AuiTabContainer_swigregister, METH_VARARGS, NULL},
         { (char *)"AuiTabContainer_swiginit", AuiTabContainer_swiginit, METH_VARARGS, NULL},
         { (char *)"new_AuiTabCtrl", (PyCFunction) _wrap_new_AuiTabCtrl, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -16963,6 +17399,20 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_NORMAL",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_NORMAL)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_HOVER",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_HOVER)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_PRESSED",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_PRESSED)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_NORMAL",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_NORMAL)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_HOVER",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_HOVER)));
   SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_PRESSED",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_PRESSED)));

+  SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_DISABLED",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_DISABLED)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_STATE_HIDDEN",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_STATE_HIDDEN)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_CLOSE",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_CLOSE)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_MAXIMIZE",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_MAXIMIZE)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_MINIMIZE",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_MINIMIZE)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_PIN",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_PIN)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_OPTIONS",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_OPTIONS)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_LEFT",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_LEFT)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_RIGHT",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_RIGHT)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_UP",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_UP)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_DOWN",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_DOWN)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_CUSTOM1",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_CUSTOM1)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_CUSTOM2",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_CUSTOM2)));
+  SWIG_Python_SetConstant(d, "AUI_BUTTON_CUSTOM3",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_CUSTOM3)));

   SWIG_Python_SetConstant(d, "AUI_INSERT_PANE",SWIG_From_int(static_cast< int >(wxAUI_INSERT_PANE)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_ROW",SWIG_From_int(static_cast< int >(wxAUI_INSERT_ROW)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_DOCK",SWIG_From_int(static_cast< int >(wxAUI_INSERT_DOCK)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_PANE",SWIG_From_int(static_cast< int >(wxAUI_INSERT_PANE)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_ROW",SWIG_From_int(static_cast< int >(wxAUI_INSERT_ROW)));
   SWIG_Python_SetConstant(d, "AUI_INSERT_DOCK",SWIG_From_int(static_cast< int >(wxAUI_INSERT_DOCK)));

diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py
index c928793c5421c193ca30bcd3868f2d6dbc60ad39..4af11a0939e9047a313108a04030689dfdc76b42 100644 (file)
--- a/wxPython/src/msw/html.py
+++ b/wxPython/src/msw/html.py
@@ -1664,23 +1664,57 @@ def PreHtmlHelpWindow(*args, **kwargs):
     self._setOORInfo(self)
     return val
 
     self._setOORInfo(self)
     return val
 

-class HtmlWindowEvent(_core.NotifyEvent):
-    """Proxy of C++ HtmlWindowEvent class"""
+wxEVT_COMMAND_HTML_CELL_CLICKED = _html.wxEVT_COMMAND_HTML_CELL_CLICKED
+wxEVT_COMMAND_HTML_CELL_HOVER = _html.wxEVT_COMMAND_HTML_CELL_HOVER
+wxEVT_COMMAND_HTML_LINK_CLICKED = _html.wxEVT_COMMAND_HTML_LINK_CLICKED
+class HtmlCellEvent(_core.CommandEvent):
+    """Proxy of C++ HtmlCellEvent class"""

     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 

-        """__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> HtmlWindowEvent"""
-        _html.HtmlWindowEvent_swiginit(self,_html.new_HtmlWindowEvent(*args, **kwargs))
-    def SetURL(*args, **kwargs):
-        """SetURL(self, String url)"""
-        return _html.HtmlWindowEvent_SetURL(*args, **kwargs)
-
-    def GetURL(*args, **kwargs):
-        """GetURL(self) -> String"""
-        return _html.HtmlWindowEvent_GetURL(*args, **kwargs)
-
-    URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") 
-_html.HtmlWindowEvent_swigregister(HtmlWindowEvent)
+        """
+        __init__(self, EventType commandType, int id, HtmlCell cell, Point pt, 
+            MouseEvent ev) -> HtmlCellEvent
+        """
+        _html.HtmlCellEvent_swiginit(self,_html.new_HtmlCellEvent(*args, **kwargs))
+    def GetCell(*args, **kwargs):
+        """GetCell(self) -> HtmlCell"""
+        return _html.HtmlCellEvent_GetCell(*args, **kwargs)
+
+    def GetPoint(*args, **kwargs):
+        """GetPoint(self) -> Point"""
+        return _html.HtmlCellEvent_GetPoint(*args, **kwargs)
+
+    def GetMouseEvent(*args, **kwargs):
+        """GetMouseEvent(self) -> MouseEvent"""
+        return _html.HtmlCellEvent_GetMouseEvent(*args, **kwargs)
+
+    def SetLinkClicked(*args, **kwargs):
+        """SetLinkClicked(self, bool linkclicked)"""
+        return _html.HtmlCellEvent_SetLinkClicked(*args, **kwargs)
+
+    def GetLinkClicked(*args, **kwargs):
+        """GetLinkClicked(self) -> bool"""
+        return _html.HtmlCellEvent_GetLinkClicked(*args, **kwargs)
+
+_html.HtmlCellEvent_swigregister(HtmlCellEvent)
+
+class HtmlLinkEvent(_core.CommandEvent):
+    """Proxy of C++ HtmlLinkEvent class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """__init__(self, int id, HtmlLinkInfo linkinfo) -> HtmlLinkEvent"""
+        _html.HtmlLinkEvent_swiginit(self,_html.new_HtmlLinkEvent(*args, **kwargs))
+    def GetLinkInfo(*args, **kwargs):
+        """GetLinkInfo(self) -> HtmlLinkInfo"""
+        return _html.HtmlLinkEvent_GetLinkInfo(*args, **kwargs)
+
+_html.HtmlLinkEvent_swigregister(HtmlLinkEvent)
+
+EVT_HTML_CELL_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_CLICKED, 1 )
+EVT_HTML_CELL_HOVER   = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_HOVER, 1 )
+EVT_HTML_LINK_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_LINK_CLICKED, 1 )

 
 class HtmlHelpFrame(_windows.Frame):
     """Proxy of C++ HtmlHelpFrame class"""
 
 class HtmlHelpFrame(_windows.Frame):
     """Proxy of C++ HtmlHelpFrame class"""

diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp
index 0cff49c9acf2a3b8587ad76714484ddffe235728..511164adbd7f8000f98849df6aa5499dc26abfb7 100644 (file)
--- a/wxPython/src/msw/html_wrap.cpp
+++ b/wxPython/src/msw/html_wrap.cpp
@@ -2523,147 +2523,148 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxHtmlBookRecArray swig_types[57]
 #define SWIGTYPE_p_wxHtmlBookRecord swig_types[58]
 #define SWIGTYPE_p_wxHtmlCell swig_types[59]
 #define SWIGTYPE_p_wxHtmlBookRecArray swig_types[57]
 #define SWIGTYPE_p_wxHtmlBookRecord swig_types[58]
 #define SWIGTYPE_p_wxHtmlCell swig_types[59]

-#define SWIGTYPE_p_wxHtmlColourCell swig_types[60]
-#define SWIGTYPE_p_wxHtmlContainerCell swig_types[61]
-#define SWIGTYPE_p_wxHtmlDCRenderer swig_types[62]
-#define SWIGTYPE_p_wxHtmlEasyPrinting swig_types[63]
-#define SWIGTYPE_p_wxHtmlFilter swig_types[64]
-#define SWIGTYPE_p_wxHtmlFontCell swig_types[65]
-#define SWIGTYPE_p_wxHtmlHelpController swig_types[66]
-#define SWIGTYPE_p_wxHtmlHelpData swig_types[67]
-#define SWIGTYPE_p_wxHtmlHelpDialog swig_types[68]
-#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[69]
-#define SWIGTYPE_p_wxHtmlHelpFrameCfg swig_types[70]
-#define SWIGTYPE_p_wxHtmlHelpWindow swig_types[71]
-#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[72]
-#define SWIGTYPE_p_wxHtmlModalHelp swig_types[73]
-#define SWIGTYPE_p_wxHtmlParser swig_types[74]
-#define SWIGTYPE_p_wxHtmlPrintout swig_types[75]
-#define SWIGTYPE_p_wxHtmlRenderingInfo swig_types[76]
-#define SWIGTYPE_p_wxHtmlRenderingState swig_types[77]
-#define SWIGTYPE_p_wxHtmlRenderingStyle swig_types[78]
-#define SWIGTYPE_p_wxHtmlSearchStatus swig_types[79]
-#define SWIGTYPE_p_wxHtmlSelection swig_types[80]
-#define SWIGTYPE_p_wxHtmlTag swig_types[81]
-#define SWIGTYPE_p_wxHtmlTagHandler swig_types[82]
-#define SWIGTYPE_p_wxHtmlWidgetCell swig_types[83]
-#define SWIGTYPE_p_wxHtmlWinParser swig_types[84]
-#define SWIGTYPE_p_wxHtmlWindow swig_types[85]
-#define SWIGTYPE_p_wxHtmlWindowEvent swig_types[86]
-#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[87]
-#define SWIGTYPE_p_wxHtmlWordCell swig_types[88]
-#define SWIGTYPE_p_wxICOHandler swig_types[89]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[90]
-#define SWIGTYPE_p_wxIdleEvent swig_types[91]
-#define SWIGTYPE_p_wxImage swig_types[92]
-#define SWIGTYPE_p_wxImageHandler swig_types[93]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[94]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[95]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[96]
-#define SWIGTYPE_p_wxKeyEvent swig_types[97]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[98]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[99]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[100]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[101]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[102]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[103]
-#define SWIGTYPE_p_wxMenu swig_types[104]
-#define SWIGTYPE_p_wxMenuBar swig_types[105]
-#define SWIGTYPE_p_wxMenuEvent swig_types[106]
-#define SWIGTYPE_p_wxMenuItem swig_types[107]
-#define SWIGTYPE_p_wxMessageDialog swig_types[108]
-#define SWIGTYPE_p_wxMiniFrame swig_types[109]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[110]
-#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[111]
-#define SWIGTYPE_p_wxMouseEvent swig_types[112]
-#define SWIGTYPE_p_wxMoveEvent swig_types[113]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[114]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[115]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[116]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[117]
-#define SWIGTYPE_p_wxNumberEntryDialog swig_types[118]
-#define SWIGTYPE_p_wxObject swig_types[119]
-#define SWIGTYPE_p_wxPCXHandler swig_types[120]
-#define SWIGTYPE_p_wxPNGHandler swig_types[121]
-#define SWIGTYPE_p_wxPNMHandler swig_types[122]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[123]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[124]
-#define SWIGTYPE_p_wxPaintEvent swig_types[125]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[126]
-#define SWIGTYPE_p_wxPanel swig_types[127]
-#define SWIGTYPE_p_wxPaperSize swig_types[128]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[129]
-#define SWIGTYPE_p_wxPoint swig_types[130]
-#define SWIGTYPE_p_wxPopupWindow swig_types[131]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[132]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[133]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[134]
-#define SWIGTYPE_p_wxPrintData swig_types[135]
-#define SWIGTYPE_p_wxPrintDialog swig_types[136]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[137]
-#define SWIGTYPE_p_wxPrintPreview swig_types[138]
-#define SWIGTYPE_p_wxPrinter swig_types[139]
-#define SWIGTYPE_p_wxProgressDialog swig_types[140]
-#define SWIGTYPE_p_wxPyApp swig_types[141]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[142]
-#define SWIGTYPE_p_wxPyEvent swig_types[143]
-#define SWIGTYPE_p_wxPyHtmlFilter swig_types[144]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[145]
-#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[146]
-#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[147]
-#define SWIGTYPE_p_wxPyHtmlWindow swig_types[148]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[149]
-#define SWIGTYPE_p_wxPyPanel swig_types[150]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[151]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[152]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[153]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[154]
-#define SWIGTYPE_p_wxPyPrintout swig_types[155]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[156]
-#define SWIGTYPE_p_wxPySizer swig_types[157]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[158]
-#define SWIGTYPE_p_wxPyVListBox swig_types[159]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[160]
-#define SWIGTYPE_p_wxPyValidator swig_types[161]
-#define SWIGTYPE_p_wxPyWindow swig_types[162]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[163]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[164]
-#define SWIGTYPE_p_wxSashEvent swig_types[165]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[166]
-#define SWIGTYPE_p_wxSashWindow swig_types[167]
-#define SWIGTYPE_p_wxScrollEvent swig_types[168]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[169]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[170]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[171]
-#define SWIGTYPE_p_wxShowEvent swig_types[172]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[173]
-#define SWIGTYPE_p_wxSize swig_types[174]
-#define SWIGTYPE_p_wxSizeEvent swig_types[175]
-#define SWIGTYPE_p_wxSizer swig_types[176]
-#define SWIGTYPE_p_wxSizerItem swig_types[177]
-#define SWIGTYPE_p_wxSplashScreen swig_types[178]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[179]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[180]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[181]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[182]
-#define SWIGTYPE_p_wxStatusBar swig_types[183]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[184]
-#define SWIGTYPE_p_wxString swig_types[185]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[186]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[187]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[188]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[189]
-#define SWIGTYPE_p_wxTipWindow swig_types[190]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[191]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[192]
-#define SWIGTYPE_p_wxValidator swig_types[193]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[194]
-#define SWIGTYPE_p_wxWindow swig_types[195]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[196]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[197]
-#define SWIGTYPE_p_wxXPMHandler swig_types[198]
-static swig_type_info *swig_types[200];
-static swig_module_info swig_module = {swig_types, 199, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxHtmlCellEvent swig_types[60]
+#define SWIGTYPE_p_wxHtmlColourCell swig_types[61]
+#define SWIGTYPE_p_wxHtmlContainerCell swig_types[62]
+#define SWIGTYPE_p_wxHtmlDCRenderer swig_types[63]
+#define SWIGTYPE_p_wxHtmlEasyPrinting swig_types[64]
+#define SWIGTYPE_p_wxHtmlFilter swig_types[65]
+#define SWIGTYPE_p_wxHtmlFontCell swig_types[66]
+#define SWIGTYPE_p_wxHtmlHelpController swig_types[67]
+#define SWIGTYPE_p_wxHtmlHelpData swig_types[68]
+#define SWIGTYPE_p_wxHtmlHelpDialog swig_types[69]
+#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[70]
+#define SWIGTYPE_p_wxHtmlHelpFrameCfg swig_types[71]
+#define SWIGTYPE_p_wxHtmlHelpWindow swig_types[72]
+#define SWIGTYPE_p_wxHtmlLinkEvent swig_types[73]
+#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[74]
+#define SWIGTYPE_p_wxHtmlModalHelp swig_types[75]
+#define SWIGTYPE_p_wxHtmlParser swig_types[76]
+#define SWIGTYPE_p_wxHtmlPrintout swig_types[77]
+#define SWIGTYPE_p_wxHtmlRenderingInfo swig_types[78]
+#define SWIGTYPE_p_wxHtmlRenderingState swig_types[79]
+#define SWIGTYPE_p_wxHtmlRenderingStyle swig_types[80]
+#define SWIGTYPE_p_wxHtmlSearchStatus swig_types[81]
+#define SWIGTYPE_p_wxHtmlSelection swig_types[82]
+#define SWIGTYPE_p_wxHtmlTag swig_types[83]
+#define SWIGTYPE_p_wxHtmlTagHandler swig_types[84]
+#define SWIGTYPE_p_wxHtmlWidgetCell swig_types[85]
+#define SWIGTYPE_p_wxHtmlWinParser swig_types[86]
+#define SWIGTYPE_p_wxHtmlWindow swig_types[87]
+#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[88]
+#define SWIGTYPE_p_wxHtmlWordCell swig_types[89]
+#define SWIGTYPE_p_wxICOHandler swig_types[90]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[91]
+#define SWIGTYPE_p_wxIdleEvent swig_types[92]
+#define SWIGTYPE_p_wxImage swig_types[93]
+#define SWIGTYPE_p_wxImageHandler swig_types[94]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[95]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[96]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[97]
+#define SWIGTYPE_p_wxKeyEvent swig_types[98]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[99]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[100]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[101]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[102]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[103]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[104]
+#define SWIGTYPE_p_wxMenu swig_types[105]
+#define SWIGTYPE_p_wxMenuBar swig_types[106]
+#define SWIGTYPE_p_wxMenuEvent swig_types[107]
+#define SWIGTYPE_p_wxMenuItem swig_types[108]
+#define SWIGTYPE_p_wxMessageDialog swig_types[109]
+#define SWIGTYPE_p_wxMiniFrame swig_types[110]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[111]
+#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[112]
+#define SWIGTYPE_p_wxMouseEvent swig_types[113]
+#define SWIGTYPE_p_wxMoveEvent swig_types[114]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[115]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[116]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[117]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[118]
+#define SWIGTYPE_p_wxNumberEntryDialog swig_types[119]
+#define SWIGTYPE_p_wxObject swig_types[120]
+#define SWIGTYPE_p_wxPCXHandler swig_types[121]
+#define SWIGTYPE_p_wxPNGHandler swig_types[122]
+#define SWIGTYPE_p_wxPNMHandler swig_types[123]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[124]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[125]
+#define SWIGTYPE_p_wxPaintEvent swig_types[126]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[127]
+#define SWIGTYPE_p_wxPanel swig_types[128]
+#define SWIGTYPE_p_wxPaperSize swig_types[129]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[130]
+#define SWIGTYPE_p_wxPoint swig_types[131]
+#define SWIGTYPE_p_wxPopupWindow swig_types[132]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[133]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[134]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[135]
+#define SWIGTYPE_p_wxPrintData swig_types[136]
+#define SWIGTYPE_p_wxPrintDialog swig_types[137]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[138]
+#define SWIGTYPE_p_wxPrintPreview swig_types[139]
+#define SWIGTYPE_p_wxPrinter swig_types[140]
+#define SWIGTYPE_p_wxProgressDialog swig_types[141]
+#define SWIGTYPE_p_wxPyApp swig_types[142]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[143]
+#define SWIGTYPE_p_wxPyEvent swig_types[144]
+#define SWIGTYPE_p_wxPyHtmlFilter swig_types[145]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[146]
+#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[147]
+#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[148]
+#define SWIGTYPE_p_wxPyHtmlWindow swig_types[149]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[150]
+#define SWIGTYPE_p_wxPyPanel swig_types[151]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[152]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[153]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[154]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[155]
+#define SWIGTYPE_p_wxPyPrintout swig_types[156]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[157]
+#define SWIGTYPE_p_wxPySizer swig_types[158]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[159]
+#define SWIGTYPE_p_wxPyVListBox swig_types[160]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[161]
+#define SWIGTYPE_p_wxPyValidator swig_types[162]
+#define SWIGTYPE_p_wxPyWindow swig_types[163]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[164]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[165]
+#define SWIGTYPE_p_wxSashEvent swig_types[166]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[167]
+#define SWIGTYPE_p_wxSashWindow swig_types[168]
+#define SWIGTYPE_p_wxScrollEvent swig_types[169]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[170]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[171]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[172]
+#define SWIGTYPE_p_wxShowEvent swig_types[173]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[174]
+#define SWIGTYPE_p_wxSize swig_types[175]
+#define SWIGTYPE_p_wxSizeEvent swig_types[176]
+#define SWIGTYPE_p_wxSizer swig_types[177]
+#define SWIGTYPE_p_wxSizerItem swig_types[178]
+#define SWIGTYPE_p_wxSplashScreen swig_types[179]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[180]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[181]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[182]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[183]
+#define SWIGTYPE_p_wxStatusBar swig_types[184]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[185]
+#define SWIGTYPE_p_wxString swig_types[186]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[187]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[188]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[189]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[190]
+#define SWIGTYPE_p_wxTipWindow swig_types[191]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[192]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[193]
+#define SWIGTYPE_p_wxValidator swig_types[194]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[195]
+#define SWIGTYPE_p_wxWindow swig_types[196]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[197]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[198]
+#define SWIGTYPE_p_wxXPMHandler swig_types[199]
+static swig_type_info *swig_types[201];
+static swig_module_info swig_module = {swig_types, 200, 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)
 


@@ -14914,139 +14915,319 @@ SWIGINTERN PyObject *HtmlHelpWindow_swiginit(PyObject *SWIGUNUSEDPARM(self), PyO
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

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

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

-  wxEventType arg1 = (wxEventType) wxEVT_NULL ;
-  int arg2 = (int) 0 ;
-  wxHtmlWindowEvent *result = 0 ;
+  wxEventType arg1 ;
+  int arg2 ;
+  wxHtmlCell *arg3 = (wxHtmlCell *) 0 ;
+  wxPoint *arg4 = 0 ;
+  wxMouseEvent *arg5 = 0 ;
+  wxHtmlCellEvent *result = 0 ;

   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;

+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  wxPoint temp4 ;
+  void *argp5 = 0 ;
+  int res5 = 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 *) "commandType",(char *) "id", NULL 
+    (char *) "commandType",(char *) "id",(char *) "cell",(char *) "pt",(char *) "ev", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_HtmlWindowEvent",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_HtmlWindowEvent" "', expected argument " "1"" of type '" "wxEventType""'");
-    } 
-    arg1 = static_cast< wxEventType >(val1);
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_HtmlCellEvent",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_HtmlCellEvent" "', expected argument " "1"" of type '" "wxEventType""'");
+  } 
+  arg1 = static_cast< wxEventType >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_HtmlCellEvent" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_HtmlCellEvent" "', expected argument " "3"" of type '" "wxHtmlCell *""'"); 

   }
   }

-  if (obj1) {
-    ecode2 = SWIG_AsVal_int(obj1, &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_HtmlWindowEvent" "', expected argument " "2"" of type '" "int""'");
-    } 
-    arg2 = static_cast< int >(val2);
+  arg3 = reinterpret_cast< wxHtmlCell * >(argp3);
+  {
+    arg4 = &temp4;
+    if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail;
+  }
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_wxMouseEvent,  0  | 0);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_HtmlCellEvent" "', expected argument " "5"" of type '" "wxMouseEvent const &""'"); 

   }
   }

+  if (!argp5) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_HtmlCellEvent" "', expected argument " "5"" of type '" "wxMouseEvent const &""'"); 
+  }
+  arg5 = reinterpret_cast< wxMouseEvent * >(argp5);

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

-    result = (wxHtmlWindowEvent *)new wxHtmlWindowEvent(arg1,arg2);
+    result = (wxHtmlCellEvent *)new wxHtmlCellEvent(arg1,arg2,arg3,(wxPoint const &)*arg4,(wxMouseEvent const &)*arg5);

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlWindowEvent, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlCellEvent, SWIG_POINTER_NEW |  0 );

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

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

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

-  wxHtmlWindowEvent *arg1 = (wxHtmlWindowEvent *) 0 ;
-  wxString *arg2 = 0 ;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 0 ;
+  wxHtmlCell *result = 0 ;

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

-  bool temp2 = false ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlCellEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_GetCell" "', expected argument " "1"" of type '" "wxHtmlCellEvent const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxHtmlCell *)((wxHtmlCellEvent const *)arg1)->GetCell();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCellEvent_GetPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 0 ;
+  wxPoint 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_wxHtmlCellEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_GetPoint" "', expected argument " "1"" of type '" "wxHtmlCellEvent const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlCellEvent const *)arg1)->GetPoint();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCellEvent_GetMouseEvent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 0 ;
+  wxMouseEvent 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_wxHtmlCellEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_GetMouseEvent" "', expected argument " "1"" of type '" "wxHtmlCellEvent const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlCellEvent const *)arg1)->GetMouseEvent();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxMouseEvent(static_cast< const wxMouseEvent& >(result))), SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCellEvent_SetLinkClicked(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;

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

-    (char *) "self",(char *) "url", NULL 
+    (char *) "self",(char *) "linkclicked", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowEvent_SetURL",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowEvent, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCellEvent_SetLinkClicked",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCellEvent, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowEvent_SetURL" "', expected argument " "1"" of type '" "wxHtmlWindowEvent *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_SetLinkClicked" "', expected argument " "1"" of type '" "wxHtmlCellEvent *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxHtmlWindowEvent * >(argp1);
+  arg1 = reinterpret_cast< wxHtmlCellEvent * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HtmlCellEvent_SetLinkClicked" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
   {

-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetLinkClicked(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCellEvent_GetLinkClicked(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlCellEvent *arg1 = (wxHtmlCellEvent *) 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_wxHtmlCellEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCellEvent_GetLinkClicked" "', expected argument " "1"" of type '" "wxHtmlCellEvent const *""'"); 

   }
   }

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

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

-    (arg1)->SetURL((wxString const &)*arg2);
+    result = (bool)((wxHtmlCellEvent const *)arg1)->GetLinkClicked();

     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:

+  return NULL;
+}
+
+
+SWIGINTERN PyObject *HtmlCellEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxHtmlCellEvent, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *HtmlCellEvent_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_HtmlLinkEvent(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  wxHtmlLinkInfo *arg2 = 0 ;
+  wxHtmlLinkEvent *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "id",(char *) "linkinfo", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_HtmlLinkEvent",kwnames,&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_HtmlLinkEvent" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxHtmlLinkInfo,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_HtmlLinkEvent" "', expected argument " "2"" of type '" "wxHtmlLinkInfo const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_HtmlLinkEvent" "', expected argument " "2"" of type '" "wxHtmlLinkInfo const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlLinkInfo * >(argp2);

   {
   {

-    if (temp2)
-    delete arg2;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxHtmlLinkEvent *)new wxHtmlLinkEvent(arg1,(wxHtmlLinkInfo const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlLinkEvent, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_HtmlWindowEvent_GetURL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HtmlLinkEvent_GetLinkInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

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

-  wxHtmlWindowEvent *arg1 = (wxHtmlWindowEvent *) 0 ;
-  wxString *result = 0 ;
+  wxHtmlLinkEvent *arg1 = (wxHtmlLinkEvent *) 0 ;
+  wxHtmlLinkInfo *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_wxHtmlWindowEvent, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlLinkEvent, 0 |  0 );

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

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowEvent_GetURL" "', expected argument " "1"" of type '" "wxHtmlWindowEvent const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlLinkEvent_GetLinkInfo" "', expected argument " "1"" of type '" "wxHtmlLinkEvent const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxHtmlWindowEvent * >(argp1);
+  arg1 = reinterpret_cast< wxHtmlLinkEvent * >(argp1);

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

-      wxString const &_result_ref = ((wxHtmlWindowEvent const *)arg1)->GetURL();
-      result = (wxString *) &_result_ref;
+      wxHtmlLinkInfo const &_result_ref = ((wxHtmlLinkEvent const *)arg1)->GetLinkInfo();
+      result = (wxHtmlLinkInfo *) &_result_ref;

     }
     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_wxHtmlLinkInfo, 0 |  0 );

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

-SWIGINTERN PyObject *HtmlWindowEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *HtmlLinkEvent_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_wxHtmlWindowEvent, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxHtmlLinkEvent, SWIG_NewClientData(obj));

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

-SWIGINTERN PyObject *HtmlWindowEvent_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *HtmlLinkEvent_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

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


@@ -17894,11 +18075,18 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlHelpWindow_GetTreeCtrl", (PyCFunction)_wrap_HtmlHelpWindow_GetTreeCtrl, METH_O, NULL},
         { (char *)"HtmlHelpWindow_swigregister", HtmlHelpWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlHelpWindow_swiginit", HtmlHelpWindow_swiginit, METH_VARARGS, NULL},
         { (char *)"HtmlHelpWindow_GetTreeCtrl", (PyCFunction)_wrap_HtmlHelpWindow_GetTreeCtrl, METH_O, NULL},
         { (char *)"HtmlHelpWindow_swigregister", HtmlHelpWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlHelpWindow_swiginit", HtmlHelpWindow_swiginit, METH_VARARGS, NULL},

-        { (char *)"new_HtmlWindowEvent", (PyCFunction) _wrap_new_HtmlWindowEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"HtmlWindowEvent_SetURL", (PyCFunction) _wrap_HtmlWindowEvent_SetURL, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"HtmlWindowEvent_GetURL", (PyCFunction)_wrap_HtmlWindowEvent_GetURL, METH_O, NULL},
-        { (char *)"HtmlWindowEvent_swigregister", HtmlWindowEvent_swigregister, METH_VARARGS, NULL},
-        { (char *)"HtmlWindowEvent_swiginit", HtmlWindowEvent_swiginit, METH_VARARGS, NULL},
+        { (char *)"new_HtmlCellEvent", (PyCFunction) _wrap_new_HtmlCellEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlCellEvent_GetCell", (PyCFunction)_wrap_HtmlCellEvent_GetCell, METH_O, NULL},
+        { (char *)"HtmlCellEvent_GetPoint", (PyCFunction)_wrap_HtmlCellEvent_GetPoint, METH_O, NULL},
+        { (char *)"HtmlCellEvent_GetMouseEvent", (PyCFunction)_wrap_HtmlCellEvent_GetMouseEvent, METH_O, NULL},
+        { (char *)"HtmlCellEvent_SetLinkClicked", (PyCFunction) _wrap_HtmlCellEvent_SetLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlCellEvent_GetLinkClicked", (PyCFunction)_wrap_HtmlCellEvent_GetLinkClicked, METH_O, NULL},
+        { (char *)"HtmlCellEvent_swigregister", HtmlCellEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"HtmlCellEvent_swiginit", HtmlCellEvent_swiginit, METH_VARARGS, NULL},
+        { (char *)"new_HtmlLinkEvent", (PyCFunction) _wrap_new_HtmlLinkEvent, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlLinkEvent_GetLinkInfo", (PyCFunction)_wrap_HtmlLinkEvent_GetLinkInfo, METH_O, NULL},
+        { (char *)"HtmlLinkEvent_swigregister", HtmlLinkEvent_swigregister, METH_VARARGS, NULL},
+        { (char *)"HtmlLinkEvent_swiginit", HtmlLinkEvent_swiginit, METH_VARARGS, NULL},

         { (char *)"new_HtmlHelpFrame", (PyCFunction) _wrap_new_HtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreHtmlHelpFrame", (PyCFunction) _wrap_new_PreHtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlHelpFrame_Create", (PyCFunction) _wrap_HtmlHelpFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_HtmlHelpFrame", (PyCFunction) _wrap_new_HtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreHtmlHelpFrame", (PyCFunction) _wrap_new_PreHtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlHelpFrame_Create", (PyCFunction) _wrap_HtmlHelpFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -17999,6 +18187,9 @@ static void *_p_wxScrollEventTo_p_wxEvent(void *x) {
 static void *_p_wxFindDialogEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxFindDialogEvent *) x));
 }
 static void *_p_wxFindDialogEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxFindDialogEvent *) x));
 }

+static void *_p_wxHtmlCellEventTo_p_wxEvent(void *x) {
+    return (void *)((wxEvent *) (wxCommandEvent *) ((wxHtmlCellEvent *) x));
+}

 static void *_p_wxNotifyEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxNotifyEvent *) x));
 }
 static void *_p_wxNotifyEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxNotifyEvent *) x));
 }


@@ -18062,6 +18253,9 @@ static void *_p_wxMouseCaptureChangedEventTo_p_wxEvent(void *x) {
 static void *_p_wxSysColourChangedEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxSysColourChangedEvent *) x));
 }
 static void *_p_wxSysColourChangedEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxSysColourChangedEvent *) x));
 }

+static void *_p_wxHtmlLinkEventTo_p_wxEvent(void *x) {
+    return (void *)((wxEvent *) (wxCommandEvent *) ((wxHtmlLinkEvent *) x));
+}

 static void *_p_wxDropFilesEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxDropFilesEvent *) x));
 }
 static void *_p_wxDropFilesEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxDropFilesEvent *) x));
 }


@@ -18080,9 +18274,6 @@ static void *_p_wxQueryLayoutInfoEventTo_p_wxEvent(void *x) {
 static void *_p_wxShowEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxShowEvent *) x));
 }
 static void *_p_wxShowEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxShowEvent *) x));
 }

-static void *_p_wxHtmlWindowEventTo_p_wxEvent(void *x) {
-    return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *) ((wxHtmlWindowEvent *) x));
-}

 static void *_p_wxCommandEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxCommandEvent *) x));
 }
 static void *_p_wxCommandEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxCommandEvent *) x));
 }


@@ -18119,12 +18310,6 @@ static void *_p_wxHtmlWordCellTo_p_wxHtmlCell(void *x) {
 static void *_p_wxHtmlFontCellTo_p_wxHtmlCell(void *x) {
     return (void *)((wxHtmlCell *)  ((wxHtmlFontCell *) x));
 }
 static void *_p_wxHtmlFontCellTo_p_wxHtmlCell(void *x) {
     return (void *)((wxHtmlCell *)  ((wxHtmlFontCell *) x));
 }

-static void *_p_wxHtmlWindowEventTo_p_wxNotifyEvent(void *x) {
-    return (void *)((wxNotifyEvent *)  ((wxHtmlWindowEvent *) x));
-}
-static void *_p_wxSplitterEventTo_p_wxNotifyEvent(void *x) {
-    return (void *)((wxNotifyEvent *)  ((wxSplitterEvent *) x));
-}

 static void *_p_wxSplashScreenTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x));
 }
 static void *_p_wxSplashScreenTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x));
 }


@@ -18395,6 +18580,9 @@ static void *_p_wxCloseEventTo_p_wxObject(void *x) {
 static void *_p_wxHtmlEasyPrintingTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxHtmlEasyPrinting *) x));
 }
 static void *_p_wxHtmlEasyPrintingTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxHtmlEasyPrinting *) x));
 }

+static void *_p_wxHtmlCellEventTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxHtmlCellEvent *) 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));
 }


@@ -18650,9 +18838,6 @@ static void *_p_wxJPEGHandlerTo_p_wxObject(void *x) {
 static void *_p_wxPNMHandlerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxImageHandler *) ((wxPNMHandler *) x));
 }
 static void *_p_wxPNMHandlerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxImageHandler *) ((wxPNMHandler *) x));
 }

-static void *_p_wxHtmlWindowEventTo_p_wxObject(void *x) {
-    return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *) ((wxHtmlWindowEvent *) x));
-}

 static void *_p_wxShowEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxShowEvent *) x));
 }
 static void *_p_wxShowEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxShowEvent *) x));
 }


@@ -18755,6 +18940,9 @@ static void *_p_wxPaletteChangedEventTo_p_wxObject(void *x) {
 static void *_p_wxHtmlHelpControllerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxHelpControllerBase *) ((wxHtmlHelpController *) x));
 }
 static void *_p_wxHtmlHelpControllerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxHelpControllerBase *) ((wxHtmlHelpController *) x));
 }

+static void *_p_wxHtmlLinkEventTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxHtmlLinkEvent *) x));
+}

 static void *_p_wxPanelTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxPanel *) x));
 }
 static void *_p_wxPanelTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxPanel *) x));
 }


@@ -18803,6 +18991,72 @@ static void *_p_wxHtmlWordCellTo_p_wxObject(void *x) {
 static void *_p_wxMenuBarTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x));
 }
 static void *_p_wxMenuBarTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x));
 }

+static void *_p_wxFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *)  ((wxFrame *) x));
+}
+static void *_p_wxMiniFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMiniFrame *) x));
+}
+static void *_p_wxFontDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFontDialog *) x));
+}
+static void *_p_wxDirDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxDirDialog *) x));
+}
+static void *_p_wxColourDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxColourDialog *) x));
+}
+static void *_p_wxDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *)  ((wxDialog *) x));
+}
+static void *_p_wxHtmlHelpDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxHtmlHelpDialog *) x));
+}
+static void *_p_wxSplashScreenTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxSplashScreen *) x));
+}
+static void *_p_wxMDIParentFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIParentFrame *) x));
+}
+static void *_p_wxMDIChildFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIChildFrame *) x));
+}
+static void *_p_wxMessageDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMessageDialog *) x));
+}
+static void *_p_wxNumberEntryDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxNumberEntryDialog *) x));
+}
+static void *_p_wxPasswordEntryDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x));
+}
+static void *_p_wxTextEntryDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxTextEntryDialog *) x));
+}
+static void *_p_wxSingleChoiceDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxSingleChoiceDialog *) x));
+}
+static void *_p_wxMultiChoiceDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMultiChoiceDialog *) x));
+}
+static void *_p_wxFileDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFileDialog *) x));
+}
+static void *_p_wxProgressDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxProgressDialog *) x));
+}
+static void *_p_wxFindReplaceDialogTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFindReplaceDialog *) x));
+}
+static void *_p_wxHtmlHelpFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxHtmlHelpFrame *) x));
+}
+static void *_p_wxPreviewFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxPreviewFrame *) x));
+}
+static void *_p_wxPyPreviewFrameTo_p_wxTopLevelWindow(void *x) {
+    return (void *)((wxTopLevelWindow *) (wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x));
+}

 static void *_p_wxSplashScreenTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x));
 }
 static void *_p_wxSplashScreenTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x));
 }


@@ -18956,72 +19210,6 @@ static void *_p_wxPyHtmlWindowTo_p_wxScrolledWindow(void *x) {
 static void *_p_wxPreviewCanvasTo_p_wxScrolledWindow(void *x) {
     return (void *)((wxScrolledWindow *)  ((wxPreviewCanvas *) x));
 }
 static void *_p_wxPreviewCanvasTo_p_wxScrolledWindow(void *x) {
     return (void *)((wxScrolledWindow *)  ((wxPreviewCanvas *) x));
 }

-static void *_p_wxFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *)  ((wxFrame *) x));
-}
-static void *_p_wxMiniFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMiniFrame *) x));
-}
-static void *_p_wxFontDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFontDialog *) x));
-}
-static void *_p_wxDirDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxDirDialog *) x));
-}
-static void *_p_wxColourDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxColourDialog *) x));
-}
-static void *_p_wxDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *)  ((wxDialog *) x));
-}
-static void *_p_wxHtmlHelpDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxHtmlHelpDialog *) x));
-}
-static void *_p_wxSplashScreenTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxSplashScreen *) x));
-}
-static void *_p_wxMDIParentFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIParentFrame *) x));
-}
-static void *_p_wxMDIChildFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIChildFrame *) x));
-}
-static void *_p_wxMessageDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMessageDialog *) x));
-}
-static void *_p_wxNumberEntryDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxNumberEntryDialog *) x));
-}
-static void *_p_wxPasswordEntryDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x));
-}
-static void *_p_wxTextEntryDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxTextEntryDialog *) x));
-}
-static void *_p_wxSingleChoiceDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxSingleChoiceDialog *) x));
-}
-static void *_p_wxMultiChoiceDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMultiChoiceDialog *) x));
-}
-static void *_p_wxFileDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFileDialog *) x));
-}
-static void *_p_wxProgressDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxProgressDialog *) x));
-}
-static void *_p_wxFindReplaceDialogTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFindReplaceDialog *) x));
-}
-static void *_p_wxHtmlHelpFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxHtmlHelpFrame *) x));
-}
-static void *_p_wxPreviewFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxPreviewFrame *) x));
-}
-static void *_p_wxPyPreviewFrameTo_p_wxTopLevelWindow(void *x) {
-    return (void *)((wxTopLevelWindow *) (wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x));
-}

 static void *_p_wxColourDialogTo_p_wxDialog(void *x) {
     return (void *)((wxDialog *)  ((wxColourDialog *) x));
 }
 static void *_p_wxColourDialogTo_p_wxDialog(void *x) {
     return (void *)((wxDialog *)  ((wxColourDialog *) x));
 }


@@ -19100,12 +19288,18 @@ static void *_p_wxSashEventTo_p_wxCommandEvent(void *x) {
 static void *_p_wxWindowDestroyEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxWindowDestroyEvent *) x));
 }
 static void *_p_wxWindowDestroyEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxWindowDestroyEvent *) x));
 }

+static void *_p_wxHtmlLinkEventTo_p_wxCommandEvent(void *x) {
+    return (void *)((wxCommandEvent *)  ((wxHtmlLinkEvent *) x));
+}

 static void *_p_wxSplitterEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *) (wxNotifyEvent *) ((wxSplitterEvent *) x));
 }
 static void *_p_wxClipboardTextEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxClipboardTextEvent *) x));
 }
 static void *_p_wxSplitterEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *) (wxNotifyEvent *) ((wxSplitterEvent *) x));
 }
 static void *_p_wxClipboardTextEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxClipboardTextEvent *) x));
 }

+static void *_p_wxHtmlCellEventTo_p_wxCommandEvent(void *x) {
+    return (void *)((wxCommandEvent *)  ((wxHtmlCellEvent *) x));
+}

 static void *_p_wxScrollEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxScrollEvent *) x));
 }
 static void *_p_wxScrollEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxScrollEvent *) x));
 }


@@ -19127,9 +19321,6 @@ static void *_p_wxWindowCreateEventTo_p_wxCommandEvent(void *x) {
 static void *_p_wxNotifyEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxNotifyEvent *) x));
 }
 static void *_p_wxNotifyEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxNotifyEvent *) x));
 }

-static void *_p_wxHtmlWindowEventTo_p_wxCommandEvent(void *x) {
-    return (void *)((wxCommandEvent *) (wxNotifyEvent *) ((wxHtmlWindowEvent *) x));
-}

 static void *_p_wxFindDialogEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxFindDialogEvent *) x));
 }
 static void *_p_wxFindDialogEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxFindDialogEvent *) x));
 }


@@ -19157,6 +19348,7 @@ static swig_type_info _swigt__p_wxContextMenuEvent = {"_p_wxContextMenuEvent", 0
 static swig_type_info _swigt__p_wxChildFocusEvent = {"_p_wxChildFocusEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxDateEvent = {"_p_wxDateEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxWindowCreateEvent = {"_p_wxWindowCreateEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxChildFocusEvent = {"_p_wxChildFocusEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxDateEvent = {"_p_wxDateEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxWindowCreateEvent = {"_p_wxWindowCreateEvent", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxFindDialogEvent = {"_p_wxFindDialogEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxUpdateUIEvent = {"_p_wxUpdateUIEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxConfigBase = {"_p_wxConfigBase", "wxConfigBase *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFindDialogEvent = {"_p_wxFindDialogEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxUpdateUIEvent = {"_p_wxUpdateUIEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxConfigBase = {"_p_wxConfigBase", "wxConfigBase *", 0, 0, (void*)0, 0};


@@ -19198,8 +19390,8 @@ static swig_type_info _swigt__p_wxPaletteChangedEvent = {"_p_wxPaletteChangedEve
 static swig_type_info _swigt__p_wxDisplayChangedEvent = {"_p_wxDisplayChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMouseCaptureChangedEvent = {"_p_wxMouseCaptureChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxSysColourChangedEvent = {"_p_wxSysColourChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxDisplayChangedEvent = {"_p_wxDisplayChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMouseCaptureChangedEvent = {"_p_wxMouseCaptureChangedEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxSysColourChangedEvent = {"_p_wxSysColourChangedEvent", 0, 0, 0, 0, 0};

-static swig_type_info _swigt__p_wxFocusEvent = {"_p_wxFocusEvent", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxDropFilesEvent = {"_p_wxDropFilesEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxDropFilesEvent = {"_p_wxDropFilesEvent", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxFocusEvent = {"_p_wxFocusEvent", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxQueryLayoutInfoEvent = {"_p_wxQueryLayoutInfoEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxNavigationKeyEvent = {"_p_wxNavigationKeyEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxQueryLayoutInfoEvent = {"_p_wxQueryLayoutInfoEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxNavigationKeyEvent = {"_p_wxNavigationKeyEvent", 0, 0, 0, 0, 0};


@@ -19247,6 +19439,7 @@ static swig_type_info _swigt__p_wxHelpSearchMode = {"_p_wxHelpSearchMode", "wxHe
 static swig_type_info _swigt__p_wxHtmlBookRecArray = {"_p_wxHtmlBookRecArray", "wxHtmlBookRecArray *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlBookRecord = {"_p_wxHtmlBookRecord", "wxHtmlBookRecord *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlCell = {"_p_wxHtmlCell", "wxHtmlCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlBookRecArray = {"_p_wxHtmlBookRecArray", "wxHtmlBookRecArray *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlBookRecord = {"_p_wxHtmlBookRecord", "wxHtmlBookRecord *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlCell = {"_p_wxHtmlCell", "wxHtmlCell *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHtmlCellEvent = {"_p_wxHtmlCellEvent", "wxHtmlCellEvent *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlColourCell = {"_p_wxHtmlColourCell", "wxHtmlColourCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlContainerCell = {"_p_wxHtmlContainerCell", "wxHtmlContainerCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlDCRenderer = {"_p_wxHtmlDCRenderer", "wxHtmlDCRenderer *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlColourCell = {"_p_wxHtmlColourCell", "wxHtmlColourCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlContainerCell = {"_p_wxHtmlContainerCell", "wxHtmlContainerCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlDCRenderer = {"_p_wxHtmlDCRenderer", "wxHtmlDCRenderer *", 0, 0, (void*)0, 0};


@@ -19259,6 +19452,7 @@ static swig_type_info _swigt__p_wxHtmlHelpDialog = {"_p_wxHtmlHelpDialog", "wxHt
 static swig_type_info _swigt__p_wxHtmlHelpFrame = {"_p_wxHtmlHelpFrame", "wxHtmlHelpFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpFrameCfg = {"_p_wxHtmlHelpFrameCfg", "wxHtmlHelpFrameCfg *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpWindow = {"_p_wxHtmlHelpWindow", "wxHtmlHelpWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpFrame = {"_p_wxHtmlHelpFrame", "wxHtmlHelpFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpFrameCfg = {"_p_wxHtmlHelpFrameCfg", "wxHtmlHelpFrameCfg *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlHelpWindow = {"_p_wxHtmlHelpWindow", "wxHtmlHelpWindow *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHtmlLinkEvent = {"_p_wxHtmlLinkEvent", "wxHtmlLinkEvent *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlLinkInfo = {"_p_wxHtmlLinkInfo", "wxHtmlLinkInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlModalHelp = {"_p_wxHtmlModalHelp", "wxHtmlModalHelp *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlParser = {"_p_wxHtmlParser", "wxHtmlParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlLinkInfo = {"_p_wxHtmlLinkInfo", "wxHtmlLinkInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlModalHelp = {"_p_wxHtmlModalHelp", "wxHtmlModalHelp *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlParser = {"_p_wxHtmlParser", "wxHtmlParser *", 0, 0, (void*)0, 0};


@@ -19273,11 +19467,9 @@ static swig_type_info _swigt__p_wxHtmlTagHandler = {"_p_wxHtmlTagHandler", "wxHt
 static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHtmlWidgetCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHtmlWidgetCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};

-static swig_type_info _swigt__p_wxHtmlWindowEvent = {"_p_wxHtmlWindowEvent", "wxHtmlWindowEvent *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};

-static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", "wxNotifyEvent *", 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_wxIndividualLayoutConstraint = {"_p_wxIndividualLayoutConstraint", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMenuItem = {"_p_wxMenuItem", 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_wxIndividualLayoutConstraint = {"_p_wxIndividualLayoutConstraint", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMenuItem = {"_p_wxMenuItem", 0, 0, 0, 0, 0};


@@ -19287,8 +19479,8 @@ static swig_type_info _swigt__p_wxLayoutAlgorithm = {"_p_wxLayoutAlgorithm", 0,
 static swig_type_info _swigt__p_wxFindReplaceData = {"_p_wxFindReplaceData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPrintDialogData = {"_p_wxPrintDialogData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPrinter = {"_p_wxPrinter", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxFindReplaceData = {"_p_wxFindReplaceData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPrintDialogData = {"_p_wxPrintDialogData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPrinter = {"_p_wxPrinter", 0, 0, 0, 0, 0};

-static swig_type_info _swigt__p_wxGridSizer = {"_p_wxGridSizer", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxGridSizer = {"_p_wxGridSizer", 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_wxColourData = {"_p_wxColourData", 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_wxColourData = {"_p_wxColourData", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxStdDialogButtonSizer = {"_p_wxStdDialogButtonSizer", 0, 0, 0, 0, 0};


@@ -19397,6 +19589,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlBookRecArray,
   &_swigt__p_wxHtmlBookRecord,
   &_swigt__p_wxHtmlCell,
   &_swigt__p_wxHtmlBookRecArray,
   &_swigt__p_wxHtmlBookRecord,
   &_swigt__p_wxHtmlCell,

+  &_swigt__p_wxHtmlCellEvent,

   &_swigt__p_wxHtmlColourCell,
   &_swigt__p_wxHtmlContainerCell,
   &_swigt__p_wxHtmlDCRenderer,
   &_swigt__p_wxHtmlColourCell,
   &_swigt__p_wxHtmlContainerCell,
   &_swigt__p_wxHtmlDCRenderer,


@@ -19409,6 +19602,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlHelpFrame,
   &_swigt__p_wxHtmlHelpFrameCfg,
   &_swigt__p_wxHtmlHelpWindow,
   &_swigt__p_wxHtmlHelpFrame,
   &_swigt__p_wxHtmlHelpFrameCfg,
   &_swigt__p_wxHtmlHelpWindow,

+  &_swigt__p_wxHtmlLinkEvent,

   &_swigt__p_wxHtmlLinkInfo,
   &_swigt__p_wxHtmlModalHelp,
   &_swigt__p_wxHtmlParser,
   &_swigt__p_wxHtmlLinkInfo,
   &_swigt__p_wxHtmlModalHelp,
   &_swigt__p_wxHtmlParser,


@@ -19423,7 +19617,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlWidgetCell,
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlWindow,
   &_swigt__p_wxHtmlWidgetCell,
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlWindow,

-  &_swigt__p_wxHtmlWindowEvent,

   &_swigt__p_wxHtmlWindowInterface,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxHtmlWindowInterface,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,


@@ -19558,9 +19751,10 @@ static swig_cast_info _swigc__p_wxContextMenuEvent[] = {{&_swigt__p_wxContextMen
 static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxNotifyEvent[] = {{&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxFindDialogEvent[] = {{&_swigt__p_wxFindDialogEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFindDialogEvent[] = {{&_swigt__p_wxFindDialogEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxCommandEvent[] = {  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxCommandEvent, 0, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxCommandEvent[] = {  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxHtmlLinkEvent, _p_wxHtmlLinkEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxHtmlCellEvent, _p_wxHtmlCellEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxCommandEvent, 0, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxConfigBase[] = {  {&_swigt__p_wxConfigBase, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxCursor[] = {  {&_swigt__p_wxCursor, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDC[] = {  {&_swigt__p_wxDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxConfigBase[] = {  {&_swigt__p_wxConfigBase, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxCursor[] = {  {&_swigt__p_wxCursor, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDC[] = {  {&_swigt__p_wxDC, 0, 0, 0},{0, 0, 0, 0}};


@@ -19599,15 +19793,15 @@ static swig_cast_info _swigc__p_wxPaletteChangedEvent[] = {{&_swigt__p_wxPalette
 static swig_cast_info _swigc__p_wxDisplayChangedEvent[] = {{&_swigt__p_wxDisplayChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseCaptureChangedEvent[] = {{&_swigt__p_wxMouseCaptureChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSysColourChangedEvent[] = {{&_swigt__p_wxSysColourChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDisplayChangedEvent[] = {{&_swigt__p_wxDisplayChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseCaptureChangedEvent[] = {{&_swigt__p_wxMouseCaptureChangedEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSysColourChangedEvent[] = {{&_swigt__p_wxSysColourChangedEvent, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxFocusEvent[] = {{&_swigt__p_wxFocusEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxDropFilesEvent[] = {{&_swigt__p_wxDropFilesEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDropFilesEvent[] = {{&_swigt__p_wxDropFilesEvent, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxFocusEvent[] = {{&_swigt__p_wxFocusEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxQueryLayoutInfoEvent[] = {{&_swigt__p_wxQueryLayoutInfoEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxShowEvent[] = {{&_swigt__p_wxShowEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigationKeyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxKeyEvent[] = {{&_swigt__p_wxKeyEvent, 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_wxTaskBarIconEvent[] = {{&_swigt__p_wxTaskBarIconEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxQueryLayoutInfoEvent[] = {{&_swigt__p_wxQueryLayoutInfoEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxShowEvent[] = {{&_swigt__p_wxShowEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigationKeyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxKeyEvent[] = {{&_swigt__p_wxKeyEvent, 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_wxTaskBarIconEvent[] = {{&_swigt__p_wxTaskBarIconEvent, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxEvent[] = {  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEvent, 0, 0, 0},  {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxEvent[] = {  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxHtmlCellEvent, _p_wxHtmlCellEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEvent, 0, 0, 0},  {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxHtmlLinkEvent, _p_wxHtmlLinkEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxSplashScreen[] = {{&_swigt__p_wxSplashScreen, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMiniFrame[] = {{&_swigt__p_wxMiniFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyPanel[] = {{&_swigt__p_wxPyPanel, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSplashScreen[] = {{&_swigt__p_wxSplashScreen, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMiniFrame[] = {{&_swigt__p_wxMiniFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyPanel[] = {{&_swigt__p_wxPyPanel, 0, 0, 0},{0, 0, 0, 0}};


@@ -19649,6 +19843,7 @@ static swig_cast_info _swigc__p_wxHelpSearchMode[] = {  {&_swigt__p_wxHelpSearch
 static swig_cast_info _swigc__p_wxHtmlBookRecArray[] = {  {&_swigt__p_wxHtmlBookRecArray, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlBookRecord[] = {  {&_swigt__p_wxHtmlBookRecord, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlCell[] = {  {&_swigt__p_wxHtmlCell, 0, 0, 0},  {&_swigt__p_wxHtmlContainerCell, _p_wxHtmlContainerCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlWidgetCell, _p_wxHtmlWidgetCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlColourCell, _p_wxHtmlColourCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlWordCell, _p_wxHtmlWordCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlFontCell, _p_wxHtmlFontCellTo_p_wxHtmlCell, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlBookRecArray[] = {  {&_swigt__p_wxHtmlBookRecArray, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlBookRecord[] = {  {&_swigt__p_wxHtmlBookRecord, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlCell[] = {  {&_swigt__p_wxHtmlCell, 0, 0, 0},  {&_swigt__p_wxHtmlContainerCell, _p_wxHtmlContainerCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlWidgetCell, _p_wxHtmlWidgetCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlColourCell, _p_wxHtmlColourCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlWordCell, _p_wxHtmlWordCellTo_p_wxHtmlCell, 0, 0},  {&_swigt__p_wxHtmlFontCell, _p_wxHtmlFontCellTo_p_wxHtmlCell, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHtmlCellEvent[] = {  {&_swigt__p_wxHtmlCellEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlColourCell[] = {  {&_swigt__p_wxHtmlColourCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlContainerCell[] = {  {&_swigt__p_wxHtmlContainerCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlDCRenderer[] = {  {&_swigt__p_wxHtmlDCRenderer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlColourCell[] = {  {&_swigt__p_wxHtmlColourCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlContainerCell[] = {  {&_swigt__p_wxHtmlContainerCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlDCRenderer[] = {  {&_swigt__p_wxHtmlDCRenderer, 0, 0, 0},{0, 0, 0, 0}};


@@ -19661,6 +19856,7 @@ static swig_cast_info _swigc__p_wxHtmlHelpDialog[] = {  {&_swigt__p_wxHtmlHelpDi
 static swig_cast_info _swigc__p_wxHtmlHelpFrame[] = {  {&_swigt__p_wxHtmlHelpFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpFrameCfg[] = {  {&_swigt__p_wxHtmlHelpFrameCfg, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpWindow[] = {  {&_swigt__p_wxHtmlHelpWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpFrame[] = {  {&_swigt__p_wxHtmlHelpFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpFrameCfg[] = {  {&_swigt__p_wxHtmlHelpFrameCfg, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlHelpWindow[] = {  {&_swigt__p_wxHtmlHelpWindow, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHtmlLinkEvent[] = {  {&_swigt__p_wxHtmlLinkEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlLinkInfo[] = {  {&_swigt__p_wxHtmlLinkInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlModalHelp[] = {  {&_swigt__p_wxHtmlModalHelp, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlParser[] = {  {&_swigt__p_wxHtmlParser, 0, 0, 0},  {&_swigt__p_wxHtmlWinParser, _p_wxHtmlWinParserTo_p_wxHtmlParser, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlLinkInfo[] = {  {&_swigt__p_wxHtmlLinkInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlModalHelp[] = {  {&_swigt__p_wxHtmlModalHelp, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlParser[] = {  {&_swigt__p_wxHtmlParser, 0, 0, 0},  {&_swigt__p_wxHtmlWinParser, _p_wxHtmlWinParserTo_p_wxHtmlParser, 0, 0},{0, 0, 0, 0}};


@@ -19675,11 +19871,9 @@ static swig_cast_info _swigc__p_wxHtmlTagHandler[] = {  {&_swigt__p_wxHtmlTagHan
 static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidgetCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidgetCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxHtmlWindowEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxNotifyEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, 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_wxMenuItem[] = {{&_swigt__p_wxMenuItem, 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_wxIndividualLayoutConstraint[] = {{&_swigt__p_wxIndividualLayoutConstraint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMenuItem[] = {{&_swigt__p_wxMenuItem, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxImage[] = {{&_swigt__p_wxImage, 0, 0, 0},{0, 0, 0, 0}};


@@ -19688,8 +19882,8 @@ static swig_cast_info _swigc__p_wxLayoutAlgorithm[] = {{&_swigt__p_wxLayoutAlgor
 static swig_cast_info _swigc__p_wxFindReplaceData[] = {{&_swigt__p_wxFindReplaceData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrintDialogData[] = {{&_swigt__p_wxPrintDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrinter[] = {{&_swigt__p_wxPrinter, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFindReplaceData[] = {{&_swigt__p_wxFindReplaceData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrintDialogData[] = {{&_swigt__p_wxPrintDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrinter[] = {{&_swigt__p_wxPrinter, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxGridSizer[] = {{&_swigt__p_wxGridSizer, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxGridSizer[] = {{&_swigt__p_wxGridSizer, 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_wxColourData[] = {{&_swigt__p_wxColourData, 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_wxColourData[] = {{&_swigt__p_wxColourData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxStdDialogButtonSizer[] = {{&_swigt__p_wxStdDialogButtonSizer, 0, 0, 0},{0, 0, 0, 0}};


@@ -19719,7 +19913,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_wxObject[] = {  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlFontCell, _p_wxHtmlFontCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlTag, _p_wxHtmlTagTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlFilter, _p_wxPyHtmlFilterTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_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_wxHtmlEasyPrinting, _p_wxHtmlEasyPrintingTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0},  {&_swigt__p_wxObject, 0, 0, 0},  {&_swigt__p_wxHtmlParser, _p_wxHtmlParserTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWinParser, _p_wxHtmlWinParserTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpFrame, _p_wxHtmlHelpFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWidgetCell, _p_wxHtmlWidgetCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourData, _p_wxColourDataTo_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_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlPrintout, _p_wxHtmlPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_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_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlContainerCell, _p_wxHtmlContainerCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpDialog, _p_wxHtmlHelpDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlWinTagHandler, _p_wxPyHtmlWinTagHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlTagHandler, _p_wxPyHtmlTagHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_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_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpWindow, _p_wxHtmlHelpWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlWindow, _p_wxPyHtmlWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxHelpControllerBase, _p_wxHelpControllerBaseTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlDCRenderer, _p_wxHtmlDCRendererTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlLinkInfo, _p_wxHtmlLinkInfoTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_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_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpController, _p_wxHtmlHelpControllerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlCell, _p_wxHtmlCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlColourCell, _p_wxHtmlColourCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWordCell, _p_wxHtmlWordCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxObject[] = {  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlFontCell, _p_wxHtmlFontCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlTag, _p_wxHtmlTagTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlFilter, _p_wxPyHtmlFilterTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_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_wxHtmlEasyPrinting, _p_wxHtmlEasyPrintingTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlCellEvent, _p_wxHtmlCellEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0},  {&_swigt__p_wxObject, 0, 0, 0},  {&_swigt__p_wxHtmlWinParser, _p_wxHtmlWinParserTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlParser, _p_wxHtmlParserTo_p_wxObject, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpFrame, _p_wxHtmlHelpFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWidgetCell, _p_wxHtmlWidgetCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourData, _p_wxColourDataTo_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_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlPrintout, _p_wxHtmlPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_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_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlContainerCell, _p_wxHtmlContainerCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpDialog, _p_wxHtmlHelpDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlWinTagHandler, _p_wxPyHtmlWinTagHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlTagHandler, _p_wxPyHtmlTagHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_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_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpWindow, _p_wxHtmlHelpWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlWindow, _p_wxPyHtmlWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxHelpControllerBase, _p_wxHelpControllerBaseTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlDCRenderer, _p_wxHtmlDCRendererTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlLinkInfo, _p_wxHtmlLinkInfoTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_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_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlHelpController, _p_wxHtmlHelpControllerTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlLinkEvent, _p_wxHtmlLinkEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlCell, _p_wxHtmlCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlColourCell, _p_wxHtmlColourCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_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_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxHtmlWordCell, _p_wxHtmlWordCellTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxPageSetupDialogData[] = {  {&_swigt__p_wxPageSetupDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPanel[] = {  {&_swigt__p_wxPanel, 0, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlWindow, _p_wxPyHtmlWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 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_wxPageSetupDialogData[] = {  {&_swigt__p_wxPageSetupDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPanel[] = {  {&_swigt__p_wxPanel, 0, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlWindow, _p_wxPyHtmlWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPaperSize[] = {  {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}};


@@ -19799,6 +19993,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlBookRecArray,
   _swigc__p_wxHtmlBookRecord,
   _swigc__p_wxHtmlCell,
   _swigc__p_wxHtmlBookRecArray,
   _swigc__p_wxHtmlBookRecord,
   _swigc__p_wxHtmlCell,

+  _swigc__p_wxHtmlCellEvent,

   _swigc__p_wxHtmlColourCell,
   _swigc__p_wxHtmlContainerCell,
   _swigc__p_wxHtmlDCRenderer,
   _swigc__p_wxHtmlColourCell,
   _swigc__p_wxHtmlContainerCell,
   _swigc__p_wxHtmlDCRenderer,


@@ -19811,6 +20006,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlHelpFrame,
   _swigc__p_wxHtmlHelpFrameCfg,
   _swigc__p_wxHtmlHelpWindow,
   _swigc__p_wxHtmlHelpFrame,
   _swigc__p_wxHtmlHelpFrameCfg,
   _swigc__p_wxHtmlHelpWindow,

+  _swigc__p_wxHtmlLinkEvent,

   _swigc__p_wxHtmlLinkInfo,
   _swigc__p_wxHtmlModalHelp,
   _swigc__p_wxHtmlParser,
   _swigc__p_wxHtmlLinkInfo,
   _swigc__p_wxHtmlModalHelp,
   _swigc__p_wxHtmlParser,


@@ -19825,7 +20021,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlWidgetCell,
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlWindow,
   _swigc__p_wxHtmlWidgetCell,
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlWindow,

-  _swigc__p_wxHtmlWindowEvent,

   _swigc__p_wxHtmlWindowInterface,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,
   _swigc__p_wxHtmlWindowInterface,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,


@@ -20531,6 +20726,9 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "ID_HTML_SEARCHBUTTON",SWIG_From_int(static_cast< int >(wxID_HTML_SEARCHBUTTON)));
   SWIG_Python_SetConstant(d, "ID_HTML_SEARCHCHOICE",SWIG_From_int(static_cast< int >(wxID_HTML_SEARCHCHOICE)));
   SWIG_Python_SetConstant(d, "ID_HTML_COUNTINFO",SWIG_From_int(static_cast< int >(wxID_HTML_COUNTINFO)));
   SWIG_Python_SetConstant(d, "ID_HTML_SEARCHBUTTON",SWIG_From_int(static_cast< int >(wxID_HTML_SEARCHBUTTON)));
   SWIG_Python_SetConstant(d, "ID_HTML_SEARCHCHOICE",SWIG_From_int(static_cast< int >(wxID_HTML_SEARCHCHOICE)));
   SWIG_Python_SetConstant(d, "ID_HTML_COUNTINFO",SWIG_From_int(static_cast< int >(wxID_HTML_COUNTINFO)));

+  PyDict_SetItemString(d, "wxEVT_COMMAND_HTML_CELL_CLICKED", PyInt_FromLong(wxEVT_COMMAND_HTML_CELL_CLICKED));
+  PyDict_SetItemString(d, "wxEVT_COMMAND_HTML_CELL_HOVER", PyInt_FromLong(wxEVT_COMMAND_HTML_CELL_HOVER));
+  PyDict_SetItemString(d, "wxEVT_COMMAND_HTML_LINK_CLICKED", PyInt_FromLong(wxEVT_COMMAND_HTML_LINK_CLICKED));

   
   wxPyPtrTypeMap_Add("wxHtmlTagHandler",    "wxPyHtmlTagHandler");
   wxPyPtrTypeMap_Add("wxHtmlWinTagHandler", "wxPyHtmlWinTagHandler");
   
   wxPyPtrTypeMap_Add("wxHtmlTagHandler",    "wxPyHtmlTagHandler");
   wxPyPtrTypeMap_Add("wxHtmlWinTagHandler", "wxPyHtmlWinTagHandler");