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 3434d5aaa07a1c6234a98dfe9411a3e4a69163e5..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));


@@ -1734,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());
         }