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

diff --git a/distrib/msw/motif.rsp b/distrib/msw/motif.rsp
index dea0cf7529389425dd284ea9c056005c0f2c004a..7aa2d240f8e757272fad72d29c22c71341505fb7 100644 (file)
--- 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/motif/mdi/test/*.C
 src/motif/mdi/test/Imakefile
 

-
-

 src/make.env
 src/makeprog.env
 
 src/make.env
 src/makeprog.env
 

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 9ba3f5012580409d2b3696f4ab3cdec4879aa748..7ab28ddbd80ff714631368dee2849ec074099325 100644 (file)
--- 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(); }
     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:
   
 
   private:
   

diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index 9ba3f5012580409d2b3696f4ab3cdec4879aa748..7ab28ddbd80ff714631368dee2849ec074099325 100644 (file)
--- 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(); }
     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:
   
 
   private:
   

diff --git a/include/wx/motif/region.h b/include/wx/motif/region.h
index 99a2ef63f913fc6ba998af743e8011405728abbb..d4a78f1a43393056a26e1b1d961fc9b56fc82479 100644 (file)
--- 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(); }
        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;
 
 private:
        long     m_current;

diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index 0ac45586ec450220bb15f7a9995d7754fbc8f2cc..3955305427493a124628d489a7c418e8f346b162 100644 (file)
--- 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(); }
        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;

diff --git a/include/wx/stubs/region.h b/include/wx/stubs/region.h
index 6353a7dc16d8c0d2352ed9707e1a307c50f496ac..0c88b794e7fa3ccc75298f45aaf85301f3033cde 100644 (file)
--- 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(); }
        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;
 
 private:
        long     m_current;

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 2031e5cc8438e7de67fbb262bc6990dcb6565c2b..c11fc3d39b5c038e8f36dac130193c02cdaee573 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1598,6 +1598,11 @@ bool wxWindow::MSWOnClose(void)
     return FALSE;
 }
 
     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)
 {
 // Return TRUE to end session, FALSE to veto end session.
 bool wxWindow::MSWOnQueryEndSession(long logOff)
 {