微修正。

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

diff --git a/src/common/library/library.cpp b/src/common/library/library.cpp
index 4e3f637..857f012 100644 (file)
--- a/src/common/library/library.cpp
+++ b/src/common/library/library.cpp
@@ -173,18 +173,15 @@ wxString MakeResponceFile(wxArrayString asFiles, bool bQuote)
 \r
 wxString MB2String(const char * sz)\r
 {\r
-       wxString szTemp(sz, wxConvLibc);\r
-       return szTemp;\r
+       return wxString(sz, wxConvLibc);\r
 }\r
 \r
 wxString UTF82String(const char * sz)\r
 {\r
-       wxString szTemp(sz, wxConvUTF8);\r
-       return szTemp;\r
+       return wxString(sz, wxConvUTF8);\r
 }\r
 \r
 wxString WC2String(const wchar_t * sz)\r
 {\r
-       wxString szTemp((wchar_t *) sz, wxConvUTF8);\r
-       return szTemp;\r
+       return wxString(sz, wxConvUTF8);\r
 }\r

diff --git a/src/frontend/cls_listctrl.cpp b/src/frontend/cls_listctrl.cpp
index a975d66..89d8401 100644 (file)
--- a/src/frontend/cls_listctrl.cpp
+++ b/src/frontend/cls_listctrl.cpp
@@ -78,7 +78,7 @@ wxString myListCtrl::OnGetItemText(long i, long column) const
        case 8:\r
                return GetFileTypeName(this->showFileInfo[i].fnFileName);\r
        case 9:\r
-               return wxString::Format(wxT("%d"), this->showFileInfo[i].llFileID.ToULong());\r
+               return this->showFileInfo[i].llFileID.ToString();\r
        default:\r
                return wxEmptyString;\r
        }\r

diff --git a/src/frontend/functions.cpp b/src/frontend/functions.cpp
index 45e5449..2fc6a5f 100644 (file)
--- a/src/frontend/functions.cpp
+++ b/src/frontend/functions.cpp
@@ -244,8 +244,7 @@ wxIcon GetFileTypeIcon(wxFileName fn)
                }\r
                else\r
                {\r
-                       wxIcon i(ilFile);\r
-                       icon = i;\r
+                       icon = wxIcon(ilFile);\r
                }\r
        }\r
        else\r