X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bca03736369e836cce9297509505c5972e775dd..67badd5753e70eb50de5ae43ff454e7c1f311e50:/src/x11/utilsx.cpp diff --git a/src/x11/utilsx.cpp b/src/x11/utilsx.cpp index ff17f168e7..a635f8f7e8 100644 --- a/src/x11/utilsx.cpp +++ b/src/x11/utilsx.cpp @@ -14,7 +14,6 @@ #ifdef __VMS #define XShapeQueryExtension XSHAPEQUERYEXTENSION -#define XtDisplay XTDISPLAY #endif #include "wx/x11/privx.h" @@ -23,6 +22,7 @@ #ifndef WX_PRECOMP #include "wx/bitmap.h" + #include "wx/region.h" #endif #ifdef __VMS @@ -32,7 +32,6 @@ #include #endif - #include "wx/region.h" #include "wx/dcmemory.h" #endif @@ -59,14 +58,14 @@ bool wxDoSetShape( Display* xdisplay, else { // 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(); wxBitmap bmp(box.GetRight(), box.GetBottom(), 1); wxMemoryDC dc; dc.SelectObject(bmp); dc.SetBackground(*wxBLACK_BRUSH); dc.Clear(); - dc.SetClippingRegion(region); + dc.SetDeviceClippingRegion(region); dc.SetBackground(*wxWHITE_BRUSH); dc.Clear(); dc.SelectObject(wxNullBitmap);