wxGTK用のアイコンリサイズ処理を統合。

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

diff --git a/src/lychee/cls_listctrl.cpp b/src/lychee/cls_listctrl.cpp
index 23df9f1..2bfdb8b 100644 (file)
--- a/src/lychee/cls_listctrl.cpp
+++ b/src/lychee/cls_listctrl.cpp
@@ -95,12 +95,7 @@ int myListCtrl::OnGetItemImage(long i) const
 {\r
        wxIcon icon = GetFileTypeIcon(((TPI_FILEINFO *) this->apShowFile[i])->fnFileName);\r
        g_hIconLL.Add(icon);\r
-       // wxGTKで16x16のアイコンが表示できるようリサイズしておく。\r
-#ifdef __WINDOWS__\r
-       return g_hIconLS.Add(icon);\r
-#else\r
-       return g_hIconLS.Add(icon.ConvertToImage().Rescale(16, 16));\r
-#endif\r
+       return g_hIconLS.Add(myRescaleIcon(icon));\r
 }\r
 \r
 wxListItemAttr * myListCtrl::OnGetItemAttr(long i) const\r

diff --git a/src/lychee/frm_main.cpp b/src/lychee/frm_main.cpp
index 3aae957..054449e 100644 (file)
--- a/src/lychee/frm_main.cpp
+++ b/src/lychee/frm_main.cpp
@@ -368,12 +368,8 @@ void MainFrame::OnArcOpen(wxCommandEvent& e)
        g_hIconT.Add(wxBitmap(L_DIR_S_ICO wxT("folder_open.png"), wxBITMAP_TYPE_ANY));\r
        this->tree_ctrl->SetImageList(& g_hIconT);\r
        wxTreeItemId\r
-               idRoot = this->tree_ctrl->AddRoot(wxEmptyString),\r
-#ifdef __WINDOWS__\r
-               idArchive = this->tree_ctrl->AppendItem(idRoot, this->fnArchive.GetFullName(), g_hIconT.Add(GetFileTypeIcon(this->fnArchive))),\r
-#else\r
-               idArchive = this->tree_ctrl->AppendItem(idRoot, this->fnArchive.GetFullName(), g_hIconT.Add(GetFileTypeIcon(this->fnArchive).ConvertToImage().Rescale(16, 16))),\r
-#endif\r
+               idRoot    = this->tree_ctrl->AddRoot(wxEmptyString),\r
+               idArchive = this->tree_ctrl->AppendItem(idRoot, this->fnArchive.GetFullName(), g_hIconT.Add(myRescaleIcon(GetFileTypeIcon(this->fnArchive)))),\r
                idArcRoot = this->tree_ctrl->AppendItem(idRoot, wxT("-----"), 0, 1);\r
 \r
        // 巨大書庫のときにファイル名検査を省略するか。\r

diff --git a/src/lychee/lychee.h b/src/lychee/lychee.h
index e1ff27e..ef52b1f 100644 (file)
--- a/src/lychee/lychee.h
+++ b/src/lychee/lychee.h
@@ -42,10 +42,13 @@
 #define TPI_EXT wxT(".dll")\r
 #define EXE_EXT wxT(".exe")\r
 #define DIR_APP wxT("explorer ")\r
+#define myRescaleIcon(ico) ico\r
 #else\r
 #define TPI_EXT wxT(".so")\r
 #define EXE_EXT (wxString) wxEmptyString\r
 #define DIR_APP wxT("dolphin ")\r
+// wxGTK\82Å16x16\82Ì\83A\83C\83R\83\93\82ª\95\\8e¦\82Å\82«\82é\82æ\82¤\83\8a\83T\83C\83Y\82µ\82Ä\82¨\82­\81B\r
+#define myRescaleIcon(ico) ico.ConvertToImage().Rescale(16, 16)\r
 #endif\r
 \r
 #define L_DIR_BIN wxT("./")\r