adding lowlevel hook to listbox

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

diff --git a/include/wx/region.h b/include/wx/region.h
index 236531650f7fe9ff1ba63e5b7787f81ea4cf2486..1b1f627953efeb3a282fd2470762a33303b5ee60 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -12,12 +12,12 @@
 #ifndef _WX_REGION_H_BASE_
 #define _WX_REGION_H_BASE_
 
 #ifndef _WX_REGION_H_BASE_
 #define _WX_REGION_H_BASE_
 

-#include "wx/bitmap.h"

 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 

-class WXDLLEXPORT wxColour;
-class WXDLLEXPORT wxRegion;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxRegion;

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -55,7 +55,7 @@ enum wxRegionOp
 // wxRegionBase defines wxRegion API
 // ----------------------------------------------------------------------------
 
 // wxRegionBase defines wxRegion API
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -82,9 +82,6 @@ public:
     // accessors
     // ---------
 
     // accessors
     // ---------
 

-    bool Ok() const { return IsOk(); }
-    bool IsOk() const { return m_refData != NULL; }
-

     // Is region empty?
     virtual bool IsEmpty() const = 0;
     bool Empty() const { return IsEmpty(); }
     // Is region empty?
     virtual bool IsEmpty() const = 0;
     bool Empty() const { return IsEmpty(); }


@@ -191,7 +188,7 @@ protected:
 
 #define wxHAS_REGION_COMBINE
 
 
 #define wxHAS_REGION_COMBINE
 

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

 {
 public:
     // these methods are not part of public API as they're not implemented on
 {
 public:
     // these methods are not part of public API as they're not implemented on


@@ -207,17 +204,11 @@ protected:
     virtual bool DoCombine(const wxRegion& region, wxRegionOp op) = 0;
 
     // implement some wxRegionBase pure virtuals in terms of Combine()
     virtual bool DoCombine(const wxRegion& region, wxRegionOp op) = 0;
 
     // implement some wxRegionBase pure virtuals in terms of Combine()

-    virtual bool DoUnionWithRect(const wxRect& rect)
-        { return Combine(rect, wxRGN_OR); }
-    virtual bool DoUnionWithRegion(const wxRegion& region)
-        { return Combine(region, wxRGN_OR); }
-
-    virtual bool DoIntersect(const wxRegion& region)
-        { return Combine(region, wxRGN_AND); }
-    virtual bool DoSubtract(const wxRegion& region)
-        { return Combine(region, wxRGN_DIFF); }
-    virtual bool DoXor(const wxRegion& region)
-        { return Combine(region, wxRGN_XOR); }
+    virtual bool DoUnionWithRect(const wxRect& rect);
+    virtual bool DoUnionWithRegion(const wxRegion& region);
+    virtual bool DoIntersect(const wxRegion& region);
+    virtual bool DoSubtract(const wxRegion& region);
+    virtual bool DoXor(const wxRegion& region);

 };
 
 #endif // ports with wxRegion::Combine()
 };
 
 #endif // ports with wxRegion::Combine()