From 5813e4d8e6c1e8ae8f92bc1fab90f9647303f09c Mon Sep 17 00:00:00 2001 From: Don HO Date: Tue, 10 Nov 2020 14:08:33 +0100 Subject: [PATCH] Clean up --- PowerEditor/src/Notepad_plus.cpp | 2 +- PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp | 4 ---- .../src/WinControls/FunctionList/functionListPanel.cpp | 1 - PowerEditor/src/WinControls/FunctionList/functionListPanel.h | 1 + 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 58ff3d2d..0ad5cf4a 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -6666,7 +6666,7 @@ void Notepad_plus::launchFunctionList() data.dlgID = IDM_VIEW_FUNC_LIST; NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); - generic_string title_temp = pNativeSpeaker->getAttrNameStr(FL_PANELTITLE, "FunctionList", "PanelTitle"); + generic_string title_temp = pNativeSpeaker->getAttrNameStr(FL_PANELTITLE, FL_FUCTIONLISTROOTNODE, "PanelTitle"); static TCHAR title[32]; if (title_temp.length() < 32) diff --git a/PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp b/PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp index 3451d823..5d7459e1 100644 --- a/PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp +++ b/PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp @@ -57,10 +57,6 @@ #define FB_CMD_FOLDALL 2 #define FB_CMD_EXPANDALL 3 -#define FB_TIPEXPANDALLFOLDERS -#define FB_TIPEXPANDALLFOLDERS -#define FB_TIPCOLLAPSEALLFOLDERS -#define FB_TIPLOCATECURRENTFILE FileBrowser::~FileBrowser() { diff --git a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp index 9ac26a87..4a21d101 100644 --- a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp +++ b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp @@ -41,7 +41,6 @@ using namespace std; #define INDEX_NODE 1 #define INDEX_LEAF 2 -#define FL_FUCTIONLISTROOTNODE "FunctionList" #define FL_SORTLOCALNODENAME "SortTip" #define FL_RELOADLOCALNODENAME "ReloadTip" diff --git a/PowerEditor/src/WinControls/FunctionList/functionListPanel.h b/PowerEditor/src/WinControls/FunctionList/functionListPanel.h index 0eee159b..6a235372 100644 --- a/PowerEditor/src/WinControls/FunctionList/functionListPanel.h +++ b/PowerEditor/src/WinControls/FunctionList/functionListPanel.h @@ -33,6 +33,7 @@ #include "TreeView.h" #define FL_PANELTITLE TEXT("Function List") +#define FL_FUCTIONLISTROOTNODE "FunctionList" class ScintillaEditView;