Generate key events in generic wxDataViewCtrl implementation.

[wxWidgets.git] / src / common / rgncmn.cpp

diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index a18bb207082b0fedc671ca37353b04ec63daec13..44305243f7b15349ad001ee9c76f6ac1d5f39425 100644 (file)
--- a/src/common/rgncmn.cpp
+++ b/src/common/rgncmn.cpp
@@ -60,12 +60,12 @@ bool wxRegionBase::IsEqual(const wxRegion& region) const
 wxBitmap wxRegionBase::ConvertToBitmap() const
 {
     wxRect box = GetBox();
 wxBitmap wxRegionBase::ConvertToBitmap() const
 {
     wxRect box = GetBox();

-    wxBitmap bmp(box.GetRight(), box.GetBottom());
+    wxBitmap bmp(box.GetWidth(), box.GetHeight());

     wxMemoryDC dc;
     dc.SelectObject(bmp);
     dc.SetBackground(*wxBLACK_BRUSH);
     dc.Clear();
     wxMemoryDC dc;
     dc.SelectObject(bmp);
     dc.SetBackground(*wxBLACK_BRUSH);
     dc.Clear();

-    dc.SetClippingRegion(*wx_static_cast(const wxRegion *, this));
+    dc.SetDeviceClippingRegion(*static_cast<const wxRegion *>(this));

     dc.SetBackground(*wxWHITE_BRUSH);
     dc.Clear();
     dc.SelectObject(wxNullBitmap);
     dc.SetBackground(*wxWHITE_BRUSH);
     dc.Clear();
     dc.SelectObject(wxNullBitmap);


@@ -131,7 +131,7 @@ bool wxRegionBase::Union(const wxBitmap& bmp)
     if (bmp.GetMask())
     {
         wxImage image = bmp.ConvertToImage();
     if (bmp.GetMask())
     {
         wxImage image = bmp.ConvertToImage();

-        wxASSERT_MSG( image.HasMask(), _T("wxBitmap::ConvertToImage doesn't preserve mask?") );
+        wxASSERT_MSG( image.HasMask(), wxT("wxBitmap::ConvertToImage doesn't preserve mask?") );

         return DoRegionUnion(*this, image,
                              image.GetMaskRed(),
                              image.GetMaskGreen(),
         return DoRegionUnion(*this, image,
                              image.GetMaskRed(),
                              image.GetMaskGreen(),