detect and report errors in XRC specification of grid sizers

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

diff --git a/include/wx/generic/region.h b/include/wx/generic/region.h
index 7a6dc2473f8bcc2bd036ba6021721027bee7a288..665f8f8b15fc1ac55493ee383333367a95f0ec38 100644 (file)
--- a/include/wx/generic/region.h
+++ b/include/wx/generic/region.h
@@ -12,12 +12,15 @@
 #ifndef _WX_GENERIC_REGION_H__
 #define _WX_GENERIC_REGION_H__
 
 #ifndef _WX_GENERIC_REGION_H__
 #define _WX_GENERIC_REGION_H__
 

-class WXDLLEXPORT wxRegionGeneric : public wxRegionBase
+class WXDLLIMPEXP_CORE wxRegionGeneric : public wxRegionBase

 {
 public:
     wxRegionGeneric(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
     wxRegionGeneric(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegionGeneric(const wxRect& rect);
 {
 public:
     wxRegionGeneric(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
     wxRegionGeneric(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegionGeneric(const wxRect& rect);

+    wxRegionGeneric(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+    wxRegionGeneric(const wxBitmap& bmp);
+    wxRegionGeneric(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0);

     wxRegionGeneric();
     virtual ~wxRegionGeneric();
 
     wxRegionGeneric();
     virtual ~wxRegionGeneric();
 


@@ -45,7 +48,7 @@ protected:
     friend class WXDLLIMPEXP_FWD_CORE wxRegionIteratorGeneric;
 };
 
     friend class WXDLLIMPEXP_FWD_CORE wxRegionIteratorGeneric;
 };
 

-class WXDLLEXPORT wxRegionIteratorGeneric : public wxObject
+class WXDLLIMPEXP_CORE wxRegionIteratorGeneric : public wxObject

 {
 public:
     wxRegionIteratorGeneric();
 {
 public:
     wxRegionIteratorGeneric();