Add 2.5 dirs to PREFIXES

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

diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp
index 36361c4db3408d914ef6defc77bec8808c40abe9..27480d39c739e670a9719cde3b27f130bedf61c1 100644 (file)
--- a/wxPython/src/msw/_gdi_wrap.cpp
+++ b/wxPython/src/msw/_gdi_wrap.cpp
@@ -3616,10 +3616,14 @@ static void wxDC_GetBoundingBox(wxDC* dc, int* x1, int* y1, int* x2, int* y2) {
 // C++ stub classes for platforms or build configurations that don't have
 // wxGraphicsContext yet.
 
 // C++ stub classes for platforms or build configurations that don't have
 // wxGraphicsContext yet.
 

+class wxGraphicsRenderer;
+class wxGraphicsMatrix;
+

 
 class wxGraphicsObject : public wxObject
 {
 public :
 
 class wxGraphicsObject : public wxObject
 {
 public :

+    wxGraphicsObject() {}

     wxGraphicsObject( wxGraphicsRenderer*  ) {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsObject is not available on this platform.");
     wxGraphicsObject( wxGraphicsRenderer*  ) {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsObject is not available on this platform.");


@@ -3634,6 +3638,7 @@ public :
 
 class wxGraphicsPen : public wxGraphicsObject
 {
 
 class wxGraphicsPen : public wxGraphicsObject
 {

+public:

     wxGraphicsPen()  {}
     virtual ~wxGraphicsPen() {}
 } ;
     wxGraphicsPen()  {}
     virtual ~wxGraphicsPen() {}
 } ;


@@ -3664,6 +3669,7 @@ wxGraphicsFont wxNullGraphicsFont;
 class wxGraphicsPath : public wxGraphicsObject
 {
 public :
 class wxGraphicsPath : public wxGraphicsObject
 {
 public :

+    wxGraphicsPath() { }

     wxGraphicsPath(wxGraphicsRenderer* ) {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsPath is not available on this platform.");
     wxGraphicsPath(wxGraphicsRenderer* ) {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsPath is not available on this platform.");


@@ -3676,10 +3682,10 @@ public :
     void AddLineToPoint( const wxPoint2DDouble& ) {}
     void AddCurveToPoint( wxDouble, wxDouble, wxDouble, wxDouble, wxDouble, wxDouble ) {}
     void AddCurveToPoint( const wxPoint2DDouble&, const wxPoint2DDouble&, const wxPoint2DDouble&) {}
     void AddLineToPoint( const wxPoint2DDouble& ) {}
     void AddCurveToPoint( wxDouble, wxDouble, wxDouble, wxDouble, wxDouble, wxDouble ) {}
     void AddCurveToPoint( const wxPoint2DDouble&, const wxPoint2DDouble&, const wxPoint2DDouble&) {}

-    void AddPath( const wxGraphicsPath* ) {}
+    void AddPath( const wxGraphicsPath& ) {}

     void CloseSubpath() {}
     void CloseSubpath() {}

-    void GetCurrentPoint( wxDouble&, wxDouble&) {}
-    wxPoint2DDouble GetCurrentPoint() { reutrn wxPoint2D(0,0); }
+    void GetCurrentPoint( wxDouble&, wxDouble&) const {}
+    wxPoint2DDouble GetCurrentPoint() const { return wxPoint2D(0,0); }

     void AddArc( wxDouble, wxDouble, wxDouble, wxDouble, wxDouble, bool ) {}
     void AddArc( const wxPoint2DDouble& , wxDouble, wxDouble , wxDouble , bool ) {}
 
     void AddArc( wxDouble, wxDouble, wxDouble, wxDouble, wxDouble, bool ) {}
     void AddArc( const wxPoint2DDouble& , wxDouble, wxDouble , wxDouble , bool ) {}
 


@@ -3691,13 +3697,13 @@ public :
     void AddEllipse( wxDouble , wxDouble , wxDouble , wxDouble ) {}
     void AddRoundedRectangle( wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ) {}
     void * GetNativePath() const { return NULL; }
     void AddEllipse( wxDouble , wxDouble , wxDouble , wxDouble ) {}
     void AddRoundedRectangle( wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ) {}
     void * GetNativePath() const { return NULL; }

-    void UnGetNativePath(void *) {}
-    void Transform( wxGraphicsMatrix* ) {}
-    void GetBox(wxDouble *, wxDouble *, wxDouble *, wxDouble *) {}
-    wxRect2D GetBox() { return wxRect2D(0,0,0,0); }
+    void UnGetNativePath(void *) const {}
+    void Transform( const wxGraphicsMatrix& ) {}
+    void GetBox(wxDouble *, wxDouble *, wxDouble *, wxDouble *) const {}
+    wxRect2D GetBox() const { return wxRect2D(0,0,0,0); }

 
 

-    bool Contains( wxDouble , wxDouble , int ) { return false; }
-    bool Contains( const wxPoint2DDouble& , int ) { return false; }
+    bool Contains( wxDouble , wxDouble , int ) const { return false; }
+    bool Contains( const wxPoint2DDouble& , int ) const { return false; }

 };
 wxGraphicsPath wxNullGraphicsPath;
 
 };
 wxGraphicsPath wxNullGraphicsPath;
 


@@ -3705,23 +3711,24 @@ wxGraphicsPath wxNullGraphicsPath;
 class wxGraphicsMatrix : public wxGraphicsObject
 {
 public :
 class wxGraphicsMatrix : public wxGraphicsObject
 {
 public :

+    wxGraphicsMatrix() { }

     wxGraphicsMatrix(wxGraphicsRenderer* ) {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsMatrix is not available on this platform.");
     }
     virtual ~wxGraphicsMatrix() {}
     wxGraphicsMatrix(wxGraphicsRenderer* ) {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsMatrix is not available on this platform.");
     }
     virtual ~wxGraphicsMatrix() {}

-    virtual void Concat( const wxGraphicsMatrix * ) {}
-    virtual void Copy( const wxGraphicsMatrix * )  {}
+    virtual void Concat( const wxGraphicsMatrix & ) {}
+    virtual void Copy( const wxGraphicsMatrix & )  {}

     virtual void Set(wxDouble , wxDouble , wxDouble , wxDouble ,
                      wxDouble , wxDouble ) {}
     virtual void Invert() {}
     virtual void Set(wxDouble , wxDouble , wxDouble , wxDouble ,
                      wxDouble , wxDouble ) {}
     virtual void Invert() {}

-    virtual bool IsEqual( const wxGraphicsMatrix* t) const  {}
-    virtual bool IsIdentity() { return false; }
+    virtual bool IsEqual( const wxGraphicsMatrix& t) const  { return false; }
+    virtual bool IsIdentity() const { return false; }

     virtual void Translate( wxDouble , wxDouble ) {}
     virtual void Scale( wxDouble , wxDouble  ) {}
     virtual void Rotate( wxDouble  ) {}
     virtual void Translate( wxDouble , wxDouble ) {}
     virtual void Scale( wxDouble , wxDouble  ) {}
     virtual void Rotate( wxDouble  ) {}

-    virtual void TransformPoint( wxDouble *, wxDouble * ) {}
-    virtual void TransformDistance( wxDouble *, wxDouble * ) {}
+    virtual void TransformPoint( wxDouble *, wxDouble * ) const {}
+    virtual void TransformDistance( wxDouble *, wxDouble * ) const {}

     virtual void * GetNativeMatrix() const { return NULL; }
 };
 wxGraphicsMatrix wxNullGraphicsMatrix;
     virtual void * GetNativeMatrix() const { return NULL; }
 };
 wxGraphicsMatrix wxNullGraphicsMatrix;


@@ -3738,43 +3745,52 @@ public:
 
     virtual ~wxGraphicsContext() {}
 
 
     virtual ~wxGraphicsContext() {}
 

+    static wxGraphicsContext* Create()   {
+        PyErr_SetString(PyExc_NotImplementedError,
+                        "wx.GraphicsContext is not available on this platform.");
+        return NULL;
+    }

     static wxGraphicsContext* Create( const wxWindowDC& )  {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsContext is not available on this platform.");
     static wxGraphicsContext* Create( const wxWindowDC& )  {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsContext is not available on this platform.");

+        return NULL;

     }
 
     static wxGraphicsContext* CreateFromNative( void *  )  {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsContext is not available on this platform.");
     }
 
     static wxGraphicsContext* CreateFromNative( void *  )  {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsContext is not available on this platform.");

+        return NULL;

     }
 
     static wxGraphicsContext* CreateFromNativeWindow( void *  )  {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsContext is not available on this platform.");
     }
 
     static wxGraphicsContext* CreateFromNativeWindow( void *  )  {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsContext is not available on this platform.");

+        return NULL;

     }
 
     static wxGraphicsContext* Create( wxWindow*  )  {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsContext is not available on this platform.");
     }
 
     static wxGraphicsContext* Create( wxWindow*  )  {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsContext is not available on this platform.");

+        return NULL;

     }
 
     }
 

-    wxGraphicsPath * CreatePath()  { return NULL; }
+    wxGraphicsPath CreatePath()  { return wxNullGraphicsPath; }

 
 

-    virtual wxGraphicsPen CreatePen(const wxPen& )  { return NULL; }
+    virtual wxGraphicsPen CreatePen(const wxPen& )  { return wxNullGraphicsPen; }

 
 

-    virtual wxGraphicsBrush CreateBrush(const wxBrush& ) { return NULL; }
+    virtual wxGraphicsBrush CreateBrush(const wxBrush& ) { return wxNullGraphicsBrush; }

 
     virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble , wxDouble , wxDouble , wxDouble ,
 
     virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble , wxDouble , wxDouble , wxDouble ,

-                                                        const wxColour&, const wxColour&) { return NULL; }
+                                                        const wxColour&, const wxColour&) { return wxNullGraphicsBrush; }

 
     virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo,
                                                         wxDouble xc, wxDouble yc, wxDouble radius,
 
     virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo,
                                                         wxDouble xc, wxDouble yc, wxDouble radius,

-                                                        const wxColour &oColor, const wxColour &cColor) { return NULL; }
+                                                        const wxColour &oColor, const wxColour &cColor) { return wxNullGraphicsBrush; }

 
 

-    virtual wxGraphicsFont CreateFont( const wxFont &, const wxColour & )  { return NULL; }
+    virtual wxGraphicsFont CreateFont( const wxFont &, const wxColour & )  { return wxNullGraphicsFont; }

 
 

-    virtual wxGraphicsMatrix* CreateMatrix( wxDouble, wxDouble, wxDouble, wxDouble,
-                                            wxDouble, wxDouble)  { return NULL; }
+    virtual wxGraphicsMatrix CreateMatrix( wxDouble, wxDouble, wxDouble, wxDouble,
+                                            wxDouble, wxDouble)  { return wxNullGraphicsMatrix; }

 
     virtual void PushState() {}
     virtual void PopState() {}
 
     virtual void PushState() {}
     virtual void PopState() {}


@@ -3785,9 +3801,9 @@ public:
     virtual void Translate( wxDouble , wxDouble ) {}
     virtual void Scale( wxDouble , wxDouble ) {}
     virtual void Rotate( wxDouble ) {}
     virtual void Translate( wxDouble , wxDouble ) {}
     virtual void Scale( wxDouble , wxDouble ) {}
     virtual void Rotate( wxDouble ) {}

-    virtual void ConcatTransform( const wxGraphicsMatrix* ) {}
-    virtual void SetTransform( const wxGraphicsMatrix* ) {}
-    virtual void GetTransform( wxGraphicsMatrix* ) {}
+    virtual void ConcatTransform( const wxGraphicsMatrix& ) {}
+    virtual void SetTransform( const wxGraphicsMatrix& ) {}
+    virtual wxGraphicsMatrix GetTransform() const { return wxNullGraphicsMatrix; }

 
     virtual void SetPen( const wxGraphicsPen& ) {}
     void SetPen( const wxPen& ) {}
 
     virtual void SetPen( const wxGraphicsPen& ) {}
     void SetPen( const wxPen& ) {}


@@ -3798,12 +3814,14 @@ public:
     virtual void SetFont( const wxGraphicsFont& ) {}
     void SetFont( const wxFont&, const wxColour& ) {}
 
     virtual void SetFont( const wxGraphicsFont& ) {}
     void SetFont( const wxFont&, const wxColour& ) {}
 

-    virtual void StrokePath( const wxGraphicsPath * ) {}
-    virtual void FillPath( const wxGraphicsPath *, int ) {}
-    virtual void DrawPath( const wxGraphicsPath *, int ) {}
+    virtual void StrokePath( const wxGraphicsPath & ) {}
+    virtual void FillPath( const wxGraphicsPath &, int ) {}
+    virtual void DrawPath( const wxGraphicsPath &, int ) {}

 
     virtual void DrawText( const wxString &, wxDouble , wxDouble  )  {}
     virtual void DrawText( const wxString &, wxDouble , wxDouble , wxDouble ) {}
 
     virtual void DrawText( const wxString &, wxDouble , wxDouble  )  {}
     virtual void DrawText( const wxString &, wxDouble , wxDouble , wxDouble ) {}

+    virtual void DrawText( const wxString &, wxDouble , wxDouble , wxGraphicsBrush )  {}
+    virtual void DrawText( const wxString &, wxDouble , wxDouble , wxDouble , wxGraphicsBrush ) {}

     virtual void GetTextExtent( const wxString &, wxDouble *, wxDouble *,
                                 wxDouble *, wxDouble * ) const {}
     virtual void GetPartialTextExtents(const wxString& , wxArrayDouble& ) const  {}
     virtual void GetTextExtent( const wxString &, wxDouble *, wxDouble *,
                                 wxDouble *, wxDouble * ) const {}
     virtual void GetPartialTextExtents(const wxString& , wxArrayDouble& ) const  {}


@@ -3816,6 +3834,7 @@ public:
     virtual void StrokeLines( size_t , const wxPoint2DDouble *, const wxPoint2DDouble *) {}
     virtual void DrawLines( size_t , const wxPoint2DDouble *, int ) {}
     virtual void DrawRectangle( wxDouble , wxDouble , wxDouble , wxDouble ) {}
     virtual void StrokeLines( size_t , const wxPoint2DDouble *, const wxPoint2DDouble *) {}
     virtual void DrawLines( size_t , const wxPoint2DDouble *, int ) {}
     virtual void DrawRectangle( wxDouble , wxDouble , wxDouble , wxDouble ) {}

+    virtual void DrawRoundedRectangle( wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ) {}

     virtual void DrawEllipse( wxDouble , wxDouble , wxDouble , wxDouble ) {}
     virtual void DrawRoundedRectangle( wxDouble  wxDouble , wxDouble , wxDouble , wxDouble ) {}
     virtual bool ShouldOffset() const { return false; }
     virtual void DrawEllipse( wxDouble , wxDouble , wxDouble , wxDouble ) {}
     virtual void DrawRoundedRectangle( wxDouble  wxDouble , wxDouble , wxDouble , wxDouble ) {}
     virtual bool ShouldOffset() const { return false; }


@@ -3832,28 +3851,30 @@ public :
 
     virtual ~wxGraphicsRenderer() {}
 
 
     virtual ~wxGraphicsRenderer() {}
 

-    static wxGraphicsRenderer* GetDefaultRenderer(
+    static wxGraphicsRenderer* GetDefaultRenderer() {

         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsRenderer is not available on this platform.");
         PyErr_SetString(PyExc_NotImplementedError,
                         "wx.GraphicsRenderer is not available on this platform.");

-    );
+        return NULL;
+    }

 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& ) { return NULL; }
     virtual wxGraphicsContext * CreateContextFromNativeContext( void *  ) { return NULL; }
     virtual wxGraphicsContext * CreateContextFromNativeWindow( void *  )  { return NULL; }
     virtual wxGraphicsContext * CreateContext( wxWindow*  ) { return NULL; }
 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& ) { return NULL; }
     virtual wxGraphicsContext * CreateContextFromNativeContext( void *  ) { return NULL; }
     virtual wxGraphicsContext * CreateContextFromNativeWindow( void *  )  { return NULL; }
     virtual wxGraphicsContext * CreateContext( wxWindow*  ) { return NULL; }

+    virtual wxGraphicsContext * CreateMeasuringContext() { return NULL; }

 
 

-    virtual wxGraphicsPath * CreatePath()  { return NULL; }
+    virtual wxGraphicsPath CreatePath()  { return wxNullGraphicsPath; }

 
 

-    virtual wxGraphicsMatrix * CreateMatrix( wxDouble , wxDouble , wxDouble , wxDouble ,
-                                             wxDouble , wxDouble ) { return NULL; }
+    virtual wxGraphicsMatrix CreateMatrix( wxDouble , wxDouble , wxDouble , wxDouble ,
+                                             wxDouble , wxDouble ) { return wxNullGraphicsMatrix; }

 
 

-    virtual wxGraphicsPen CreatePen(const wxPen& )  { return wxNullGaphicsPen; }
-    virtual wxGraphicsBrush CreateBrush(const wxBrush&  )  { return wxNullGaphicsBrush; }
-    virtual wxGraphicsBrush CreateLinearGradientBrush(xDouble , wxDouble , wxDouble , wxDouble ,
-                                                      const wxColour&, const wxColour&)  { return wxNullGaphicsBrush; }
+    virtual wxGraphicsPen CreatePen(const wxPen& )  { return wxNullGraphicsPen; }
+    virtual wxGraphicsBrush CreateBrush(const wxBrush&  )  { return wxNullGraphicsBrush; }
+    virtual wxGraphicsBrush CreateLinearGradientBrush(wxDouble , wxDouble , wxDouble , wxDouble ,
+                                                      const wxColour&, const wxColour&)  { return wxNullGraphicsBrush; }

     virtual wxGraphicsBrush CreateRadialGradientBrush(wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ,
     virtual wxGraphicsBrush CreateRadialGradientBrush(wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ,

-                                                      const wxColour &, const wxColour &)  { return wxNullGaphicsBrush; }
-    virtual wxGraphicsFont CreateFont( const wxFont & , const wxColour & ) { return wxNullGaphicsFont; }
+                                                      const wxColour &, const wxColour &)  { return wxNullGraphicsBrush; }
+    virtual wxGraphicsFont CreateFont( const wxFont & , const wxColour & ) { return wxNullGraphicsFont; }

 };
 
 
 };
 
 


@@ -16099,10 +16120,10 @@ SWIGINTERN PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *SWIGUNUSEDP
   wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
   PyObject *arg2 = (PyObject *) 0 ;
   PyObject *arg3 = (PyObject *) 0 ;
   wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
   PyObject *arg2 = (PyObject *) 0 ;
   PyObject *arg3 = (PyObject *) 0 ;

-  bool arg4 ;
+  int arg4 = (int) 0 ;

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

-  bool val4 ;
+  int val4 ;

   int ecode4 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   int ecode4 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;


@@ -16112,7 +16133,7 @@ SWIGINTERN PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *SWIGUNUSEDP
     (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL 
   };
   
     (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL 
   };
   

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

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


@@ -16120,11 +16141,13 @@ SWIGINTERN PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *SWIGUNUSEDP
   arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
   arg2 = obj1;
   arg3 = obj2;
   arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
   arg2 = obj1;
   arg3 = obj2;

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

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->_setCallbackInfo(arg2,arg3,arg4);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->_setCallbackInfo(arg2,arg3,arg4);


@@ -34913,6 +34936,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP
   int arg5 = (int) 0 ;
   wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ;
   wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ;
   int arg5 = (int) 0 ;
   wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ;
   wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ;

+  int result;

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


@@ -34983,11 +35007,11 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->DrawHeaderButton(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7);
+    result = (int)(arg1)->DrawHeaderButton(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7);

     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;


@@ -35003,6 +35027,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButtonContents(PyObject *SWI
   int arg5 = (int) 0 ;
   wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ;
   wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ;
   int arg5 = (int) 0 ;
   wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ;
   wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ;

+  int result;

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


@@ -35073,11 +35098,11 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButtonContents(PyObject *SWI
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->DrawHeaderButtonContents(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7);
+    result = (int)(arg1)->DrawHeaderButtonContents(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7);

     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;