don't crash on weird line endings like \r\r\n

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 48cda637a526534fd6b7d473fbf9e895e66d5866..911731b7d8ac36b64a3b8b41cbf65372d8156fc6 100644 (file)
--- 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 (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;
 #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
     if (platform == wxWinSmartPhone)
         return true;
 #endif

+
+#endif
+

 #ifdef __WXGTK__
     if (platform == wxPORT_GTK)
         return true;
 #ifdef __WXGTK__
     if (platform == wxPORT_GTK)
         return true;


@@ -475,8 +483,12 @@ bool wxPlatform::Is(int platform)
     if (platform == wxPORT_MGL)
         return true;
 #endif
     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__
         return true;
 #endif
 #ifdef __WXCOCOA__


@@ -1065,7 +1077,7 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt)
     }
 
     wxRect rect(pos, sz);
     }
 
     wxRect rect(pos, sz);

-    if (rect.Inside(pt))
+    if (rect.Contains(pt))

         return win;
 
     return NULL;
         return win;
 
     return NULL;