定数名を変更。

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

diff --git a/src/lychee/dlg_make.cpp b/src/lychee/dlg_make.cpp
index 2ee8135..b4f1b91 100644 (file)
--- a/src/lychee/dlg_make.cpp
+++ b/src/lychee/dlg_make.cpp
@@ -97,7 +97,7 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
        this->lcFiles->InsertColumn(0, wxT("Input"),  wxLIST_FORMAT_LEFT,  150);
        this->lcFiles->InsertColumn(1, wxT("Output"), wxLIST_FORMAT_LEFT,  300);
 
-       ::wxXmlResource::Get()->Unload(FE_DIR_S_XRC wxT("dlg_make.xrc"));
+       ::wxXmlResource::Get()->Unload(L_DIR_S_XRC wxT("dlg_make.xrc"));
 
        // \93W\8aJ\8e\9e\82Í\8ae\8eí\83R\83\93\83g\83\8d\81[\83\8b\82Ì\8fó\91Ô\82ð\95Ï\8dX\82·\82é\81B
        if (! this->bIsMake)
@@ -133,7 +133,7 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
        // \83\89\83C\83u\83\89\83\8a\82ð\8c\9f\8dõ\81B
        TPIHandle tpi;
        wxFileSystem fs;
-       fs.ChangePathTo(FE_DIR_B_LIB, true);
+       fs.ChangePathTo(L_DIR_B_LIB, true);
        wxString szTPIName = fs.FindFirst(wxT("*" TPI_EXT), wxFILE);
        while (! szTPIName.IsEmpty())
        {

diff --git a/src/lychee/dlg_process.cpp b/src/lychee/dlg_process.cpp
index bf943aa..2ec5f6a 100644 (file)
--- a/src/lychee/dlg_process.cpp
+++ b/src/lychee/dlg_process.cpp
@@ -30,7 +30,7 @@ ProcessDialog * g_procDlg = NULL;
 
 ProcessDialog::ProcessDialog(): wxDialog()
 {
-       ::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_process.xrc"));
+       ::wxXmlResource::Get()->Load(L_DIR_S_XRC wxT("dlg_process.xrc"));
        ::wxXmlResource::Get()->LoadDialog(this, this->GetParent(), wxT("dlg_process"));        
 }
 
@@ -61,7 +61,7 @@ void ProcessDialog::OnInit(wxInitDialogEvent &)
        this->fCancel           = false;
        g_procDlg = this;
 
-       ::wxXmlResource::Get()->Unload(FE_DIR_S_XRC wxT("dlg_process.xrc"));
+       ::wxXmlResource::Get()->Unload(L_DIR_S_XRC wxT("dlg_process.xrc"));
 }
 
 void ProcessDialog::OnClose(wxCloseEvent & e)

diff --git a/src/lychee/frm_main.cpp b/src/lychee/frm_main.cpp
index 9cc8ef6..7b8104b 100644 (file)
--- a/src/lychee/frm_main.cpp
+++ b/src/lychee/frm_main.cpp
@@ -45,7 +45,7 @@ bool g_fSortAscend;
 // MainFrame
 //******************************************************************************
 
-MainFrame::MainFrame(): wxFrame(), conf(wxEmptyString, wxEmptyString, FE_DIR_BIN wxT("lychee.conf"), wxEmptyString, wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_RELATIVE_PATH)
+MainFrame::MainFrame(): wxFrame(), conf(wxEmptyString, wxEmptyString, L_DIR_BIN wxT("lychee.conf"), wxEmptyString, wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_RELATIVE_PATH)
 {
 }
 
@@ -148,7 +148,7 @@ void MainFrame::OnInit(wxInitDialogEvent&)
        // \8f\89\8aú\92l\90Ý\92è\81B
        {
                wxIcon icon;
-               icon.CopyFromBitmap(wxBitmap(FE_DIR_S_ICO wxT("app.png"), wxBITMAP_TYPE_ANY));
+               icon.CopyFromBitmap(wxBitmap(L_DIR_S_ICO wxT("app.png"), wxBITMAP_TYPE_ANY));
                this->SetIcon(icon);
        }
        wxCommandEvent e;
@@ -228,7 +228,7 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
 
        // \8dì\90¬\83_\83C\83A\83\8d\83O\82ð\90Ý\92è\81B
        MakeDialog mkDlg;
-       ::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_make.xrc"));
+       ::wxXmlResource::Get()->Load(L_DIR_S_XRC wxT("dlg_make.xrc"));
        ::wxXmlResource::Get()->LoadDialog(& mkDlg, this, wxT("dlg_make"));
 
        if (e.GetClientData() == NULL)
@@ -397,8 +397,8 @@ void MainFrame::OnArcOpen(wxCommandEvent& e)
        }
 
        // \8f\91\8cÉ\82Ì\83A\83C\83R\83\93\82ð\8eæ\93¾\82µ\81A\8f\91\8cÉ\83\8b\81[\83g\82ð\8dì\90¬\81B
-       g_hIconT.Add(wxBitmap(FE_DIR_S_ICO wxT("folder_closed.png"), wxBITMAP_TYPE_ANY));
-       g_hIconT.Add(wxBitmap(FE_DIR_S_ICO wxT("folder_open.png"), wxBITMAP_TYPE_ANY));
+       g_hIconT.Add(wxBitmap(L_DIR_S_ICO wxT("folder_closed.png"), wxBITMAP_TYPE_ANY));
+       g_hIconT.Add(wxBitmap(L_DIR_S_ICO wxT("folder_open.png"), wxBITMAP_TYPE_ANY));
        this->tree_ctrl->SetImageList(& g_hIconT);
        wxTreeItemId
                idRoot = this->tree_ctrl->AddRoot(wxEmptyString),
@@ -614,7 +614,7 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
 
        // \93W\8aJ\83_\83C\83A\83\8d\83O\82ð\8dì\90¬\81BDnD\82Ü\82½\82Í\8eÀ\8ds\8e\9e\82Í\95\\8e¦\82µ\82È\82¢\81B
        MakeDialog mkDlg;
-       ::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_make.xrc"));
+       ::wxXmlResource::Get()->Load(L_DIR_S_XRC wxT("dlg_make.xrc"));
        ::wxXmlResource::Get()->LoadDialog(& mkDlg, this, wxT("dlg_make"));
        mkDlg.bIsMake = false;
        mkDlg.files   = MakeTargetFileList(this, nMode == 1);
@@ -942,7 +942,7 @@ int MainFrame::LoadTPI(wxString szFileName)
 {
        // TPI\82ð\93Ç\82Ý\8d\9e\82Ý\81B
        wxFileSystem fs;
-       fs.ChangePathTo(FE_DIR_B_LIB, true);
+       fs.ChangePathTo(L_DIR_B_LIB, true);
        wxString szTPIName = fs.FindFirst(wxT("*" TPI_EXT), wxFILE);
        int nFileCount = -1;
        while (! szTPIName.IsEmpty())

diff --git a/src/lychee/functions.cpp b/src/lychee/functions.cpp
index 4a1255c..47c0832 100644 (file)
--- a/src/lychee/functions.cpp
+++ b/src/lychee/functions.cpp
@@ -240,7 +240,7 @@ wxIcon GetFileTypeIcon(wxFileName fn)
        {\r
                if (! ::wxFileExists(ilFile.GetFileName()))\r
                {\r
-                       icon.CopyFromBitmap(wxBitmap((ilFile.GetFileName() == wxT("%1") || ilFile.GetFileName() == wxT("\"%1\"")) ? FE_DIR_S_ICO wxT("exe.png") : FE_DIR_S_ICO wxT("file.png"), wxBITMAP_TYPE_ANY));\r
+                       icon.CopyFromBitmap(wxBitmap((ilFile.GetFileName() == wxT("%1") || ilFile.GetFileName() == wxT("\"%1\"")) ? L_DIR_S_ICO wxT("exe.png") : L_DIR_S_ICO wxT("file.png"), wxBITMAP_TYPE_ANY));\r
                }\r
                else\r
                {\r
@@ -249,7 +249,7 @@ wxIcon GetFileTypeIcon(wxFileName fn)
        }\r
        else\r
        {\r
-               icon.CopyFromBitmap(wxBitmap(FE_DIR_S_ICO wxT("file.png"), wxBITMAP_TYPE_ANY));\r
+               icon.CopyFromBitmap(wxBitmap(L_DIR_S_ICO wxT("file.png"), wxBITMAP_TYPE_ANY));\r
        }\r
        return icon;\r
 }\r

diff --git a/src/lychee/lychee.cpp b/src/lychee/lychee.cpp
index f270d40..53ce0e5 100644 (file)
--- a/src/lychee/lychee.cpp
+++ b/src/lychee/lychee.cpp
@@ -50,14 +50,14 @@ bool Lychee::OnInit()
 
        MainFrame * frm_main = new MainFrame();
        frm_main->szCurrentPath = szCwd;
-       if (! ::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("frm_main.xrc")))
+       if (! ::wxXmlResource::Get()->Load(L_DIR_S_XRC wxT("frm_main.xrc")))
        {
                ::ErrDlg(wxT("Unable to find XRC!"), NULL);
                return false;
        }
 
        ::wxXmlResource::Get()->LoadFrame(frm_main, NULL, wxT("frame_main"));
-       ::wxXmlResource::Get()->Unload(FE_DIR_S_XRC wxT("frm_main.xrc"));
+       ::wxXmlResource::Get()->Unload(L_DIR_S_XRC wxT("frm_main.xrc"));
        SetTopWindow(frm_main);
        frm_main->cmdLine.SetCmdLine(this->argc, this->argv);
        frm_main->InitDialog();

diff --git a/src/lychee/lychee.h b/src/lychee/lychee.h
index 90806c7..d8d15bb 100644 (file)
--- a/src/lychee/lychee.h
+++ b/src/lychee/lychee.h
@@ -46,11 +46,11 @@ WX_DECLARE_OBJARRAY(TPI_FILEINFO, ArrayTPI_FILEINFO);
 #define EXE_EXT (wxString) wxEmptyString\r
 #endif\r
 \r
-#define FE_DIR_BIN wxT("./")\r
-#define FE_DIR_SHR wxT("../share/")\r
-#define FE_DIR_B_LIB FE_DIR_BIN wxT("lib/")\r
-#define FE_DIR_S_XRC FE_DIR_SHR wxT("xrc/")\r
-#define FE_DIR_S_ICO FE_DIR_SHR wxT("ico/")\r
+#define L_DIR_BIN wxT("./")\r
+#define L_DIR_SHR wxT("../share/")\r
+#define L_DIR_B_LIB L_DIR_BIN wxT("lib/")\r
+#define L_DIR_S_XRC L_DIR_SHR wxT("xrc/")\r
+#define L_DIR_S_ICO L_DIR_SHR wxT("ico/")\r
 \r
 #define MsgDlg(msg, parent, flag) wxMessageBox(msg, wxT("Lychee"), wxCENTRE | flag, parent)\r
 #define ErrDlg(msg, parent) MsgDlg(wxT("Error: ") msg, parent, wxOK | wxICON_ERROR)\r