1. wxWindowDisabler modified to bring parent window back to top under MSW

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 25935ed14f7555a7e21b0d3005802396ce05cca7..9cea28b83a58b488b6a00be4fdd44084cc943cd2 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1781,15 +1781,18 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
 #else // assume Unix
     const wxChar *pLastSeparator = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
 
 #else // assume Unix
     const wxChar *pLastSeparator = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
 

-    if ( (pDot == pszFileName) || (*(pDot - 1) == wxFILE_SEP_PATH_UNIX) )
+    if ( pDot )

     {
     {

-        // under Unix, dot may be (and commonly is) the first character of the
-        // filename, don't treat the entire filename as extension in this case
-        pDot = NULL;
+        if ( (pDot == pszFileName) || (*(pDot - 1) == wxFILE_SEP_PATH_UNIX) )
+        {
+            // under Unix, dot may be (and commonly is) the first character of the
+            // filename, don't treat the entire filename as extension in this case
+            pDot = NULL;
+        }

     }
 #endif // MSW/Unix
 
     }
 #endif // MSW/Unix
 

-    if ( pDot < pLastSeparator )
+    if ( pDot && (pDot < pLastSeparator) )

     {
         // the dot is part of the path, not the start of the extension
         pDot = NULL;
     {
         // the dot is part of the path, not the start of the extension
         pDot = NULL;