ActiveX events should be sent to the window, not it's parent.

[wxWidgets.git] / wxPython / src / _dc.i

diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index b2ddce26ea0a4d2006834e4e993ef5044c07b391..95dd16cf47e115eabe5f768f3b8f9cd0ec064c3d 100644 (file)
--- a/wxPython/src/_dc.i
+++ b/wxPython/src/_dc.i
@@ -13,6 +13,7 @@
 // Not a %module
 
 
 // Not a %module
 
 

+

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


@@ -52,9 +53,11 @@ public:
 
 
 
 
 
 

-#if 0  // The old way
+#if 1 // The < 2.4 and > 2.5.1.5 way

 
     bool FloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE);
 
     bool FloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE);

+    %name(FloodFillPoint) bool FloodFill(const wxPoint& pt, const wxColour& col, int style = wxFLOOD_SURFACE);
+

     //bool GetPixel(wxCoord x, wxCoord y, wxColour *col) const;
     %extend {
         wxColour GetPixel(wxCoord x, wxCoord y) {
     //bool GetPixel(wxCoord x, wxCoord y, wxColour *col) const;
     %extend {
         wxColour GetPixel(wxCoord x, wxCoord y) {


@@ -62,31 +65,75 @@ public:
             self->GetPixel(x, y, &col);
             return col;
         }
             self->GetPixel(x, y, &col);
             return col;
         }

+        wxColour GetPixelPoint(const wxPoint& pt) {
+            wxColour col;
+            self->GetPixel(pt, &col);
+            return col;
+        }

     }
     }

+    

     void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
     void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);

+    %name(DrawLinePoint) void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
+

     void CrossHair(wxCoord x, wxCoord y);
     void CrossHair(wxCoord x, wxCoord y);

+    %name(CrossHairPoint) void CrossHair(const wxPoint& pt);
+

     void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc);
     void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc);

+    %name(DrawArcPoint) void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre);
+

     void DrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

+    %name(DrawCheckMarkRect) void DrawCheckMark(const wxRect& rect);
+

     void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea);
     void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea);

+    %name(DrawEllipticArcPointSize) void DrawEllipticArc(const wxPoint& pt, const wxSize& sz, double sa, double ea);
+

     void DrawPoint(wxCoord x, wxCoord y);
     void DrawPoint(wxCoord x, wxCoord y);

+    %name(DrawPointPoint) void DrawPoint(const wxPoint& pt);
+

     void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     %name(DrawRectangleRect)void DrawRectangle(const wxRect& rect);
     void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     %name(DrawRectangleRect)void DrawRectangle(const wxRect& rect);

+    %name(DrawRectanglePointSize) void DrawRectangle(const wxPoint& pt, const wxSize& sz);
+

     void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius);
     void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius);

+    %name(DrawRoundedRectangleRect) void DrawRoundedRectangle(const wxRect& r, double radius);
+    %name(DrawRoundedRectanglePointSize) void DrawRoundedRectangle(const wxPoint& pt, const wxSize& sz, double radius);
+

     void DrawCircle(wxCoord x, wxCoord y, wxCoord radius);
     void DrawCircle(wxCoord x, wxCoord y, wxCoord radius);

+    %name(DrawCirclePoint) void DrawCircle(const wxPoint& pt, wxCoord radius);
+

     void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

+    %name(DrawEllipseRect) void DrawEllipse(const wxRect& rect);
+    %name(DrawEllipsePointSize) void DrawEllipse(const wxPoint& pt, const wxSize& sz);
+

     void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
     void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);

+    %name(DrawIconPoint) void DrawIcon(const wxIcon& icon, const wxPoint& pt);
+

     void DrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask = False);
     void DrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask = False);

+    %name(DrawBitmapPoint) void DrawBitmap(const wxBitmap &bmp, const wxPoint& pt, bool useMask = False);
+

     void DrawText(const wxString& text, wxCoord x, wxCoord y);
     void DrawText(const wxString& text, wxCoord x, wxCoord y);

+    %name(DrawTextPoint) void DrawText(const wxString& text, const wxPoint& pt);
+

     void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
     void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);

+    %name(DrawRotatedTextPoint) void DrawRotatedText(const wxString& text, const wxPoint& pt, double angle);
+

     bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
               wxDC *source, wxCoord xsrc, wxCoord ysrc,
               int rop = wxCOPY, bool useMask = False,
               wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
     bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
               wxDC *source, wxCoord xsrc, wxCoord ysrc,
               int rop = wxCOPY, bool useMask = False,
               wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);

+    %name(BlitPointSize) bool Blit(const wxPoint& destPt, const wxSize& sz,
+                                   wxDC *source, const wxPoint& srcPt,
+                                   int rop = wxCOPY, bool useMask = False,
+                                   const wxPoint& srcPtMask = wxDefaultPosition);
+

 
 

+    void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    %name(SetClippingRegionPointSize) void SetClippingRegion(const wxPoint& pt, const wxSize& sz);
+    %name(SetClippingRegionAsRegion) void SetClippingRegion(const wxRegion& region);
+    %name(SetClippingRect) void SetClippingRegion(const wxRect& rect);

 
 

+#else  // The doomed 2.5.1.5

 
 

-#else  // The new way
-    

     %name(FloodFillXY) bool FloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE);
     bool FloodFill(const wxPoint& pt, const wxColour& col, int style = wxFLOOD_SURFACE);
 
     %name(FloodFillXY) bool FloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE);
     bool FloodFill(const wxPoint& pt, const wxColour& col, int style = wxFLOOD_SURFACE);
 


@@ -104,6 +151,7 @@ public:
             return col;
         }
     }
             return col;
         }
     }

+    

     %name(DrawLineXY) void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
     void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
 
     %name(DrawLineXY) void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
     void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
 


@@ -149,25 +197,37 @@ public:
     %name(DrawRotatedTextXY) void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
     void DrawRotatedText(const wxString& text, const wxPoint& pt, double angle);
 
     %name(DrawRotatedTextXY) void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
     void DrawRotatedText(const wxString& text, const wxPoint& pt, double angle);
 

-    
+

     %name(BlitXY) bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                             wxDC *source, wxCoord xsrc, wxCoord ysrc,
                             int rop = wxCOPY, bool useMask = False,
                             wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
     %name(BlitXY) bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                             wxDC *source, wxCoord xsrc, wxCoord ysrc,
                             int rop = wxCOPY, bool useMask = False,
                             wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);

-    bool Blit(const wxPoint& destPt, const wxSize& sz,  
+    bool Blit(const wxPoint& destPt, const wxSize& sz,

               wxDC *source, const wxPoint& srcPt,
               int rop = wxCOPY, bool useMask = False,
               const wxPoint& srcPtMask = wxDefaultPosition);
 
               wxDC *source, const wxPoint& srcPt,
               int rop = wxCOPY, bool useMask = False,
               const wxPoint& srcPtMask = wxDefaultPosition);
 

-#endif

     
     

+    %name(SetClippingRegionXY)void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    void SetClippingRegion(const wxPoint& pt, const wxSize& sz);
+    %name(SetClippingRect) void SetClippingRegion(const wxRect& rect);
+    %name(SetClippingRegionAsRegion) void SetClippingRegion(const wxRegion& region);
+
+#endif
+

     void DrawLines(int points, wxPoint* points_array, wxCoord xoffset = 0, wxCoord yoffset = 0);
 
     void DrawPolygon(int points, wxPoint* points_array,
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
                      int fillStyle = wxODDEVEN_RULE);
 
     void DrawLines(int points, wxPoint* points_array, wxCoord xoffset = 0, wxCoord yoffset = 0);
 
     void DrawPolygon(int points, wxPoint* points_array,
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
                      int fillStyle = wxODDEVEN_RULE);
 

+    // TODO:  Figure out a good typemap for this...
+    //        Convert the first 3 args from a sequence of sequences?
+//     void DrawPolyPolygon(int n, int count[], wxPoint points[],
+//                           wxCoord xoffset = 0, wxCoord yoffset = 0,
+//                           int fillStyle = wxODDEVEN_RULE);

 
 

+    

     // this version puts both optional bitmap and the text into the given
     // rectangle and aligns is as specified by alignment parameter; it also
     // will emphasize the character with the given index if it is != -1 and
     // this version puts both optional bitmap and the text into the given
     // rectangle and aligns is as specified by alignment parameter; it also
     // will emphasize the character with the given index if it is != -1 and


@@ -192,7 +252,7 @@ public:
     void DrawSpline(int points, wxPoint* points_array);
 
 
     void DrawSpline(int points, wxPoint* points_array);
 
 

-    
+

     // global DC operations
     // --------------------
 
     // global DC operations
     // --------------------
 


@@ -204,7 +264,7 @@ public:
     virtual void StartPage();
     virtual void EndPage();
 
     virtual void StartPage();
     virtual void EndPage();
 

-    
+

     // set objects to use for drawing
     // ------------------------------
 
     // set objects to use for drawing
     // ------------------------------
 


@@ -215,21 +275,13 @@ public:
     virtual void SetBackgroundMode(int mode);
     virtual void SetPalette(const wxPalette& palette);
 
     virtual void SetBackgroundMode(int mode);
     virtual void SetPalette(const wxPalette& palette);
 

-    
-    // clipping region
-    // ---------------
-
-    void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    //void SetClippingRegion(const wxPoint& pt, const wxSize& sz)
-    %name(SetClippingRect) void SetClippingRegion(const wxRect& rect);
-    %name(SetClippingRegionAsRegion) void SetClippingRegion(const wxRegion& region);

 
     virtual void DestroyClippingRegion();
 
     DocDeclA(
         void, GetClippingBox(wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT) const,
         "GetClippingBox() -> (x, y, width, height)");
 
     virtual void DestroyClippingRegion();
 
     DocDeclA(
         void, GetClippingBox(wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT) const,
         "GetClippingBox() -> (x, y, width, height)");

-    
+

     %extend {
         wxRect GetClippingRect() {
             wxRect rect;
     %extend {
         wxRect GetClippingRect() {
             wxRect rect;


@@ -237,9 +289,9 @@ public:
             return rect;
         }
     }
             return rect;
         }
     }

-    

 
 

-    
+
+

     // text extent
     // -----------
 
     // text extent
     // -----------
 


@@ -254,14 +306,14 @@ public:
         "Only works for single line strings.");
     DocDeclAStrName(
         void, GetTextExtent(const wxString& string,
         "Only works for single line strings.");
     DocDeclAStrName(
         void, GetTextExtent(const wxString& string,

-                            wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord* OUTPUT, 
+                            wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord* OUTPUT,

                             wxFont* font = NULL),
         "GetFullTextExtent(wxString string, Font font=None) ->\n   (width, height, descent, externalLeading)",
         "Get the width, height, decent and leading of the text using the current or specified font.\n"
         "Only works for single line strings.",
         GetFullTextExtent);
 
                             wxFont* font = NULL),
         "GetFullTextExtent(wxString string, Font font=None) ->\n   (width, height, descent, externalLeading)",
         "Get the width, height, decent and leading of the text using the current or specified font.\n"
         "Only works for single line strings.",
         GetFullTextExtent);
 

-    
+

     // works for single as well as multi-line strings
     DocDeclAStr(
         void, GetMultiLineTextExtent(const wxString& text,
     // works for single as well as multi-line strings
     DocDeclAStr(
         void, GetMultiLineTextExtent(const wxString& text,


@@ -271,6 +323,15 @@ public:
         "Get the width, height, decent and leading of the text using the current or specified font.\n"
         "Works for single as well as multi-line strings.");
 
         "Get the width, height, decent and leading of the text using the current or specified font.\n"
         "Works for single as well as multi-line strings.");
 

+    
+    %extend {
+        wxArrayInt GetPartialTextExtents(const wxString& text) {
+            wxArrayInt widths;
+            self->GetPartialTextExtents(text, widths);
+            return widths;
+        }
+    }
+    

 
     // size and resolution
     // -------------------
 
     // size and resolution
     // -------------------


@@ -281,7 +342,7 @@ public:
         void, GetSize( int *OUTPUT, int *OUTPUT ),
         "GetSizeTuple() -> (width, height)",
         GetSizeTuple);
         void, GetSize( int *OUTPUT, int *OUTPUT ),
         "GetSizeTuple() -> (width, height)",
         GetSizeTuple);

-    
+

 
     DocStr(GetSizeMM, "Get the DC size in milimeters.");
     wxSize GetSizeMM() const;
 
     DocStr(GetSizeMM, "Get the DC size in milimeters.");
     wxSize GetSizeMM() const;


@@ -289,8 +350,8 @@ public:
         void, GetSizeMM( int *OUTPUT, int *OUTPUT ) const,
         "GetSizeMMTuple() -> (width, height)",
         GetSizeMMTuple);
         void, GetSizeMM( int *OUTPUT, int *OUTPUT ) const,
         "GetSizeMMTuple() -> (width, height)",
         GetSizeMMTuple);

-    
-    
+
+

 
     // coordinates conversions
     // -----------------------
 
     // coordinates conversions
     // -----------------------


@@ -320,7 +381,7 @@ public:
 
     virtual bool Ok() const;
 
 
     virtual bool Ok() const;
 

-    
+

 
     int GetBackgroundMode() const;
     const wxBrush&  GetBackground() const;
 
     int GetBackgroundMode() const;
     const wxBrush&  GetBackground() const;


@@ -336,14 +397,14 @@ public:
     int GetMapMode() const;
     virtual void SetMapMode(int mode);
 
     int GetMapMode() const;
     virtual void SetMapMode(int mode);
 

-    
+

     DocDeclA(
         virtual void, GetUserScale(double *OUTPUT, double *OUTPUT) const,
         "GetUserScale() -> (xScale, yScale)");
     DocDeclA(
         virtual void, GetUserScale(double *OUTPUT, double *OUTPUT) const,
         "GetUserScale() -> (xScale, yScale)");

-    
+

     virtual void SetUserScale(double x, double y);
 
     virtual void SetUserScale(double x, double y);
 

-    
+

     DocDeclA(
         virtual void, GetLogicalScale(double *OUTPUT, double *OUTPUT),
         "GetLogicalScale() -> (xScale, yScale)");
     DocDeclA(
         virtual void, GetLogicalScale(double *OUTPUT, double *OUTPUT),
         "GetLogicalScale() -> (xScale, yScale)");


@@ -356,8 +417,13 @@ public:
         void, GetLogicalOrigin(wxCoord *OUTPUT, wxCoord *OUTPUT) const,
         "GetLogicalOriginTuple() -> (x,y)",
         GetLogicalOriginTuple);
         void, GetLogicalOrigin(wxCoord *OUTPUT, wxCoord *OUTPUT) const,
         "GetLogicalOriginTuple() -> (x,y)",
         GetLogicalOriginTuple);

-        
+

     virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y);

+    %extend {
+        void SetLogicalOriginPoint(const wxPoint& point) {
+            self->SetLogicalOrigin(point.x, point.y);
+        }
+    }

 
     
     wxPoint GetDeviceOrigin() const;
 
     
     wxPoint GetDeviceOrigin() const;


@@ -365,8 +431,13 @@ public:
         void, GetDeviceOrigin(wxCoord *OUTPUT, wxCoord *OUTPUT) const,
         "GetDeviceOriginTuple() -> (x,y)",
         GetDeviceOriginTuple);
         void, GetDeviceOrigin(wxCoord *OUTPUT, wxCoord *OUTPUT) const,
         "GetDeviceOriginTuple() -> (x,y)",
         GetDeviceOriginTuple);

-    
+

     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);

+    %extend {
+        void SetDeviceOriginPoint(const wxPoint& point) {
+            self->SetDeviceOrigin(point.x, point.y);
+        }
+    }

 
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
 
 
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
 


@@ -375,12 +446,18 @@ public:
 
     virtual void SetOptimization(bool opt);
     virtual bool GetOptimization();
 
     virtual void SetOptimization(bool opt);
     virtual bool GetOptimization();

-    
+

 
     // bounding box
     // ------------
 
     virtual void CalcBoundingBox(wxCoord x, wxCoord y);
 
     // bounding box
     // ------------
 
     virtual void CalcBoundingBox(wxCoord x, wxCoord y);

+    %extend {
+        void CalcBoundingBoxPoint(const wxPoint& point) {
+            self->CalcBoundingBox(point.x, point.y);
+        }
+    }
+

     void ResetBoundingBox();
 
     // Get the final bounding box of the PostScript or Metafile picture.
     void ResetBoundingBox();
 
     // Get the final bounding box of the PostScript or Metafile picture.


@@ -395,7 +472,7 @@ public:
     %extend {
         void GetBoundingBox(int* OUTPUT, int* OUTPUT, int* OUTPUT, int* OUTPUT);
         // See below for implementation
     %extend {
         void GetBoundingBox(int* OUTPUT, int* OUTPUT, int* OUTPUT, int* OUTPUT);
         // See below for implementation

-    }    
+    }

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


@@ -486,8 +563,8 @@ public:
 
 
     def DrawPolygonList(self, polygons, pens=None, brushes=None):
 
 
     def DrawPolygonList(self, polygons, pens=None, brushes=None):

-        ## Note: This does not currently support fill style or offset
-        ## you can always use the non-List version if need be.
+        %## Note: This does not currently support fill style or offset
+        %## you can always use the non-List version if need be.

         if pens is None:
            pens = []
         elif isinstance(pens, wx.Pen):
         if pens is None:
            pens = []
         elif isinstance(pens, wx.Pen):


@@ -504,22 +581,22 @@ public:
 
 
     def DrawTextList(self, textList, coords, foregrounds = None, backgrounds = None, fonts = None):
 
 
     def DrawTextList(self, textList, coords, foregrounds = None, backgrounds = None, fonts = None):

-        ## NOTE: this does not currently support changing the font
-        ##       Make sure you set Background mode to wxSolid (DC.SetBackgroundMode)
-        ##       If you want backgounds to do anything.
+        %## NOTE: this does not currently support changing the font
+        %##       Make sure you set Background mode to wxSolid (DC.SetBackgroundMode)
+        %##       If you want backgounds to do anything.

         if type(textList) == type(''):
            textList = [textList]
         elif len(textList) != len(coords):
            raise ValueError('textlist and coords must have same length')
         if foregrounds is None:
            foregrounds = []
         if type(textList) == type(''):
            textList = [textList]
         elif len(textList) != len(coords):
            raise ValueError('textlist and coords must have same length')
         if foregrounds is None:
            foregrounds = []

-        elif isinstance(foregrounds, wxColour):
+        elif isinstance(foregrounds, wx.Colour):

            foregrounds = [foregrounds]
         elif len(foregrounds) != len(coords):
            raise ValueError('foregrounds and coords must have same length')
         if backgrounds is None:
            backgrounds = []
            foregrounds = [foregrounds]
         elif len(foregrounds) != len(coords):
            raise ValueError('foregrounds and coords must have same length')
         if backgrounds is None:
            backgrounds = []

-        elif isinstance(backgrounds, wxColour):
+        elif isinstance(backgrounds, wx.Colour):

            backgrounds = [backgrounds]
         elif len(backgrounds) != len(coords):
            raise ValueError('backgrounds and coords must have same length')
            backgrounds = [backgrounds]
         elif len(backgrounds) != len(coords):
            raise ValueError('backgrounds and coords must have same length')


@@ -547,42 +624,66 @@ class wxMemoryDC : public wxDC {
 public:
     wxMemoryDC();
     %name(MemoryDCFromDC) wxMemoryDC(wxDC* oldDC);
 public:
     wxMemoryDC();
     %name(MemoryDCFromDC) wxMemoryDC(wxDC* oldDC);

-        
+

     void SelectObject(const wxBitmap& bitmap);
 };
 
 //---------------------------------------------------------------------------
 %newgroup
 
     void SelectObject(const wxBitmap& bitmap);
 };
 
 //---------------------------------------------------------------------------
 %newgroup
 

+
+%{
+#include <wx/dcbuffer.h>
+%}
+
+

 class wxBufferedDC : public wxMemoryDC
 {
 public:
 class wxBufferedDC : public wxMemoryDC
 {
 public:

-    %addtofunc wxBufferedDC( wxDC *dc, const wxBitmap &buffer ) 
+    %pythonAppend wxBufferedDC

         "self._dc = args[0] # save a ref so the other dc will not be deleted before self";
         "self._dc = args[0] # save a ref so the other dc will not be deleted before self";

-    %addtofunc wxBufferedDC( wxDC *dc, const wxSize &area ) 
-        "val._dc = args[0] # save a ref so the other dc will not be deleted before self";

 
 

+    %nokwargs wxBufferedDC;
+    

     // Construct a wxBufferedDC using a user supplied buffer.
     wxBufferedDC( wxDC *dc, const wxBitmap &buffer );
 
     // Construct a wxBufferedDC using a user supplied buffer.
     wxBufferedDC( wxDC *dc, const wxBitmap &buffer );
 

-        // Construct a wxBufferedDC with an internal buffer of 'area'
-        // (where area is usually something like the size of the window
-        // being buffered)
+    // Construct a wxBufferedDC with an internal buffer of 'area'
+    // (where area is usually something like the size of the window
+    // being buffered)
+    wxBufferedDC( wxDC *dc, const wxSize &area );
+
+    
+    // TODO: Keep this one too?
+    %pythonAppend wxBufferedDC( wxDC *dc, const wxSize &area )
+        "val._dc = args[0] # save a ref so the other dc will not be deleted before self";

     %name(BufferedDCInternalBuffer) wxBufferedDC( wxDC *dc, const wxSize &area );
 
     %name(BufferedDCInternalBuffer) wxBufferedDC( wxDC *dc, const wxSize &area );
 

-        // Blits the buffer to the dc, and detaches the dc from
-        // the buffer.  Usually called in the dtor or by the dtor
-        // of derived classes if the BufferedDC must blit before
-        // the derived class (which may own the dc it's blitting
-        // to) is destroyed.
+    
+    // The buffer is blit to the real DC when the BufferedDC is destroyed.
+    ~wxBufferedDC();
+
+    
+    // Blits the buffer to the dc, and detaches the dc from
+    // the buffer.  Usually called in the dtor or by the dtor
+    // of derived classes if the BufferedDC must blit before
+    // the derived class (which may own the dc it's blitting
+    // to) is destroyed.

     void UnMask();
 };
 
 
     void UnMask();
 };
 
 

+
+
+// Creates a double buffered wxPaintDC, optionally allowing the
+// user to specify their own buffer to use.

 class wxBufferedPaintDC : public wxBufferedDC
 {
 public:
 class wxBufferedPaintDC : public wxBufferedDC
 {
 public:

+
+    // If no bitmap is supplied by the user, a temporary one will be created.

     wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer = wxNullBitmap );
     wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer = wxNullBitmap );

+

 };
 
 
 };
 
 


@@ -662,7 +763,7 @@ public:
 %newgroup
 
 
 %newgroup
 
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)

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


@@ -680,8 +781,10 @@ public:
     int GetWidth();
     int GetHeight();
 
     int GetWidth();
     int GetHeight();
 

+#ifdef __WXMSW__

     const wxString& GetFileName() const;
     const wxString& GetFileName() const;

-
+#endif
+    

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


@@ -705,13 +808,13 @@ public:
 class wxMetaFile : public wxObject {
 public:
     wxMetaFile(const wxString&)
 class wxMetaFile : public wxObject {
 public:
     wxMetaFile(const wxString&)

-        { PyErr_SetNone(PyExc_NotImplementedError); }
+        { wxPyRaiseNotImplemented(); }

 };
 
 class wxMetaFileDC : public wxClientDC {
 public:
     wxMetaFileDC(const wxString&, int, int, const wxString&)
 };
 
 class wxMetaFileDC : public wxClientDC {
 public:
     wxMetaFileDC(const wxString&, int, int, const wxString&)

-        { PyErr_SetNone(PyExc_NotImplementedError); }
+        { wxPyRaiseNotImplemented(); }

 };
 
 %}
 };
 
 %}


@@ -751,13 +854,13 @@ public:
 class  wxPrinterDC : public wxClientDC {
 public:
     wxPrinterDC(const wxPrintData&)
 class  wxPrinterDC : public wxClientDC {
 public:
     wxPrinterDC(const wxPrintData&)

-        { PyErr_SetNone(PyExc_NotImplementedError); }
-    
+        { wxPyRaiseNotImplemented(); }
+

 //     wxPrinterDC(const wxString&, const wxString&, const wxString&, bool, int)
 //     wxPrinterDC(const wxString&, const wxString&, const wxString&, bool, int)

-//         { PyErr_SetNone(PyExc_NotImplementedError); }
+//         { wxPyRaiseNotImplemented(); }

 };
 %}
 };
 %}

- 
+

 class  wxPrinterDC : public wxDC {
 public:
     wxPrinterDC(const wxPrintData& printData);
 class  wxPrinterDC : public wxDC {
 public:
     wxPrinterDC(const wxPrintData& printData);


@@ -770,3 +873,51 @@ public:
 #endif
 
 //---------------------------------------------------------------------------
 #endif
 
 //---------------------------------------------------------------------------

+//---------------------------------------------------------------------------
+
+// Now define some Python classes that rename the Draw methods to be
+// compatible with the DC Draw methods in 2.4.  See also wxPython/_wx.py.
+
+
+#if 0
+
+%define MAKE_OLD_DC_CLASS(classname)
+    %pythoncode {
+    class classname##_old(classname):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = classname.FloodFillXY
+        GetPixel = classname.GetPixelXY
+        DrawLine = classname.DrawLineXY
+        CrossHair = classname.CrossHairXY
+        DrawArc = classname.DrawArcXY
+        DrawCheckMark = classname.DrawCheckMarkXY
+        DrawEllipticArc = classname.DrawEllipticArcXY
+        DrawPoint = classname.DrawPointXY
+        DrawRectangle = classname.DrawRectangleXY
+        DrawRoundedRectangle = classname.DrawRoundedRectangleXY
+        DrawCircle = classname.DrawCircleXY
+        DrawEllipse = classname.DrawEllipseXY
+        DrawIcon = classname.DrawIconXY
+        DrawBitmap = classname.DrawBitmapXY
+        DrawText = classname.DrawTextXY
+        DrawRotatedText = classname.DrawRotatedTextXY
+        Blit = classname.BlitXY
+    }
+%enddef
+
+MAKE_OLD_DC_CLASS(DC);
+MAKE_OLD_DC_CLASS(MemoryDC);
+MAKE_OLD_DC_CLASS(BufferedDC);
+MAKE_OLD_DC_CLASS(BufferedPaintDC);
+MAKE_OLD_DC_CLASS(ScreenDC);
+MAKE_OLD_DC_CLASS(ClientDC);
+MAKE_OLD_DC_CLASS(PaintDC);
+MAKE_OLD_DC_CLASS(WindowDC);
+MAKE_OLD_DC_CLASS(MirrorDC);
+MAKE_OLD_DC_CLASS(PostScriptDC);
+MAKE_OLD_DC_CLASS(MetaFileDC);
+MAKE_OLD_DC_CLASS(PrinterDC);
+
+#endif
+
+//---------------------------------------------------------------------------