X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/216c354363ed7134f17cec2a4064120997bc5b62..84140dc956d0f29350c239329f2e8bb1fd49963f:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 48cda637a5..911731b7d8 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -447,6 +447,11 @@ bool wxPlatform::Is(int platform) if (platform == wxOS_WINDOWS_CE) return true; #endif + +#if 0 + +// FIXME: wxWinPocketPC and wxWinSmartPhone are unknown symbols + #if defined(__WXWINCE__) && defined(__POCKETPC__) if (platform == wxWinPocketPC) return true; @@ -455,6 +460,9 @@ bool wxPlatform::Is(int platform) if (platform == wxWinSmartPhone) return true; #endif + +#endif + #ifdef __WXGTK__ if (platform == wxPORT_GTK) return true; @@ -475,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__ @@ -1065,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;