Revert the zoom direction on Ctrl-mouse wheel in wxStyledTextCtrl.

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

diff --git a/include/wx/generic/region.h b/include/wx/generic/region.h
index ea6830e1672e9e03e53ebcb4d5965a7936a1488c..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();
 


@@ -26,8 +29,8 @@ public:
     virtual bool IsEmpty() const;
 
 protected:
     virtual bool IsEmpty() const;
 
 protected:

-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
     // wxRegionBase pure virtuals
     virtual bool DoIsEqual(const wxRegion& region) const;
 
     // wxRegionBase pure virtuals
     virtual bool DoIsEqual(const wxRegion& region) const;


@@ -42,10 +45,10 @@ protected:
     virtual bool DoSubtract(const wxRegion& region);
     virtual bool DoXor(const wxRegion& region);
 
     virtual bool DoSubtract(const wxRegion& region);
     virtual bool DoXor(const wxRegion& region);
 

-    friend class WXDLLEXPORT wxRegionIteratorGeneric;
+    friend class WXDLLIMPEXP_FWD_CORE wxRegionIteratorGeneric;

 };
 
 };
 

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

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