use wxDC::SetDeviceClippingRegion() instead of deprecated SetClippingRegion()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -58,14 +58,14 @@ bool wxDoSetShape( Display* xdisplay,
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// wxRegion::ConvertToBitmap gives us the wrong Pixmap:
|
// wxRegion::ConvertToBitmap gives us the wrong Pixmap:
|
||||||
// polichrome and with black and whire reversed
|
// polychrome and with black and white reversed
|
||||||
wxRect box = region.GetBox();
|
wxRect box = region.GetBox();
|
||||||
wxBitmap bmp(box.GetRight(), box.GetBottom(), 1);
|
wxBitmap bmp(box.GetRight(), box.GetBottom(), 1);
|
||||||
wxMemoryDC dc;
|
wxMemoryDC dc;
|
||||||
dc.SelectObject(bmp);
|
dc.SelectObject(bmp);
|
||||||
dc.SetBackground(*wxBLACK_BRUSH);
|
dc.SetBackground(*wxBLACK_BRUSH);
|
||||||
dc.Clear();
|
dc.Clear();
|
||||||
dc.SetClippingRegion(region);
|
dc.SetDeviceClippingRegion(region);
|
||||||
dc.SetBackground(*wxWHITE_BRUSH);
|
dc.SetBackground(*wxWHITE_BRUSH);
|
||||||
dc.Clear();
|
dc.Clear();
|
||||||
dc.SelectObject(wxNullBitmap);
|
dc.SelectObject(wxNullBitmap);
|
||||||
|
@@ -1206,7 +1206,7 @@ void wxWindowX11::SendEraseEvents()
|
|||||||
if (m_clearRegion.IsEmpty()) return;
|
if (m_clearRegion.IsEmpty()) return;
|
||||||
|
|
||||||
wxClientDC dc( (wxWindow*)this );
|
wxClientDC dc( (wxWindow*)this );
|
||||||
dc.SetClippingRegion( m_clearRegion );
|
dc.SetDeviceClippingRegion( m_clearRegion );
|
||||||
|
|
||||||
wxEraseEvent erase_event( GetId(), &dc );
|
wxEraseEvent erase_event( GetId(), &dc );
|
||||||
erase_event.SetEventObject( this );
|
erase_event.SetEventObject( this );
|
||||||
|
Reference in New Issue
Block a user