From 3572173c014d7a886bdb188e9238bae099d30755 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 4 Nov 1998 22:29:37 +0000
Subject: [PATCH] Added GetRect to region iterator; cured window.cpp problem
 for BC++

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/motif.rsp     | 2 --
 include/wx/gtk/region.h   | 1 +
 include/wx/gtk1/region.h  | 1 +
 include/wx/motif/region.h | 1 +
 include/wx/msw/region.h   | 1 +
 include/wx/stubs/region.h | 1 +
 src/msw/window.cpp        | 5 +++++
 7 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/distrib/msw/motif.rsp b/distrib/msw/motif.rsp
index dea0cf7529..7aa2d240f8 100644
--- a/distrib/msw/motif.rsp
+++ b/distrib/msw/motif.rsp
@@ -23,8 +23,6 @@ src/motif/mdi/lib/Imakefile
 src/motif/mdi/test/*.C
 src/motif/mdi/test/Imakefile
 
-
-
 src/make.env
 src/makeprog.env
 
diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 9ba3f50125..7ab28ddbd8 100644
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -121,6 +121,7 @@ class wxRegionIterator: public wxObject
     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:
   
diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index 9ba3f50125..7ab28ddbd8 100644
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -121,6 +121,7 @@ class wxRegionIterator: public wxObject
     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:
   
diff --git a/include/wx/motif/region.h b/include/wx/motif/region.h
index 99a2ef63f9..d4a78f1a43 100644
--- a/include/wx/motif/region.h
+++ b/include/wx/motif/region.h
@@ -123,6 +123,7 @@ public:
 	long GetWidth() const { return GetW(); }
 	long GetH() const;
 	long GetHeight() const { return GetH(); }
+    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 
 private:
 	long	 m_current;
diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index 0ac45586ec..3955305427 100644
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -125,6 +125,7 @@ public:
 	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;
diff --git a/include/wx/stubs/region.h b/include/wx/stubs/region.h
index 6353a7dc16..0c88b794e7 100644
--- a/include/wx/stubs/region.h
+++ b/include/wx/stubs/region.h
@@ -123,6 +123,7 @@ public:
 	long GetWidth() const { return GetW(); }
 	long GetH() const;
 	long GetHeight() const { return GetH(); }
+    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 
 private:
 	long	 m_current;
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 2031e5cc84..c11fc3d39b 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1598,6 +1598,11 @@ bool wxWindow::MSWOnClose(void)
     return FALSE;
 }
 
+// Some compilers don't define this
+#ifndef ENDSESSION_LOGOFF
+#define ENDSESSION_LOGOFF    0x80000000
+#endif
+
 // Return TRUE to end session, FALSE to veto end session.
 bool wxWindow::MSWOnQueryEndSession(long logOff)
 {
-- 
2.47.2