reSWIGged

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

diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index def4b15852f0c97b73e63bd4db1e087210494436..edfe3a45e802ca7abdecf8e5457e3d90f963a244 100644 (file)
--- a/wxPython/src/_dc.i
+++ b/wxPython/src/_dc.i
@@ -168,6 +168,11 @@ public:
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
                      int fillStyle = wxODDEVEN_RULE);
 
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
                      int fillStyle = wxODDEVEN_RULE);
 

+    // TODO:  Figure out what the start parameter means and devise a
+    // good typemap for this    
+    //void DrawPolyPolygon(int n, int start[], 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
 
     // this version puts both optional bitmap and the text into the given
     // rectangle and aligns is as specified by alignment parameter; it also


@@ -272,6 +277,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
     // -------------------


@@ -555,27 +569,45 @@ public:
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

+enum
+{
+    // this is more efficient and hence default
+    wxBUFFER_DC_OVERWRITE_BG = 0,
+
+    // preserve the old background: more time consuming
+    wxBUFFER_DC_PRESERVE_BG = 1,
+
+    // flags used by default
+    wxBUFFER_DC_DEFAULT = wxBUFFER_DC_OVERWRITE_BG
+};
+
+

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

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

         "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 )
+    %pythonAppend wxBufferedDC( wxDC *dc, const wxSize &area, int flags = wxBUFFER_DC_DEFAULT )

         "val._dc = args[0] # save a ref so the other dc will not be deleted before self";
 
         "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)
-    %name(BufferedDCInternalBuffer) wxBufferedDC( wxDC *dc, const wxSize &area );
+    // 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, int flags = wxBUFFER_DC_DEFAULT );
+
+    // TODO: Keep this one too?
+    %name(BufferedDCInternalBuffer) wxBufferedDC( wxDC *dc, const wxSize &area, int flags = wxBUFFER_DC_DEFAULT );

 
 

-        // 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.
+    // 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();
 };
 


@@ -583,7 +615,14 @@ public:
 class wxBufferedPaintDC : public wxBufferedDC
 {
 public:
 class wxBufferedPaintDC : public wxBufferedDC
 {
 public:

-    wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer = wxNullBitmap );
+
+    %nokwargs wxBufferedPaintDC;
+    
+    wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer );
+
+    // this ctor creates a bitmap of the size of the window for buffering
+    wxBufferedPaintDC(wxWindow *window, int flags = wxBUFFER_DC_DEFAULT);
+

 };
 
 
 };