projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GetBestFittingSize --> GetEffectiveMinSize
[wxWidgets.git]
/
include
/
wx
/
mac
/
classic
/
region.h
diff --git
a/include/wx/mac/classic/region.h
b/include/wx/mac/classic/region.h
index ee60da546229cb4875c8eb905a71740f7d09584c..db388cedded3b71c36e76efa6117befd9b1fef06 100644
(file)
--- a/
include/wx/mac/classic/region.h
+++ b/
include/wx/mac/classic/region.h
@@
-19,10
+19,6
@@
class WXDLLEXPORT wxRect;
class WXDLLEXPORT wxPoint;
class WXDLLEXPORT wxRect;
class WXDLLEXPORT wxPoint;
-enum wxRegionContain {
- wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
-};
-
// So far, for internal use only
enum wxRegionOp {
wxRGN_AND, // Creates the intersection of the two combined regions.
// So far, for internal use only
enum wxRegionOp {
wxRGN_AND, // Creates the intersection of the two combined regions.
@@
-51,14
+47,7
@@
public:
Union(bmp, transColour, tolerance);
}
Union(bmp, transColour, tolerance);
}
- ~wxRegion();
-
- //# Copying
- wxRegion(const wxRegion& r)
- : wxGDIObject()
- { Ref(r); }
- wxRegion& operator = (const wxRegion& r)
- { Ref(r); return (*this); }
+ virtual ~wxRegion();
//# Modify region
// Clear current region
//# Modify region
// Clear current region
@@
-144,7
+133,7
@@
public:
wxRegionIterator();
wxRegionIterator(const wxRegion& region);
wxRegionIterator(const wxRegionIterator& iterator);
wxRegionIterator();
wxRegionIterator(const wxRegion& region);
wxRegionIterator(const wxRegionIterator& iterator);
- ~wxRegionIterator();
+
virtual
~wxRegionIterator();
wxRegionIterator& operator=(const wxRegionIterator& iterator);
wxRegionIterator& operator=(const wxRegionIterator& iterator);