Corrected memory.cpp checkpoint bug; added Tex2RTF

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

diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index c660a62f7215b01965bdc8ea5ee6d78e96bafc0d..4be8411eb56ae1cac1a3060e4f04b1f5c04b23c7 100644 (file)
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __REGIONH__
-#define __REGIONH__
+#ifndef _WX_REGION_H_
+#define _WX_REGION_H_

 
 #ifdef __GNUG__
 #pragma interface "region.h"
 
 #ifdef __GNUG__
 #pragma interface "region.h"


@@ -42,6 +42,7 @@ public:
     wxRegion(long x, long y, long w, long h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion(long x, long y, long w, long h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);

+    wxRegion(WXHRGN hRegion); // Hangs on to this region

 
        wxRegion(void);
        ~wxRegion(void);
 
        wxRegion(void);
        ~wxRegion(void);


@@ -100,6 +101,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 {


@@ -124,6 +128,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;


@@ -133,4 +138,4 @@ private:
 };
 
 #endif
 };
 
 #endif

-       // __REGIONH__
+       // _WX_REGION_H_