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
This commit is contained in:
parent
5de9c45c5d
commit
3572173c01
@ -23,8 +23,6 @@ src/motif/mdi/lib/Imakefile
|
|||||||
src/motif/mdi/test/*.C
|
src/motif/mdi/test/*.C
|
||||||
src/motif/mdi/test/Imakefile
|
src/motif/mdi/test/Imakefile
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
src/make.env
|
src/make.env
|
||||||
src/makeprog.env
|
src/makeprog.env
|
||||||
|
|
||||||
|
@ -121,6 +121,7 @@ class wxRegionIterator: public wxObject
|
|||||||
long GetWidth(void) const { return GetW(); }
|
long GetWidth(void) const { return GetW(); }
|
||||||
long GetH(void) const;
|
long GetH(void) const;
|
||||||
long GetHeight(void) const { return GetH(); }
|
long GetHeight(void) const { return GetH(); }
|
||||||
|
wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
@ -121,6 +121,7 @@ class wxRegionIterator: public wxObject
|
|||||||
long GetWidth(void) const { return GetW(); }
|
long GetWidth(void) const { return GetW(); }
|
||||||
long GetH(void) const;
|
long GetH(void) const;
|
||||||
long GetHeight(void) const { return GetH(); }
|
long GetHeight(void) const { return GetH(); }
|
||||||
|
wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
@ -123,6 +123,7 @@ public:
|
|||||||
long GetWidth() const { return GetW(); }
|
long GetWidth() const { return GetW(); }
|
||||||
long GetH() const;
|
long GetH() const;
|
||||||
long GetHeight() const { return GetH(); }
|
long GetHeight() const { return GetH(); }
|
||||||
|
wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
long m_current;
|
long m_current;
|
||||||
|
@ -125,6 +125,7 @@ public:
|
|||||||
long GetWidth(void) const { return GetW(); }
|
long GetWidth(void) const { return GetW(); }
|
||||||
long GetH(void) const;
|
long GetH(void) const;
|
||||||
long GetHeight(void) const { return GetH(); }
|
long GetHeight(void) const { return GetH(); }
|
||||||
|
wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
long m_current;
|
long m_current;
|
||||||
|
@ -123,6 +123,7 @@ public:
|
|||||||
long GetWidth() const { return GetW(); }
|
long GetWidth() const { return GetW(); }
|
||||||
long GetH() const;
|
long GetH() const;
|
||||||
long GetHeight() const { return GetH(); }
|
long GetHeight() const { return GetH(); }
|
||||||
|
wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
long m_current;
|
long m_current;
|
||||||
|
@ -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.
|
// Return TRUE to end session, FALSE to veto end session.
|
||||||
bool wxWindow::MSWOnQueryEndSession(long logOff)
|
bool wxWindow::MSWOnQueryEndSession(long logOff)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user