X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef22e3d35e23237cb616e420951f5da8c46c0200..4263de1e0586d20cb49d0dde23f0d227c5ef25cb:/wxPython/src/_dc.i?ds=sidebyside diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i index b21b3dffff..e61213b451 100644 --- a/wxPython/src/_dc.i +++ b/wxPython/src/_dc.i @@ -168,12 +168,13 @@ public: 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) + // 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 @@ -572,12 +573,14 @@ public: %{ //-=-=-=-=-=-=-=-=-=-=- -#if 0 + +#if 1 +// Use the standard wxBufferedDC #include -#else +#else -// Temporarily put a set of classes here similar to the old buffered DC +// Or, temporarily put a set of classes here similar to the old buffered DC // classes until the real ones can be fixed to work "correctly" again. class wxBufferedDC : public wxMemoryDC @@ -787,7 +790,7 @@ public: %newgroup -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXMAC__) %{ #include @@ -805,8 +808,10 @@ public: int GetWidth(); int GetHeight(); +#ifdef __WXMSW__ const wxString& GetFileName() const; - +#endif + %pythoncode { def __nonzero__(self): return self.Ok() } };