微修正。

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

diff --git a/src/frontend/dlg_make.cpp b/src/frontend/dlg_make.cpp
index c2dfa31..afe3525 100644 (file)
--- a/src/frontend/dlg_make.cpp
+++ b/src/frontend/dlg_make.cpp
@@ -270,7 +270,7 @@ void MakeDialog::OnTabChanged(wxNotebookEvent& e)
        else
        {
                // \83t\83@\83C\83\8b\82Ì\8fo\97Í\90æ\82ð\90\84\91ª\81B
-               wxString szOutputRootDir = WillMakeDirByArcName((MainFrame *) this->GetParent(), this) ? MakeDirPath(wxFileName::DirName(this->cbDir->GetValue()), wxFileName::FileName(this->cbFileName->GetValue()).GetName(), false).GetPath() : this->cbDir->GetValue();
+               wxString szOutputRootDir = WillMakeDirByArcName((MainFrame *) this->GetParent(), this) ? MakeDirPath(wxFileName::DirName(this->cbDir->GetValue()), wxFileName(this->cbFileName->GetValue()).GetName(), false).GetPath() : this->cbDir->GetValue();
 
                // \8ae\83t\83@\83C\83\8b\82É\83p\83X\82ð\95t\89Á\81B
                bool fDTVWarning = false;

diff --git a/src/frontend/frm_main.cpp b/src/frontend/frm_main.cpp
index d7511e1..9d12792 100644 (file)
--- a/src/frontend/frm_main.cpp
+++ b/src/frontend/frm_main.cpp
@@ -45,7 +45,7 @@ bool g_fSortAscend;
 // MainFrame
 //******************************************************************************
 
-MainFrame::MainFrame(): conf(wxEmptyString, wxEmptyString, FE_DIR_BIN wxT("frontend.conf"), wxEmptyString, wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_RELATIVE_PATH), wxFrame()
+MainFrame::MainFrame(): wxFrame(), conf(wxEmptyString, wxEmptyString, FE_DIR_BIN wxT("frontend.conf"), wxEmptyString, wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_RELATIVE_PATH)
 {
 }
 
@@ -240,8 +240,6 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
                {
                        return;
                }
-               // \82±\82±\82ÅwxFileName::FileName\82ð\97p\82¢\82Ä\82¢\82é\82Ì\82Í\81A\8cã\82Å\83f\83B\83\8c\83N\83g\83\8a\96¼\82ð\95K\97v\82Æ\82·\82é\8fê\8d\87\82ª\82 \82é\82½\82ß\81B
-               // \82 \82Ü\82è\82æ\82¢\8ed\97l\82Å\82Í\82È\82¢\82ª\93®\82­\82Ì\82Å\82Æ\82è\82 \82¦\82¸\95ú\92u\81B
                swInfo.fnDestinationDirectory = wxFileName::DirName(fd.GetDirectory());
                this->conf.Write(wxT("LastOpenPath"), fd.GetDirectory());
                this->statusbar->SetStatusText(swInfo.fnDestinationDirectory.GetFullPath(), 4);
@@ -251,7 +249,7 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
        else
        {
                mkDlg.files = * (wxArrayString *) e.GetClientData();
-               swInfo.fnDestinationDirectory = wxFileName::DirName(wxFileName::FileName(mkDlg.files[0]).GetPath());
+               swInfo.fnDestinationDirectory = wxFileName::DirName(wxFileName(mkDlg.files[0]).GetPath());
                // \91\8a\91Î\83p\83X\82É\95Ï\8a·\81B
                for (size_t n = 0; n < mkDlg.files.Count(); n++)
                {
@@ -621,7 +619,7 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
                if (nMode == 1)
                {
                        // \83R\83}\83\93\83h\82ð\8eæ\93¾\81B
-                       ftFile = wxTheMimeTypesManager->GetFileTypeFromExtension(wxFileName::FileName(mkDlg.files[0]).GetExt());
+                       ftFile = wxTheMimeTypesManager->GetFileTypeFromExtension(wxFileName(mkDlg.files[0]).GetExt());
                        if (! ftFile)
                        {
                                // \8eí\97Þ\82ª\8eæ\93¾\82Å\82«\82È\82¢\82Æ\82«\82Í\90Ý\92è\82ð\93Ç\82Ý\8d\9e\82Þ\81B\8f\89\8aú\90Ý\92è\82Å\82Í\83e\83L\83X\83g\82Æ\82Ý\82È\82·\81B
@@ -703,7 +701,7 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
                if (nMode == 1)
                {
                        // \83R\83}\83\93\83h\82ð\8eÀ\8ds\81B
-                       asFiles.Add(swInfo.fnDestinationDirectory.GetPathWithSep() + wxFileName::FileName(mkDlg.files[0]).GetFullName());
+                       asFiles.Add(swInfo.fnDestinationDirectory.GetPathWithSep() + wxFileName(mkDlg.files[0]).GetFullName());
                        if (nErrorCode == TPI_ERROR_SUCCESS)
                        {
                                ::wxExecute(ftFile->GetOpenCommand(asFiles[0]), wxEXEC_SYNC);
@@ -715,7 +713,7 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
                        wxFileDataObject objFile;
                        for (size_t i = 0; i < mkDlg.files.Count(); i++)
                        {
-                               wxString szFileName = swInfo.fnDestinationDirectory.GetPathWithSep() + wxFileName::FileName(mkDlg.files[i]).GetFullName();
+                               wxString szFileName = swInfo.fnDestinationDirectory.GetPathWithSep() + wxFileName(mkDlg.files[i]).GetFullName();
                                if (nMode == 2)
                                {
                                        // \83\8a\83X\83g\82É\92Ç\89Á\81B

diff --git a/src/plugin/calLibrary/calLibrary.cpp b/src/plugin/calLibrary/calLibrary.cpp
index 36abcf9..f6221dd 100644 (file)
--- a/src/plugin/calLibrary/calLibrary.cpp
+++ b/src/plugin/calLibrary/calLibrary.cpp
@@ -127,7 +127,7 @@ BOOL __stdcall CallbackProc(HWND, unsigned int _uMsg, unsigned int _uState, void
 \r
                                // EXTRACTINGINFOEXW -> TPI_PROCESSINFO\95Ï\8a·\81B\r
                                piInfo.llProcessedSize          = ex->exinfo.dwWriteSize;\r
-                               piInfo.fnDestination            = wxFileName::FileName(WC2String(ex->exinfo.szDestFileName));\r
+                               piInfo.fnDestination            = wxFileName(WC2String(ex->exinfo.szDestFileName));\r
                        }\r
                        else\r
                        {\r
@@ -146,7 +146,7 @@ BOOL __stdcall CallbackProc(HWND, unsigned int _uMsg, unsigned int _uState, void
 \r
                                // EXTRACTINGINFOEX -> TPI_PROCESSINFO\95Ï\8a·\81B\r
                                piInfo.llProcessedSize          = ex->exinfo.dwWriteSize;\r
-                               piInfo.fnDestination            = wxFileName::FileName(UTF82String(ex->exinfo.szDestFileName));\r
+                               piInfo.fnDestination            = wxFileName(UTF82String(ex->exinfo.szDestFileName));\r
                        }\r
                        piInfo.fiInfo.dwAttribute       = 0;\r
                }\r
@@ -172,7 +172,7 @@ BOOL __stdcall CallbackProc(HWND, unsigned int _uMsg, unsigned int _uState, void
 \r
                                // EXTRACTINGINFOEX64 -> TPI_PROCESSINFO\95Ï\8a·\81B\r
                                piInfo.llProcessedSize          = ex->llWriteSize;\r
-                               piInfo.fnDestination            = wxFileName::FileName(WC2String(ex->exinfo.szDestFileName));\r
+                               piInfo.fnDestination            = wxFileName(WC2String(ex->exinfo.szDestFileName));\r
                        }\r
                        else\r
                        {\r
@@ -194,10 +194,10 @@ BOOL __stdcall CallbackProc(HWND, unsigned int _uMsg, unsigned int _uState, void
 \r
                                // EXTRACTINGINFOEX64 -> TPI_PROCESSINFO\95Ï\8a·\81B\r
                                piInfo.llProcessedSize          = ex->llWriteSize;\r
-                               piInfo.fnDestination            = wxFileName::FileName(UTF82String(ex->exinfo.szDestFileName));\r
+                               piInfo.fnDestination            = wxFileName(UTF82String(ex->exinfo.szDestFileName));\r
                        }\r
                }\r
-               piInfo.fiInfo.fnFileName        = wxFileName::FileName(piInfo.fiInfo.szStoredName);\r
+               piInfo.fiInfo.fnFileName        = wxFileName(piInfo.fiInfo.szStoredName);\r
        }\r
 \r
        // \90\94\8e\9a\82Ì\8f\87\82Å\82È\82­\8f\88\97\9d\82Ì\8f\87\82Å\95À\82ñ\82Å\82¢\82é\82±\82Æ\82É\92\8d\88Ó\81B\r
@@ -700,7 +700,7 @@ int __stdcall GetFileInformation
                        _fiInfo->wCompressRatio = iiInfo.wRatio;\r
                }\r
                _fiInfo->llFileID       = s_uFileID++;\r
-               _fiInfo->fnFileName     = wxFileName::FileName(_fiInfo->szStoredName);\r
+               _fiInfo->fnFileName     = wxFileName(_fiInfo->szStoredName);\r
 //             _fiInfo->ftAccessTime   = 0;\r
 //             _fiInfo->ftCreateTime   = 0;\r
        }\r
@@ -731,7 +731,7 @@ int __stdcall GetArchiveInformation
                        ((int (__stdcall *)(void *, char *, const int)) fpProc)(_hArchive, sz, 2048);\r
                        s = UTF82String(sz);\r
                }\r
-               _aiInfo->fnArchive = wxFileName::FileName(s);\r
+               _aiInfo->fnArchive = wxFileName(s);\r
        }\r
 \r
        fpProc = ::GetAPIAddress("GetArcFileSizeEx", false);\r

diff --git a/src/plugin/spiLibrary/spiLibrary.cpp b/src/plugin/spiLibrary/spiLibrary.cpp
index fa533e8..3173f75 100644 (file)
--- a/src/plugin/spiLibrary/spiLibrary.cpp
+++ b/src/plugin/spiLibrary/spiLibrary.cpp
@@ -319,7 +319,7 @@ int __stdcall GetFileInformation
        _fiInfo->llFileID       = uFilePointer++;\r
        _fiInfo->tmModified     = pfiInfo.timestamp;\r
        _fiInfo->szStoredName   = MB2String(pfiInfo.path) + MB2String(pfiInfo.filename);\r
-       _fiInfo->fnFileName     = wxFileName::FileName(_fiInfo->szStoredName);\r
+       _fiInfo->fnFileName     = wxFileName(_fiInfo->szStoredName);\r
        _fiInfo->szMethod       = MB2String((char *) pfiInfo.method);\r
        _fiInfo->pCustomInfo    = (void *) pfiInfo.position;\r
        ::LocalUnlock(_hArchive);\r