Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make naming homogeneous in xml file

Browse Source 
No more dummy surprises.

Close #5276
This commit is contained in:
Rajendra Singh 2019-01-28 19:54:41 +05:30 committed by Don HO
parent ae980ce4d4
commit eb8eb25799
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/EncodingMapper.h
View File

@ -44,6 +44,6 @@ private:
EncodingMapper(){}; EncodingMapper(){};
~EncodingMapper(){}; ~EncodingMapper(){};
static EncodingMapper *_pSelf; static EncodingMapper *_pSelf;
EncodingUnit *_encodings; EncodingUnit* _encodings = nullptr;
}; };

1
PowerEditor/src/MISC/Common/Common.h
View File

@ -63,6 +63,7 @@ const bool dirDown = false;
#define generic_fopen _wfopen #define generic_fopen _wfopen
#define generic_fgets fgetws #define generic_fgets fgetws
#define COPYDATA_FILENAMES COPYDATA_FILENAMESW #define COPYDATA_FILENAMES COPYDATA_FILENAMESW
#define NPP_INTERNAL_FUCTION_STR TEXT("Notepad++::InternalFunction")
typedef std::basic_string<TCHAR> generic_string; typedef std::basic_string<TCHAR> generic_string;
typedef std::basic_stringstream<TCHAR> generic_stringstream; typedef std::basic_stringstream<TCHAR> generic_stringstream;

2
PowerEditor/src/Notepad_plus.cpp
View File

@ -57,8 +57,6 @@ enum tb_stat {tb_saved, tb_unsaved, tb_ro};
#define DIR_LEFT true #define DIR_LEFT true
#define DIR_RIGHT false #define DIR_RIGHT false
#define NPP_INTERNAL_FUCTION_STR TEXT("Notepad++::InternalFunction")
int docTabIconIDs[] = {IDI_SAVED_ICON, IDI_UNSAVED_ICON, IDI_READONLY_ICON, IDI_MONITORING_ICON}; int docTabIconIDs[] = {IDI_SAVED_ICON, IDI_UNSAVED_ICON, IDI_READONLY_ICON, IDI_MONITORING_ICON};
ToolBarButtonUnit toolBarIcons[] = { ToolBarButtonUnit toolBarIcons[] = {

4
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -2184,7 +2184,7 @@ void FindReplaceDlg::findAllIn(InWhat op)
data.hIconTab = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); data.hIconTab = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszAddInfo = _findAllResultStr; data.pszAddInfo = _findAllResultStr;
data.pszModuleName = TEXT("dummy"); data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is // the dlgDlg should be the index of funcItem where the current function pointer is
// in this case is DOCKABLE_DEMO_INDEX // in this case is DOCKABLE_DEMO_INDEX
@ -2276,7 +2276,7 @@ Finder * FindReplaceDlg::createFinder()
data.hIconTab = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); data.hIconTab = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszAddInfo = _findAllResultStr; data.pszAddInfo = _findAllResultStr;
data.pszModuleName = TEXT("dummy"); data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is // the dlgDlg should be the index of funcItem where the current function pointer is
// in this case is DOCKABLE_DEMO_INDEX // in this case is DOCKABLE_DEMO_INDEX