X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55ccdb93e4ae4b606a4068cb37492c1ec3ed77a6..457e5a40e7d49f761887208f1874cb31068a31f1:/src/mgl/brush.cpp diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp index d97544d123..b151db8a0a 100644 --- a/src/mgl/brush.cpp +++ b/src/mgl/brush.cpp @@ -16,7 +16,7 @@ #include "wx/brush.h" #include "wx/mgl/private.h" -#include "wx/mgl/dcmemory.h" +#include "wx/dcmemory.h" // --------------------------------------------------------------------------- @@ -35,7 +35,7 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap, if ( pix != NULL ) { - mem.SelectObject(bitmap); + mem.SelectObjectAsSource(bitmap); dc = mem.GetMGLDC(); wxCurrentDCSwitcher curDC(dc); dc->beginPixel(); @@ -50,7 +50,7 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap, if ( mask && bitmap.GetMask() ) { - mem.SelectObject(bitmap.GetMask()->GetBitmap()); + mem.SelectObjectAsSource(bitmap.GetMask()->GetBitmap()); dc = mem.GetMGLDC(); wxCurrentDCSwitcher curDC(dc); dc->beginPixel(); @@ -79,7 +79,7 @@ public: bool operator == (const wxBrushRefData& data) const { return (m_style == data.m_style && - m_stipple.IsRefTo(&data.m_stipple) && + m_stipple.IsSameAs(data.m_stipple) && m_colour == data.m_colour); }