Added part of patch

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 73905fd61ee5dfd8133145741dc5137057cd60ee..911731b7d8ac36b64a3b8b41cbf65372d8156fc6 100644 (file)
--- 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;