wxString::IsEmpty()を使うよう変更。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@240 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/src/common/library/library.cpp b/src/common/library/library.cpp
index aa6e381..300c77c 100644 (file)
--- a/src/common/library/library.cpp
+++ b/src/common/library/library.cpp
@@ -114,14 +114,14 @@ wxString MakeCommandLineSend(wxString szCommandLine, wxString szArcName, TPI_SWI
                                // 5: パスワード\r
                                // 6: キーファイル\r
                                // 7: 分割サイズ\r
-                               case wxT('0'): szCommandLineSend += ProcessBool(swInfo->fStoreDirectoryPathes,      szCommandLine, & i); break;\r
-                               case wxT('1'): szCommandLineSend += ProcessBool(swInfo->fMakeSFX,                   szCommandLine, & i); break;\r
-                               case wxT('2'): szCommandLineSend += ProcessBool(swInfo->fSolid,                     szCommandLine, & i); break;\r
-                               case wxT('3'): szCommandLineSend += ProcessBool(swInfo->fMMOptimize,                szCommandLine, & i); break;\r
-                               case wxT('4'): szCommandLineSend += ProcessBool(swInfo->fEncryptHeader,             szCommandLine, & i); break;\r
-                               case wxT('5'): szCommandLineSend += ProcessBool(swInfo->szPassword != wxEmptyString,szCommandLine, & i, swInfo->szPassword); break;\r
-                               case wxT('6'): szCommandLineSend += ProcessBool(swInfo->szKeyFile  != wxEmptyString,szCommandLine, & i, swInfo->szKeyFile); break;\r
-                               case wxT('7'): szCommandLineSend += ProcessBool(swInfo->nSplitSize != 0,            szCommandLine, & i, wxString::Format(wxT("%d"), swInfo->nSplitSize)); break;\r
+                               case wxT('0'): szCommandLineSend += ProcessBool(swInfo->fStoreDirectoryPathes,  szCommandLine, & i); break;\r
+                               case wxT('1'): szCommandLineSend += ProcessBool(swInfo->fMakeSFX,               szCommandLine, & i); break;\r
+                               case wxT('2'): szCommandLineSend += ProcessBool(swInfo->fSolid,                 szCommandLine, & i); break;\r
+                               case wxT('3'): szCommandLineSend += ProcessBool(swInfo->fMMOptimize,            szCommandLine, & i); break;\r
+                               case wxT('4'): szCommandLineSend += ProcessBool(swInfo->fEncryptHeader,         szCommandLine, & i); break;\r
+                               case wxT('5'): szCommandLineSend += ProcessBool(! swInfo->szPassword.IsEmpty(), szCommandLine, & i, swInfo->szPassword); break;\r
+                               case wxT('6'): szCommandLineSend += ProcessBool(! swInfo->szKeyFile.IsEmpty(),  szCommandLine, & i, swInfo->szKeyFile); break;\r
+                               case wxT('7'): szCommandLineSend += ProcessBool(swInfo->nSplitSize != 0,        szCommandLine, & i, wxString::Format(wxT("%d"), swInfo->nSplitSize)); break;\r
                                }\r
                                break;\r
                        }\r

diff --git a/src/plugin/cuiWrapper/cuiWrapper.cpp b/src/plugin/cuiWrapper/cuiWrapper.cpp
index dd4baeb..18d31eb 100644 (file)
--- a/src/plugin/cuiWrapper/cuiWrapper.cpp
+++ b/src/plugin/cuiWrapper/cuiWrapper.cpp
@@ -424,7 +424,7 @@ int __stdcall GetFileInformation
        if (s_nCurrentLine >= asOutput.GetCount())\r
        {\r
                // 空行で終わるとき以外はエラーとする。\r
-               return szEndLine == wxEmptyString ? TPI_ERROR_S_ENDOFDATA : TPI_ERROR_ARC_UNSUPPORTED;\r
+               return szEndLine.IsEmpty() ? TPI_ERROR_S_ENDOFDATA : TPI_ERROR_ARC_UNSUPPORTED;\r
        }\r
 \r
        // 最終行かどうか確認。\r