Linux上でのコンパイルエラーを修正。

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

diff --git a/src/lychee/cls_filedroptarget.cpp b/src/lychee/cls_filedroptarget.cpp
index 75efd5a..0e9abb2 100644 (file)
--- a/src/lychee/cls_filedroptarget.cpp
+++ b/src/lychee/cls_filedroptarget.cpp
@@ -1,4 +1,4 @@
-/*******************************************************************************\r
+/*******************************************************************************\r
   TPI - flexible but useless plug-in framework.\r
   Copyright (C) 2002-2009 Silky\r
 \r
@@ -64,7 +64,7 @@ bool myFileDropTarget::OnDropFiles(wxCoord, wxCoord, const wxArrayString & asFil
 #if wxCHECK_VERSION(2, 9, 0)\r
                        ::wxQueueEvent(this->mainFrame, e);\r
 #else\r
-                       this->mainFrame->OnArcOpen(e);\r
+                       this->mainFrame->OnArcOpen(* e);\r
                        delete e;\r
 #endif\r
                        return true;\r
@@ -82,7 +82,7 @@ bool myFileDropTarget::OnDropFiles(wxCoord, wxCoord, const wxArrayString & asFil
 #if wxCHECK_VERSION(2, 9, 0)\r
        ::wxQueueEvent(this->mainFrame, e);\r
 #else\r
-       this->mainFrame->OnArcCreate(e);\r
+       this->mainFrame->OnArcCreate(* e);\r
        delete e;\r
 #endif\r
        return true;\r
@@ -97,7 +97,7 @@ myFileDataObject::~myFileDataObject()
        // ファイルを削除。\r
        for (size_t i = 0; i < this->m_filenames.GetCount(); i++)\r
        {\r
-               chmod(this->m_filenames[i], 0600);\r
+               chmod(this->m_filenames[i].ToUTF8(), 0600);\r
                ::wxRemoveFile(this->m_filenames[i]);\r
        }\r
 \r

diff --git a/src/lychee/frm_main.cpp b/src/lychee/frm_main.cpp
index 1e87772..e718948 100644 (file)
--- a/src/lychee/frm_main.cpp
+++ b/src/lychee/frm_main.cpp
@@ -1,4 +1,4 @@
-/*******************************************************************************\r
+/*******************************************************************************\r
   TPI - flexible but useless plug-in framework.\r
   Copyright (C) 2002-2009 Silky\r
 \r
@@ -311,6 +311,7 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
        }\r
 \r
        // 終了しない場合は書庫を開く。\r
+       e.SetInt(1);\r
        this->OnArcOpen(e);\r
 }\r
 \r
@@ -615,6 +616,7 @@ void MainFrame::OnArcAdd(wxCommandEvent& e)
        }\r
 \r
        // 終了しない場合は書庫を再読み込み。\r
+       e.SetInt(1);\r
        this->OnArcOpen(e);\r
 }\r
 \r
@@ -818,7 +820,7 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
                                {\r
                                        for (size_t i = 0; i < asFiles.GetCount(); i++)\r
                                        {\r
-                                               chmod(asFiles[i], 0600);\r
+                                               chmod(asFiles[i].ToUTF8(), 0600);\r
                                                ::wxRemoveFile(asFiles[i]);\r
                                        }\r
                                }\r
@@ -865,6 +867,7 @@ void MainFrame::OnArcDelete(wxCommandEvent& e)
        }\r
 \r
        // 書庫を再読み込みする。\r
+       e.SetInt(1);\r
        this->OnArcOpen(e);\r
 }\r
 \r

diff --git a/src/lychee/functions.cpp b/src/lychee/functions.cpp
index 06ca65a..049f781 100644 (file)
--- a/src/lychee/functions.cpp
+++ b/src/lychee/functions.cpp
@@ -1,4 +1,4 @@
-/*******************************************************************************\r
+/*******************************************************************************\r
   TPI - flexible but useless plug-in framework.\r
   Copyright (C) 2002-2009 Silky\r
 \r
@@ -266,7 +266,7 @@ wxString QuoteString(const wxString & s)
 \r
 void myProcess::OnTerminate(int, int)\r
 {\r
-       chmod(this->szFile, 0600);\r
+       chmod(this->szFile.ToUTF8(), 0600);\r
        ::wxRemoveFile(this->szFile);\r
        ::wxRmdir(this->szDir);\r
        delete this;\r

diff --git a/src/lychee/lychee.cpp b/src/lychee/lychee.cpp
index 32f90ef..f8003eb 100644 (file)
--- a/src/lychee/lychee.cpp
+++ b/src/lychee/lychee.cpp
@@ -1,4 +1,4 @@
-/*******************************************************************************\r
+/*******************************************************************************\r
   TPI - flexible but useless plug-in framework.\r
   Copyright (C) 2002-2009 Silky\r
 \r
@@ -82,6 +82,7 @@ bool Lychee::OnInit()
 \r
        // 書庫を開く。\r
        wxCommandEvent e;\r
+       e.SetInt(1);\r
        frm_main->fnArchive = wxFileName(cmdLine.GetParam(0));\r
        frm_main->fnArchive.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG, szCwd);\r
        frm_main->OnArcOpen(e);\r