X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6e8c584db192eb20651c16a6443535a059e4afe..cbc9145c04bd3ea0a228906c8363fa8f47e3acf9:/src/common/utilscmn.cpp?ds=sidebyside diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 73905fd61e..911731b7d8 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -483,8 +483,12 @@ bool wxPlatform::Is(int platform) if (platform == wxPORT_MGL) return true; #endif -#ifdef __WXOS2__ - if (platform == wxPORT_OS2) +#ifdef __OS2__ + if (platform == wxOS_OS2) + return true; +#endif +#ifdef __WXPM__ + if (platform == wxPORT_PM) return true; #endif #ifdef __WXCOCOA__ @@ -1073,7 +1077,7 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt) } wxRect rect(pos, sz); - if (rect.Inside(pt)) + if (rect.Contains(pt)) return win; return NULL;