wxMotif::wxFont supports encodings too (and shares 99% of font code with wxGTK)

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

diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index 0ac45586ec450220bb15f7a9995d7754fbc8f2cc..4349debda6ec2468dffdbf23d4704ff4f4b80a38 100644 (file)
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -18,6 +18,7 @@
 
 #include "wx/list.h"
 #include "wx/gdiobj.h"
 
 #include "wx/list.h"
 #include "wx/gdiobj.h"

+#include "wx/gdicmn.h"

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


@@ -101,6 +102,9 @@ public:
        bool Combine(long x, long y, long width, long height, wxRegionOp op);
        bool Combine(const wxRegion& region, wxRegionOp op);
        bool Combine(const wxRect& rect, wxRegionOp op);
        bool Combine(long x, long y, long width, long height, wxRegionOp op);
        bool Combine(const wxRegion& region, wxRegionOp op);
        bool Combine(const wxRect& rect, wxRegionOp op);

+
+    // Get internal region handle
+    WXHRGN GetHRGN() const;

 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject {
 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject {


@@ -113,8 +117,11 @@ public:
        void Reset(void) { m_current = 0; }
        void Reset(const wxRegion& region);
 
        void Reset(void) { m_current = 0; }
        void Reset(const wxRegion& region);
 

-       operator bool (void) const { return m_current < m_numRects; }
-       bool HaveRects(void) const { return m_current < m_numRects; }
+#ifndef __SALFORDC__
+       operator bool (void) const { return (m_current < m_numRects); }
+#endif
+
+       bool HaveRects(void) const { return (m_current < m_numRects); }

 
        void operator ++ (void);
        void operator ++ (int);
 
        void operator ++ (void);
        void operator ++ (int);


@@ -125,6 +132,7 @@ public:
        long GetWidth(void) const { return GetW(); }
        long GetH(void) const;
        long GetHeight(void) const { return GetH(); }
        long GetWidth(void) const { return GetW(); }
        long GetH(void) const;
        long GetHeight(void) const { return GetH(); }

+    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }

 
 private:
        long     m_current;
 
 private:
        long     m_current;