X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7403ad2d154a8e2974fdc5fc215258f3a75cdde..015fd9ef4833ec3d8b0043a1c7e448c8be4f734a:/wxPython/src/_dc.i diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i index 95dd16cf47..0032639fe2 100644 --- a/wxPython/src/_dc.i +++ b/wxPython/src/_dc.i @@ -302,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); @@ -320,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 { @@ -336,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 ), @@ -344,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, @@ -476,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) @@ -620,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(); @@ -637,6 +645,8 @@ public: %} +MustHaveApp(wxBufferedDC); + class wxBufferedDC : public wxMemoryDC { public: @@ -674,6 +684,7 @@ public: +MustHaveApp(wxBufferedPaintDC); // Creates a double buffered wxPaintDC, optionally allowing the // user to specify their own buffer to use. @@ -690,6 +701,8 @@ public: //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxScreenDC); + class wxScreenDC : public wxDC { public: wxScreenDC(); @@ -702,6 +715,8 @@ public: //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxClientDC); + class wxClientDC : public wxDC { public: wxClientDC(wxWindow* win); @@ -710,6 +725,8 @@ public: //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxPaintDC); + class wxPaintDC : public wxDC { public: wxPaintDC(wxWindow* win); @@ -718,6 +735,8 @@ public: //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxWindowDC); + class wxWindowDC : public wxDC { public: wxWindowDC(wxWindow* win); @@ -726,6 +745,8 @@ public: //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxMirrorDC); + class wxMirrorDC : public wxDC { public: @@ -745,6 +766,8 @@ public: #include %} +MustHaveApp(wxPostScriptDC); + class wxPostScriptDC : public wxDC { public: wxPostScriptDC(const wxPrintData& printData); @@ -763,6 +786,10 @@ public: %newgroup +MustHaveApp(wxMetaFile); +MustHaveApp(wxMetaFileDC); + + #if defined(__WXMSW__) || defined(__WXMAC__) %{ @@ -837,6 +864,8 @@ public: //--------------------------------------------------------------------------- +MustHaveApp(wxPrinterDC); + #if defined(__WXMSW__) || defined(__WXMAC__) class wxPrinterDC : public wxDC {