X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f514ab45900ae08326c70cf7d360377bbf14ea4..c33c11fa1d2a0c4999e04386e04ac96cd350e853:/wxPython/src/_dc.i?ds=sidebyside diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i index 9dbb9a3dbc..47295bc265 100644 --- a/wxPython/src/_dc.i +++ b/wxPython/src/_dc.i @@ -1299,65 +1299,6 @@ public: -//--------------------------------------------------------------------------- -%newgroup - -MustHaveApp(wxMemoryDC); - -DocStr(wxMemoryDC, -"A memory device context provides a means to draw graphics onto a -bitmap. A bitmap must be selected into the new memory DC before it may -be used for anything. Typical usage is as follows:: - - dc = wx.MemoryDC() - dc.SelectObject(bitmap) - # draw on the dc using any of the Draw methods - dc.SelectObject(wx.NullBitmap) - # the bitmap now contains wahtever was drawn upon it - -Note that the memory DC *must* be deleted (or the bitmap selected out -of it) before a bitmap can be reselected into another memory DC. -", ""); - -class wxMemoryDC : public wxDC { -public: - DocCtorStr( - wxMemoryDC(wxBitmap& bitmap = wxNullBitmap), - "Constructs a new memory device context. - -Use the Ok member to test whether the constructor was successful in -creating a usable device context. If a bitmap is not given to this -constructor then don't forget to select a bitmap into the DC before -drawing on it.", " - -:see: `MemoryDCFromDC`"); - - DocCtorStrName( - wxMemoryDC(wxDC* oldDC), - "Creates a DC that is compatible with the oldDC.", "", - MemoryDCFromDC); - - - DocDeclStr( - void , SelectObject(wxBitmap& bitmap), - "Selects the bitmap into the device context, to use as the memory -bitmap. Selecting the bitmap into a memory DC allows you to draw into -the DC, and therefore the bitmap, and also to use Blit to copy the -bitmap to a window. - -If the argument is wx.NullBitmap (or some other uninitialised -`wx.Bitmap`) the current bitmap is selected out of the device context, -and the original bitmap restored, allowing the current bitmap to be -destroyed safely.", ""); - - - DocDeclStr( - void , SelectObjectAsSource(const wxBitmap& bmp), - "", ""); - - -}; - //--------------------------------------------------------------------------- %newgroup @@ -1476,6 +1417,66 @@ public: +//--------------------------------------------------------------------------- +%newgroup + +MustHaveApp(wxMemoryDC); + +DocStr(wxMemoryDC, +"A memory device context provides a means to draw graphics onto a +bitmap. A bitmap must be selected into the new memory DC before it may +be used for anything. Typical usage is as follows:: + + dc = wx.MemoryDC() + dc.SelectObject(bitmap) + # draw on the dc using any of the Draw methods + dc.SelectObject(wx.NullBitmap) + # the bitmap now contains wahtever was drawn upon it + +Note that the memory DC *must* be deleted (or the bitmap selected out +of it) before a bitmap can be reselected into another memory DC. +", ""); + +class wxMemoryDC : public wxWindowDC { +public: + DocCtorStr( + wxMemoryDC(wxBitmap& bitmap = wxNullBitmap), + "Constructs a new memory device context. + +Use the Ok member to test whether the constructor was successful in +creating a usable device context. If a bitmap is not given to this +constructor then don't forget to select a bitmap into the DC before +drawing on it.", " + +:see: `MemoryDCFromDC`"); + + DocCtorStrName( + wxMemoryDC(wxDC* oldDC), + "Creates a DC that is compatible with the oldDC.", "", + MemoryDCFromDC); + + + DocDeclStr( + void , SelectObject(wxBitmap& bitmap), + "Selects the bitmap into the device context, to use as the memory +bitmap. Selecting the bitmap into a memory DC allows you to draw into +the DC, and therefore the bitmap, and also to use Blit to copy the +bitmap to a window. + +If the argument is wx.NullBitmap (or some other uninitialised +`wx.Bitmap`) the current bitmap is selected out of the device context, +and the original bitmap restored, allowing the current bitmap to be +destroyed safely.", ""); + + + DocDeclStr( + void , SelectObjectAsSource(const wxBitmap& bmp), + "", ""); + + +}; + + //--------------------------------------------------------------------------- %newgroup @@ -1520,10 +1521,6 @@ that already do it automatically. class wxBufferedDC : public wxMemoryDC { public: - %pythonAppend wxBufferedDC - "self.__dc = args[0] # save a ref so the other dc will not be deleted before self"; - - %nokwargs wxBufferedDC; DocStr( wxBufferedDC, @@ -1549,10 +1546,18 @@ public: intended to cover the entire virtual size of a `wx.ScrolledWindow` or if it only covers the client area. Acceptable values are ``wx.BUFFER_VIRTUAL_AREA`` and ``wx.BUFFER_CLIENT_AREA``. - "); + + %nokwargs wxBufferedDC; + %pythonAppend wxBufferedDC +"# save a ref so the other dc will not be deleted before self + self.__dc = args[0] + # also save a ref to the bitmap + if len(args) > 1: self.__bmp = args[1] +"; + wxBufferedDC( wxDC* dc, - const wxBitmap& buffer=wxNullBitmap, + wxBitmap& buffer=wxNullBitmap, int style = wxBUFFER_CLIENT_AREA ); wxBufferedDC( wxDC* dc, const wxSize& area, @@ -1574,7 +1579,10 @@ associated with this object, if any.", ""); "Blits the buffer to the dc, and detaches the dc from the buffer (so it can be effectively used once only). This is usually only called in the destructor.", ""); - + + // Set and get the style + void SetStyle(int style); + int GetStyle() const; }; @@ -1606,9 +1614,11 @@ class wxBufferedPaintDC : public wxBufferedDC { public: + %pythonAppend wxBufferedPaintDC "if len(args) > 1: self.__bmp = args[1]"; + DocCtorStr( wxBufferedPaintDC( wxWindow *window, - const wxBitmap &buffer = wxNullBitmap, + wxBitmap &buffer = wxNullBitmap, int style = wxBUFFER_CLIENT_AREA), "Create a buffered paint DC. As with `wx.BufferedDC`, you may either provide the bitmap to be used for buffering or let this object create