send wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED only once after end of dragging and...

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 8a7584ac0cd85d3fab6e86f6816c521dbafe5402..55aa0e7ce8c0087363560901ac11d663278a5f47 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -673,7 +673,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
   const wxChar *val;
 #ifndef __WXWINCE__
   wxChar *tcp;
   const wxChar *val;
 #ifndef __WXWINCE__
   wxChar *tcp;

-  if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
+  if (!envname.empty() && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&

      (tcp = wxStrstr (dest, val)) != NULL)
     {
         wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));
      (tcp = wxStrstr (dest, val)) != NULL)
     {
         wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));


@@ -1226,6 +1226,8 @@ bool wxPathExists(const wxChar *pszPathName)
     DWORD ret = ::GetFileAttributes(strPath);
 
     return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
     DWORD ret = ::GetFileAttributes(strPath);
 
     return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);

+#elif defined(__OS2__)
+    return (::DosSetCurrentDir(WXSTRINGCAST strPath));

 #else // !__WIN32__
 
     wxStructStat st;
 #else // !__WIN32__
 
     wxStructStat st;


@@ -1732,7 +1734,7 @@ int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr, wxArrayStr
     // autocompletion
     for( size_t j = 0 ; j < descriptions.GetCount() ; j++ )
     {
     // autocompletion
     for( size_t j = 0 ; j < descriptions.GetCount() ; j++ )
     {

-        if ( descriptions[j] == wxEmptyString && filters[j] != wxEmptyString )
+        if ( descriptions[j].empty() && !filters[j].empty() )

         {
             descriptions[j].Printf(_("Files (%s)"), filters[j].c_str());
         }
         {
             descriptions[j].Printf(_("Files (%s)"), filters[j].c_str());
         }


@@ -1900,7 +1902,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
 // This is important for the archive streams, which benefit greatly from
 // being able to seek on a stream, but which will produce corrupt archives
 // if they unknowingly seek on a non-seekable stream.
 // This is important for the archive streams, which benefit greatly from
 // being able to seek on a stream, but which will produce corrupt archives
 // if they unknowingly seek on a non-seekable stream.

-// 
+//

 // wxFILE_KIND_DISK is a good catch all return value, since other values
 // disable features of the archive streams. Some other value must be returned
 // for a file type that appears seekable but isn't.
 // wxFILE_KIND_DISK is a good catch all return value, since other values
 // disable features of the archive streams. Some other value must be returned
 // for a file type that appears seekable but isn't.