DEBUGREPORT

[wxWidgets.git] / include / wx / mgl / region.h

diff --git a/include/wx/mgl/region.h b/include/wx/mgl/region.h
index 62c5386502dcf3bb9cfa0f50796d9e8899ddba27..1e6dae11e4fba73d45b928d12028d2d33f25ef96 100644 (file)
--- a/include/wx/mgl/region.h
+++ b/include/wx/mgl/region.h
@@ -11,27 +11,26 @@
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "region.h"
 #endif
 
 #include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 #pragma interface "region.h"
 #endif
 
 #include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"

-#include "wx/list.h"

 
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 class MGLRegion;
 
 
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 class MGLRegion;
 

-enum wxRegionContain 
+enum wxRegionContain

 {
 {

-    wxOutRegion = 0, 
-    wxPartRegion = 1, 
+    wxOutRegion = 0,
+    wxPartRegion = 1,

     wxInRegion = 2
 };
 
     wxInRegion = 2
 };
 

-class WXDLLEXPORT wxRegion : public wxGDIObject 
+class WXDLLEXPORT wxRegion : public wxGDIObject

 {
     DECLARE_DYNAMIC_CLASS(wxRegion);
     friend class WXDLLEXPORT wxRegionIterator;
 {
     DECLARE_DYNAMIC_CLASS(wxRegion);
     friend class WXDLLEXPORT wxRegionIterator;


@@ -41,6 +40,15 @@ public:
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion(const MGLRegion& region);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion(const MGLRegion& region);

+    wxRegion( const wxBitmap& bmp)
+    {
+        Union(bmp);
+    }
+    wxRegion( const wxBitmap& bmp,
+              const wxColour& transColour, int tolerance = 0)
+    {
+        Union(bmp, transColour, tolerance);
+    }

 
     wxRegion();
     ~wxRegion();
 
     wxRegion();
     ~wxRegion();


@@ -96,7 +104,21 @@ public:
     wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const;
     // Does the region contain the rectangle rect?
     wxRegionContain Contains(const wxRect& rect) const;
     wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const;
     // Does the region contain the rectangle rect?
     wxRegionContain Contains(const wxRect& rect) const;

-    
+
+    // Convert the region to a B&W bitmap with the white pixels being inside
+    // the region.
+    wxBitmap ConvertToBitmap() const;
+
+    // Use the non-transparent pixels of a wxBitmap for the region to combine
+    // with this region.  First version takes transparency from bitmap's mask,
+    // second lets the user specify the colour to be treated as transparent
+    // along with an optional tolerance value.
+    // NOTE: implemented in common/rgncmn.cpp
+    bool Union(const wxBitmap& bmp);
+    bool Union(const wxBitmap& bmp,
+               const wxColour& transColour, int tolerance = 0);
+
+

     // implementation from now on:
     const MGLRegion& GetMGLRegion() const;
 
     // implementation from now on:
     const MGLRegion& GetMGLRegion() const;
 


@@ -109,7 +131,7 @@ protected:
 
 WX_DECLARE_EXPORTED_LIST(wxRect, wxRegionRectList);
 
 
 WX_DECLARE_EXPORTED_LIST(wxRect, wxRegionRectList);
 

-class WXDLLEXPORT wxRegionIterator : public wxObject 
+class WXDLLEXPORT wxRegionIterator : public wxObject

 {
     DECLARE_DYNAMIC_CLASS(wxRegionIterator);
 public:
 {
     DECLARE_DYNAMIC_CLASS(wxRegionIterator);
 public: