X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dce2bd223c2370f001f9ca93e04cbd437ff3f988..05e00ac5ef410707da86d98786cbb268100a7337:/wxPython/src/_dc.i diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i index d48f246665..0032639fe2 100644 --- a/wxPython/src/_dc.i +++ b/wxPython/src/_dc.i @@ -53,7 +53,7 @@ public: -#if defined(wxUSE_DC_OLD_METHODS) +#if 1 // The < 2.4 and > 2.5.1.5 way 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); @@ -85,25 +85,25 @@ public: %name(DrawCheckMarkRect) void DrawCheckMark(const wxRect& rect); void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea); - %name(DrawEllipticArcPtSz) void DrawEllipticArc(const wxPoint& pt, const wxSize& sz, double sa, double ea); + %name(DrawEllipticArcPointSize) void DrawEllipticArc(const wxPoint& pt, const wxSize& sz, double sa, double ea); 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); - %name(DrawRectanglePtSz) void DrawRectangle(const wxPoint& pt, const wxSize& sz); + %name(DrawRectanglePointSize) void DrawRectangle(const wxPoint& pt, const wxSize& sz); void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius); %name(DrawRoundedRectangleRect) void DrawRoundedRectangle(const wxRect& r, double radius); - %name(DrawRoundedRectanglePtSz) void DrawRoundedRectangle(const wxPoint& pt, const wxSize& sz, double radius); + %name(DrawRoundedRectanglePointSize) void DrawRoundedRectangle(const wxPoint& pt, const wxSize& sz, double 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); %name(DrawEllipseRect) void DrawEllipse(const wxRect& rect); - %name(DrawEllipsePtSz) void DrawEllipse(const wxPoint& pt, const wxSize& sz); + %name(DrawEllipsePointSize) void DrawEllipse(const wxPoint& pt, const wxSize& sz); void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); %name(DrawIconPoint) void DrawIcon(const wxIcon& icon, const wxPoint& pt); @@ -121,14 +121,18 @@ public: wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = False, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); - %name(BlitPtSz) bool Blit(const wxPoint& destPt, const wxSize& sz, - wxDC *source, const wxPoint& srcPt, - int rop = wxCOPY, bool useMask = False, - const wxPoint& srcPtMask = wxDefaultPosition); + %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 new way +#else // The doomed 2.5.1.5 %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); @@ -203,6 +207,12 @@ public: int rop = wxCOPY, bool useMask = False, const wxPoint& srcPtMask = wxDefaultPosition); + + %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); @@ -266,14 +276,6 @@ public: virtual void SetPalette(const wxPalette& palette); - // clipping region - // --------------- - - %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); - virtual void DestroyClippingRegion(); DocDeclA( @@ -300,15 +302,16 @@ public: DocDeclAStr( void, GetTextExtent(const wxString& string, wxCoord *OUTPUT, wxCoord *OUTPUT), "GetTextExtent(wxString string) -> (width, height)", - "Get the width and height of the text using the current font.\n" - "Only works for single line strings."); + "Get the width and height of the text using the current font. Only +works for single line strings.", ""); + DocDeclAStrName( void, GetTextExtent(const wxString& string, 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.", + "Get the width, height, decent and leading of the text using the +current or specified font. Only works for single line strings.", "", GetFullTextExtent); @@ -318,8 +321,9 @@ public: wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, wxFont *font = NULL), "GetMultiLineTextExtent(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" - "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. Works for single as well as multi-line +strings.", ""); %extend { @@ -334,7 +338,7 @@ public: // size and resolution // ------------------- - DocStr(GetSize, "Get the DC size in device units."); + DocStr(GetSize, "Get the DC size in device units.", ""); wxSize GetSize(); DocDeclAName( void, GetSize( int *OUTPUT, int *OUTPUT ), @@ -342,7 +346,7 @@ public: GetSizeTuple); - DocStr(GetSizeMM, "Get the DC size in milimeters."); + DocStr(GetSizeMM, "Get the DC size in milimeters.", ""); wxSize GetSizeMM() const; DocDeclAName( void, GetSizeMM( int *OUTPUT, int *OUTPUT ) const, @@ -417,8 +421,13 @@ public: GetLogicalOriginTuple); virtual void SetLogicalOrigin(wxCoord x, wxCoord y); + %extend { + void SetLogicalOriginPoint(const wxPoint& point) { + self->SetLogicalOrigin(point.x, point.y); + } + } - + wxPoint GetDeviceOrigin() const; DocDeclAName( void, GetDeviceOrigin(wxCoord *OUTPUT, wxCoord *OUTPUT) const, @@ -426,6 +435,11 @@ public: GetDeviceOriginTuple); 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); @@ -440,6 +454,12 @@ public: // ------------ 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. @@ -458,6 +478,10 @@ public: %pythoncode { def __nonzero__(self): return self.Ok() }; +#ifdef __WXMSW__ + long GetHDC(); +#endif + %extend { // See drawlist.cpp for impplementaion of these... PyObject* _DrawPointList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes) @@ -602,6 +626,8 @@ static void wxDC_GetBoundingBox(wxDC* dc, int* x1, int* y1, int* x2, int* y2) { //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxMemoryDC); + class wxMemoryDC : public wxDC { public: wxMemoryDC(); @@ -619,6 +645,8 @@ public: %} +MustHaveApp(wxBufferedDC); + class wxBufferedDC : public wxMemoryDC { public: @@ -656,6 +684,7 @@ public: +MustHaveApp(wxBufferedPaintDC); // Creates a double buffered wxPaintDC, optionally allowing the // user to specify their own buffer to use. @@ -672,6 +701,8 @@ public: //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxScreenDC); + class wxScreenDC : public wxDC { public: wxScreenDC(); @@ -684,6 +715,8 @@ public: //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxClientDC); + class wxClientDC : public wxDC { public: wxClientDC(wxWindow* win); @@ -692,6 +725,8 @@ public: //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxPaintDC); + class wxPaintDC : public wxDC { public: wxPaintDC(wxWindow* win); @@ -700,6 +735,8 @@ public: //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxWindowDC); + class wxWindowDC : public wxDC { public: wxWindowDC(wxWindow* win); @@ -708,6 +745,8 @@ public: //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxMirrorDC); + class wxMirrorDC : public wxDC { public: @@ -727,6 +766,8 @@ public: #include %} +MustHaveApp(wxPostScriptDC); + class wxPostScriptDC : public wxDC { public: wxPostScriptDC(const wxPrintData& printData); @@ -745,6 +786,10 @@ public: %newgroup +MustHaveApp(wxMetaFile); +MustHaveApp(wxMetaFileDC); + + #if defined(__WXMSW__) || defined(__WXMAC__) %{ @@ -819,6 +864,8 @@ public: //--------------------------------------------------------------------------- +MustHaveApp(wxPrinterDC); + #if defined(__WXMSW__) || defined(__WXMAC__) class wxPrinterDC : public wxDC { @@ -861,6 +908,8 @@ public: // 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): @@ -898,5 +947,6 @@ MAKE_OLD_DC_CLASS(PostScriptDC); MAKE_OLD_DC_CLASS(MetaFileDC); MAKE_OLD_DC_CLASS(PrinterDC); +#endif //---------------------------------------------------------------------------