Merge recent changes from 2.8 branch.
Make updates for recent changes on CVS HEAD. Remove or workaround deprecated items. Fix compile errors. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -319,7 +319,7 @@ the ``type`` parameter.", "");
|
||||
%extend {
|
||||
DocStr(CopyFromBuffer,
|
||||
"Copy data from a RGB buffer object to replace the bitmap pixel data.
|
||||
See `wxBitmapFromBuffer` for more details.", "");
|
||||
See `wx.BitmapFromBuffer` for more details.", "");
|
||||
void CopyFromBuffer(buffer data, int DATASIZE)
|
||||
{
|
||||
int height=self->GetHeight();
|
||||
@@ -352,7 +352,7 @@ See `wxBitmapFromBuffer` for more details.", "");
|
||||
|
||||
DocStr(CopyFromBufferRGBA,
|
||||
"Copy data from a RGBA buffer object to replace the bitmap pixel data.
|
||||
See `wxBitmapFromBufferRGBA` for more details.", "");
|
||||
See `wx.BitmapFromBufferRGBA` for more details.", "");
|
||||
void CopyFromBufferRGBA(buffer data, int DATASIZE)
|
||||
{
|
||||
int height=self->GetHeight();
|
||||
|
||||
Reference in New Issue
Block a user