Reversed the meaning of black and white in wxRegion::ConvertToBitmap

so it matches the menaning of black and white in wxMask

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/region.tex b/docs/latex/wx/region.tex
index 1f26deea5dbd78077d58f673e5f5824d05fa0c95..c80bdeb535318ea8fa4c3e26e47175f649a6b937 100644 (file)
--- a/docs/latex/wx/region.tex
+++ b/docs/latex/wx/region.tex
@@ -97,7 +97,7 @@ all or some part of the region is contained in this region.
 
 \constfunc{wxBitmap}{ConvertToBitmap}{}
 
-Convert the region to a black and white bitmap with the black pixels
+Convert the region to a black and white bitmap with the white pixels
 being inside the region.
 
 \membersection{wxRegion::GetBox}\label{wxregiongetbox}

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 03c2844e0b4b0f61ed77f7295785df103294e7bc..5ec51def18e57cf04a25c852b6c5902a084c2752 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -122,7 +122,7 @@ public:
     wxRegionContain Contains(const wxPoint& pt) const;
     wxRegionContain Contains(const wxRect& rect) const;
 
-    // Convert the region to a B&W bitmap with the black pixels being inside
+    // Convert the region to a B&W bitmap with the white pixels being inside
     // the region.
     wxBitmap ConvertToBitmap() const;
 

diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index 03c2844e0b4b0f61ed77f7295785df103294e7bc..5ec51def18e57cf04a25c852b6c5902a084c2752 100644 (file)
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -122,7 +122,7 @@ public:
     wxRegionContain Contains(const wxPoint& pt) const;
     wxRegionContain Contains(const wxRect& rect) const;
 
-    // Convert the region to a B&W bitmap with the black pixels being inside
+    // Convert the region to a B&W bitmap with the white pixels being inside
     // the region.
     wxBitmap ConvertToBitmap() const;
 

diff --git a/include/wx/mac/region.h b/include/wx/mac/region.h
index 33c31e7d0df32e5521078011d2c291fe54dbd93c..008ed6aa28da999b2584fc326e979419e092fc11 100644 (file)
--- a/include/wx/mac/region.h
+++ b/include/wx/mac/region.h
@@ -117,7 +117,7 @@ public:
     // Does the region contain the rectangle rect?
     wxRegionContain Contains(const wxRect& rect) const;
 
-    // Convert the region to a B&W bitmap with the black pixels being inside
+    // Convert the region to a B&W bitmap with the white pixels being inside
     // the region.
     wxBitmap ConvertToBitmap() const;
 

diff --git a/include/wx/mgl/region.h b/include/wx/mgl/region.h
index 3508341a1972685b850a10e9dc70b785064b6be3..440d26c7f51af0129544bf391469eef1a8412d88 100644 (file)
--- a/include/wx/mgl/region.h
+++ b/include/wx/mgl/region.h
@@ -103,7 +103,7 @@ public:
     // Does the region contain the rectangle rect?
     wxRegionContain Contains(const wxRect& rect) const;
 
-    // Convert the region to a B&W bitmap with the black pixels being inside
+    // Convert the region to a B&W bitmap with the white pixels being inside
     // the region.
     wxBitmap ConvertToBitmap() const;
 

diff --git a/include/wx/motif/region.h b/include/wx/motif/region.h
index 7e9517c76533e902565dea244bec4d981a4c8f40..ac25f273902571cfc4457f463537feaaff6419b2 100644 (file)
--- a/include/wx/motif/region.h
+++ b/include/wx/motif/region.h
@@ -107,7 +107,7 @@ public:
     // Does the region contain the rectangle rect?
     wxRegionContain Contains(const wxRect& rect) const;
 
-    // Convert the region to a B&W bitmap with the black pixels being inside
+    // Convert the region to a B&W bitmap with the white pixels being inside
     // the region.
     wxBitmap ConvertToBitmap() const;
 

diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index 01f160ba84c1fa4239441fa3d87fbca8943c98aa..ec3529a3433cfe79f45fadbc76b58889f27563b2 100644 (file)
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -114,7 +114,7 @@ public:
     // Does the region contain the rectangle rect?
     wxRegionContain Contains(const wxRect& rect) const;
 
-    // Convert the region to a B&W bitmap with the black pixels being inside
+    // Convert the region to a B&W bitmap with the white pixels being inside
     // the region.
     wxBitmap ConvertToBitmap() const;
 

diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h
index dc04259a34072fd17747fddb4641cd5b517663d0..cfbfe80e2d721bc80c62fb6f5ebe8f94fd2e0ecf 100644 (file)
--- a/include/wx/x11/region.h
+++ b/include/wx/x11/region.h
@@ -122,7 +122,7 @@ public:
     wxRegionContain Contains(const wxPoint& pt) const;
     wxRegionContain Contains(const wxRect& rect) const;
 
-    // Convert the region to a B&W bitmap with the black pixels being inside
+    // Convert the region to a B&W bitmap with the white pixels being inside
     // the region.
     wxBitmap ConvertToBitmap() const;
 

diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index 0cf6f5ae06a6c1ff65af474ae060534cdd5292a2..c192366f293ae8afeeb84096da81819d65c42bc0 100644 (file)
--- a/src/common/rgncmn.cpp
+++ b/src/common/rgncmn.cpp
@@ -37,10 +37,10 @@ wxBitmap wxRegion::ConvertToBitmap() const
     wxBitmap bmp(box.GetRight(), box.GetBottom());
     wxMemoryDC dc;
     dc.SelectObject(bmp);
-    dc.SetBackground(*wxWHITE_BRUSH);
+    dc.SetBackground(*wxBLACK_BRUSH);
     dc.Clear();
     dc.SetClippingRegion(*this);
-    dc.SetBackground(*wxBLACK_BRUSH);
+    dc.SetBackground(*wxWHITE_BRUSH);
     dc.Clear();
     dc.SelectObject(wxNullBitmap);
     return bmp;

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 87860da44fe3a5106028910f621cd874db600b94..129e4fbb7c59de4dc5eea3b218a3b531bee2293e 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -989,7 +989,7 @@ static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region)
         gdk_window_shape_combine_region(window, region.GetRegion(), 0, 0);
 #else
         wxBitmap bmp = region.ConvertToBitmap();
-        bmp.SetMask(new wxMask(bmp, *wxWHITE));
+        bmp.SetMask(new wxMask(bmp, *wxBLACK));
         GdkBitmap* mask = bmp.GetMask()->GetBitmap();
         gdk_window_shape_combine_mask(window, mask, 0, 0);
 #endif

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 87860da44fe3a5106028910f621cd874db600b94..129e4fbb7c59de4dc5eea3b218a3b531bee2293e 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -989,7 +989,7 @@ static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region)
         gdk_window_shape_combine_region(window, region.GetRegion(), 0, 0);
 #else
         wxBitmap bmp = region.ConvertToBitmap();
-        bmp.SetMask(new wxMask(bmp, *wxWHITE));
+        bmp.SetMask(new wxMask(bmp, *wxBLACK));
         GdkBitmap* mask = bmp.GetMask()->GetBitmap();
         gdk_window_shape_combine_mask(window, mask, 0, 0);
 #endif