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

[UPDATE] Unprecompile headers (part 2)

Browse Source
This commit is contained in:
Don Ho 2015-05-31 22:40:07 +02:00
parent b35e759d11
commit e9e710a3d4
77 changed files with 273 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PowerEditor/src/MISC/Common/Sorters.h
View File

@ -26,8 +26,10 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#ifndef M30_IDE_SORTERS_H #ifndef NPP_SORTERS_H
#define M30_IDE_SORTERS_H #define NPP_SORTERS_H
#include <algorithm>
// Base interface for line sorting. // Base interface for line sorting.
class ISorter class ISorter
@ -259,4 +261,4 @@ protected:
} }
}; };
#endif //M30_IDE_SORTERS_H #endif //NPP_SORTERS_H

2
PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
View File

@ -29,6 +29,8 @@
#ifndef NOTEPAD_PLUS_MSGS_H #ifndef NOTEPAD_PLUS_MSGS_H
#define NOTEPAD_PLUS_MSGS_H #define NOTEPAD_PLUS_MSGS_H
#include <windows.h>
#include <tchar.h>
enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\ enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\
L_HTML, L_XML, L_MAKEFILE, L_PASCAL, L_BATCH, L_INI, L_ASCII, L_USER,\ L_HTML, L_XML, L_MAKEFILE, L_PASCAL, L_BATCH, L_INI, L_ASCII, L_USER,\

2
PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
View File

@ -30,6 +30,8 @@
#include "PluginsManager.h" #include "PluginsManager.h"
#include "resource.h" #include "resource.h"
using namespace std;
const TCHAR * USERMSG = TEXT("This plugin is not compatible with current version of Notepad++.\n\n\ const TCHAR * USERMSG = TEXT("This plugin is not compatible with current version of Notepad++.\n\n\
Do you want to remove this plugin from plugins directory to prevent this message from the next launch time?"); Do you want to remove this plugin from plugins directory to prevent this message from the next launch time?");

8
PowerEditor/src/MISC/PluginsManager/PluginsManager.h
View File

@ -97,7 +97,7 @@ public:
_nppData = nppData; _nppData = nppData;
}; };
int loadPlugin(const TCHAR *pluginFilePath, vector<generic_string> & dll2Remove); int loadPlugin(const TCHAR *pluginFilePath, std::vector<generic_string> & dll2Remove);
bool loadPlugins(const TCHAR *dir = NULL); bool loadPlugins(const TCHAR *dir = NULL);
bool unloadPlugin(int index, HWND nppHandle); bool unloadPlugin(int index, HWND nppHandle);
@ -129,9 +129,9 @@ private:
NppData _nppData; NppData _nppData;
HMENU _hPluginsMenu; HMENU _hPluginsMenu;
vector<PluginInfo *> _pluginInfos; std::vector<PluginInfo *> _pluginInfos;
vector<PluginCommand> _pluginsCommands; std::vector<PluginCommand> _pluginsCommands;
vector<generic_string> _loadedDlls; std::vector<generic_string> _loadedDlls;
bool _isDisabled; bool _isDisabled;
IDAllocator _dynamicIDAlloc; IDAllocator _dynamicIDAlloc;
IDAllocator _markerAlloc; IDAllocator _markerAlloc;

2
PowerEditor/src/MISC/Process/Process.h
View File

@ -29,8 +29,6 @@
#ifndef PROCESSUS_H #ifndef PROCESSUS_H
#define PROCESSUS_H #define PROCESSUS_H
using namespace std;
enum progType {WIN32_PROG, CONSOLE_PROG}; enum progType {WIN32_PROG, CONSOLE_PROG};
class Process class Process

2
PowerEditor/src/Notepad_plus.cpp
View File

@ -48,6 +48,8 @@
#include "documentMap.h" #include "documentMap.h"
#include "functionListPanel.h" #include "functionListPanel.h"
using namespace std;
enum tb_stat {tb_saved, tb_unsaved, tb_ro}; 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

12
PowerEditor/src/Notepad_plus.h
View File

@ -296,7 +296,7 @@ public:
bool findInFiles(); bool findInFiles();
bool replaceInFiles(); bool replaceInFiles();
void setFindReplaceFolderFilter(const TCHAR *dir, const TCHAR *filters); void setFindReplaceFolderFilter(const TCHAR *dir, const TCHAR *filters);
vector<generic_string> addNppComponents(const TCHAR *destDir, const TCHAR *extFilterName, const TCHAR *extFilter); std::vector<generic_string> addNppComponents(const TCHAR *destDir, const TCHAR *extFilterName, const TCHAR *extFilter);
int getHtmlXmlEncoding(const TCHAR *fileName) const; int getHtmlXmlEncoding(const TCHAR *fileName) const;
HACCEL getAccTable() const{ HACCEL getAccTable() const{
return _accelerator.getAccTable(); return _accelerator.getAccTable();
@ -314,7 +314,7 @@ private:
Notepad_plus_Window *_pPublicInterface; Notepad_plus_Window *_pPublicInterface;
Window *_pMainWindow; Window *_pMainWindow;
DockingManager _dockingManager; DockingManager _dockingManager;
vector<int> _internalFuncIDs; std::vector<int> _internalFuncIDs;
AutoCompletion _autoCompleteMain; AutoCompletion _autoCompleteMain;
AutoCompletion _autoCompleteSub; //each Scintilla has its own autoComplete AutoCompletion _autoCompleteSub; //each Scintilla has its own autoComplete
@ -358,7 +358,7 @@ private:
FindCharsInRangeDlg _findCharsInRangeDlg; FindCharsInRangeDlg _findCharsInRangeDlg;
// a handle list of all the Notepad++ dialogs // a handle list of all the Notepad++ dialogs
vector<HWND> _hModelessDlgs; std::vector<HWND> _hModelessDlgs;
LastRecentFileList _lastRecentFileList; LastRecentFileList _lastRecentFileList;
@ -422,7 +422,7 @@ private:
ScintillaCtrls _scintillaCtrls4Plugins; ScintillaCtrls _scintillaCtrls4Plugins;
vector<pair<int, int> > _hideLinesMarks; std::vector<std::pair<int, int> > _hideLinesMarks;
StyleArray _hotspotStyles; StyleArray _hotspotStyles;
AnsiCharPanel *_pAnsiCharPanel; AnsiCharPanel *_pAnsiCharPanel;
@ -594,8 +594,8 @@ private:
bool findInOpenedFiles(); bool findInOpenedFiles();
bool findInCurrentFile(); bool findInCurrentFile();
bool matchInList(const TCHAR *fileName, const vector<generic_string> & patterns); bool matchInList(const TCHAR *fileName, const std::vector<generic_string> & patterns);
void getMatchedFileNames(const TCHAR *dir, const vector<generic_string> & patterns, vector<generic_string> & fileNames, bool isRecursive, bool isInHiddenDir); void getMatchedFileNames(const TCHAR *dir, const std::vector<generic_string> & patterns, std::vector<generic_string> & fileNames, bool isRecursive, bool isInHiddenDir);
void doSynScorll(HWND hW); void doSynScorll(HWND hW);
void setWorkingDir(const TCHAR *dir); void setWorkingDir(const TCHAR *dir);

6
PowerEditor/src/Notepad_plus_Window.cpp
View File

@ -159,14 +159,14 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
_notepad_plus_plus_core.loadCommandlineParams(cmdLine, cmdLineParams); _notepad_plus_plus_core.loadCommandlineParams(cmdLine, cmdLineParams);
} }
vector<generic_string> fileNames; std::vector<generic_string> fileNames;
vector<generic_string> patterns; std::vector<generic_string> patterns;
patterns.push_back(TEXT("*.xml")); patterns.push_back(TEXT("*.xml"));
generic_string nppDir = pNppParams->getNppPath(); generic_string nppDir = pNppParams->getNppPath();
LocalizationSwitcher & localizationSwitcher = pNppParams->getLocalizationSwitcher(); LocalizationSwitcher & localizationSwitcher = pNppParams->getLocalizationSwitcher();
wstring localizationDir = nppDir; std::wstring localizationDir = nppDir;
PathAppend(localizationDir, TEXT("localization\\")); PathAppend(localizationDir, TEXT("localization\\"));
_notepad_plus_plus_core.getMatchedFileNames(localizationDir.c_str(), patterns, fileNames, false, false); _notepad_plus_plus_core.getMatchedFileNames(localizationDir.c_str(), patterns, fileNames, false, false);

2
PowerEditor/src/Notepad_plus_Window.h
View File

@ -99,7 +99,7 @@ private:
static const TCHAR _className[32]; static const TCHAR _className[32];
bool _isPrelaunch; bool _isPrelaunch;
bool _disablePluginsManager; bool _disablePluginsManager;
string _userQuote; // keep the availability of this string for thread using std::string _userQuote; // keep the availability of this string for thread using
}; };
#endif //NOTEPAD_PLUS_WINDOW_H #endif //NOTEPAD_PLUS_WINDOW_H

2
PowerEditor/src/NppBigSwitch.cpp
View File

@ -38,6 +38,8 @@
#include "documentMap.h" #include "documentMap.h"
#include "functionListPanel.h" #include "functionListPanel.h"
using namespace std;
#define WM_DPICHANGED 0x02E0 #define WM_DPICHANGED 0x02E0
struct SortTaskListPred struct SortTaskListPred

1
PowerEditor/src/NppCommands.cpp
View File

@ -38,6 +38,7 @@
#include "Sorters.h" #include "Sorters.h"
#include "LongRunningOperation.h" #include "LongRunningOperation.h"
using namespace std;
void Notepad_plus::macroPlayback(Macro macro) void Notepad_plus::macroPlayback(Macro macro)
{ {

1
PowerEditor/src/NppIO.cpp
View File

@ -34,6 +34,7 @@
#include "functionListPanel.h" #include "functionListPanel.h"
#include <TCHAR.h> #include <TCHAR.h>
using namespace std;
BufferID Notepad_plus::doOpen(const TCHAR *fileName, bool isRecursive, bool isReadOnly, int encoding, const TCHAR *backupFileName, time_t fileNameTimestamp) BufferID Notepad_plus::doOpen(const TCHAR *fileName, bool isRecursive, bool isReadOnly, int encoding, const TCHAR *backupFileName, time_t fileNameTimestamp)
{ {

2
PowerEditor/src/NppNotification.cpp
View File

@ -34,6 +34,8 @@
#include "documentMap.h" #include "documentMap.h"
#include <stack> #include <stack>
using namespace std;
BOOL Notepad_plus::notify(SCNotification *notification) BOOL Notepad_plus::notify(SCNotification *notification)
{ {
//Important, keep track of which element generated the message //Important, keep track of which element generated the message

2
PowerEditor/src/Parameters.cpp
View File

@ -36,6 +36,8 @@
#include "UserDefineDialog.h" #include "UserDefineDialog.h"
#include "../src/sqlite/sqlite3.h" #include "../src/sqlite/sqlite3.h"
using namespace std;
struct WinMenuKeyDefinition { //more or less matches accelerator table definition, easy copy/paste struct WinMenuKeyDefinition { //more or less matches accelerator table definition, easy copy/paste
//const TCHAR * name; //name retrieved from menu? //const TCHAR * name; //name retrieved from menu?
int vKey; int vKey;

114
PowerEditor/src/Parameters.h
View File

@ -74,8 +74,6 @@
class NativeLangSpeaker; class NativeLangSpeaker;
using namespace std;
const bool POS_VERTICAL = true; const bool POS_VERTICAL = true;
const bool POS_HORIZOTAL = false; const bool POS_HORIZOTAL = false;
@ -136,7 +134,7 @@ const TCHAR localConfFile[] = TEXT("doLocalConf.xml");
const TCHAR allowAppDataPluginsFile[] = TEXT("allowAppDataPlugins.xml"); const TCHAR allowAppDataPluginsFile[] = TEXT("allowAppDataPlugins.xml");
const TCHAR notepadStyleFile[] = TEXT("asNotepad.xml"); const TCHAR notepadStyleFile[] = TEXT("asNotepad.xml");
void cutString(const TCHAR *str2cut, vector<generic_string> & patternVect); void cutString(const TCHAR *str2cut, std::vector<generic_string> & patternVect);
struct Position struct Position
@ -162,8 +160,8 @@ struct sessionFileInfo : public Position {
generic_string _fileName; generic_string _fileName;
generic_string _langName; generic_string _langName;
vector<size_t> _marks; std::vector<size_t> _marks;
vector<size_t> _foldStates; std::vector<size_t> _foldStates;
int _encoding; int _encoding;
generic_string _backupFilePath; generic_string _backupFilePath;
@ -176,8 +174,8 @@ struct Session {
size_t _activeView; size_t _activeView;
size_t _activeMainIndex; size_t _activeMainIndex;
size_t _activeSubIndex; size_t _activeSubIndex;
vector<sessionFileInfo> _mainViewFiles; std::vector<sessionFileInfo> _mainViewFiles;
vector<sessionFileInfo> _subViewFiles; std::vector<sessionFileInfo> _subViewFiles;
}; };
struct CmdLineParams { struct CmdLineParams {
@ -258,9 +256,9 @@ struct DockingManagerData {
DockingManagerData() : _leftWidth(200), _rightWidth(200), _topHeight(200), _bottomHight(200) {}; DockingManagerData() : _leftWidth(200), _rightWidth(200), _topHeight(200), _bottomHight(200) {};
vector<FloatingWindowInfo> _flaotingWindowInfo; std::vector<FloatingWindowInfo> _flaotingWindowInfo;
vector<PluginDlgDockingInfo> _pluginDockInfo; std::vector<PluginDlgDockingInfo> _pluginDockInfo;
vector<ContainerTabInfo> _containerTabInfo; std::vector<ContainerTabInfo> _containerTabInfo;
bool getFloatingRCFrom(int floatCont, RECT & rc) { bool getFloatingRCFrom(int floatCont, RECT & rc) {
for (size_t i = 0, fwiLen = _flaotingWindowInfo.size(); i < fwiLen; ++i) for (size_t i = 0, fwiLen = _flaotingWindowInfo.size(); i < fwiLen; ++i)
@ -648,8 +646,8 @@ private:
}; };
struct MatchedPairConf { struct MatchedPairConf {
vector< pair<char, char> > _matchedPairs; std::vector< std::pair<char, char> > _matchedPairs;
vector< pair<char, char> > _matchedPairsInit; // used only on init std::vector< std::pair<char, char> > _matchedPairsInit; // used only on init
bool _doHtmlXmlTag; bool _doHtmlXmlTag;
bool _doParentheses; bool _doParentheses;
bool _doBrackets; bool _doBrackets;
@ -739,7 +737,7 @@ struct NppGUI
NewDocDefaultSettings _newDocDefaultSettings; NewDocDefaultSettings _newDocDefaultSettings;
void setTabReplacedBySpace(bool b) {_tabReplacedBySpace = b;}; void setTabReplacedBySpace(bool b) {_tabReplacedBySpace = b;};
const NewDocDefaultSettings & getNewDocDefaultSettings() const {return _newDocDefaultSettings;}; const NewDocDefaultSettings & getNewDocDefaultSettings() const {return _newDocDefaultSettings;};
vector<LangMenuItem> _excludedLangList; std::vector<LangMenuItem> _excludedLangList;
bool _isLangMenuCompact; bool _isLangMenuCompact;
PrintSettings _printSettings; PrintSettings _printSettings;
@ -1024,10 +1022,10 @@ struct FindHistory {
int _nbMaxFindHistoryFind; int _nbMaxFindHistoryFind;
int _nbMaxFindHistoryReplace; int _nbMaxFindHistoryReplace;
vector<generic_string> _findHistoryPaths; std::vector<generic_string> _findHistoryPaths;
vector<generic_string> _findHistoryFilters; std::vector<generic_string> _findHistoryFilters;
vector<generic_string> _findHistoryFinds; std::vector<generic_string> _findHistoryFinds;
vector<generic_string> _findHistoryReplaces; std::vector<generic_string> _findHistoryReplaces;
bool _isMatchWord; bool _isMatchWord;
bool _isMatchCase; bool _isMatchCase;
@ -1057,19 +1055,19 @@ public :
wchar_t *_xmlFileName; wchar_t *_xmlFileName;
}; };
bool addLanguageFromXml(wstring xmlFullPath); bool addLanguageFromXml(std::wstring xmlFullPath);
wstring getLangFromXmlFileName(const wchar_t *fn) const; std::wstring getLangFromXmlFileName(const wchar_t *fn) const;
wstring getXmlFilePathFromLangName(const wchar_t *langName) const; std::wstring getXmlFilePathFromLangName(const wchar_t *langName) const;
bool switchToLang(wchar_t *lang2switch) const; bool switchToLang(wchar_t *lang2switch) const;
size_t size() const { size_t size() const {
return _localizationList.size(); return _localizationList.size();
}; };
pair<wstring, wstring> getElementFromIndex(size_t index) { std::pair<std::wstring, std::wstring> getElementFromIndex(size_t index) {
if (index >= _localizationList.size()) if (index >= _localizationList.size())
return pair<wstring, wstring>(TEXT(""), TEXT("")); return std::pair<std::wstring, std::wstring>(TEXT(""), TEXT(""));
return _localizationList[index]; return _localizationList[index];
}; };
@ -1078,14 +1076,14 @@ public :
_fileName = fn; _fileName = fn;
}; };
string getFileName() const { std::string getFileName() const {
return _fileName; return _fileName;
}; };
private : private :
vector< pair< wstring, wstring > > _localizationList; std::vector< std::pair< std::wstring, std::wstring > > _localizationList;
wstring _nativeLangPath; std::wstring _nativeLangPath;
string _fileName; std::string _fileName;
}; };
class ThemeSwitcher { class ThemeSwitcher {
@ -1095,11 +1093,11 @@ public :
ThemeSwitcher(){}; ThemeSwitcher(){};
void addThemeFromXml(generic_string xmlFullPath) { void addThemeFromXml(generic_string xmlFullPath) {
_themeList.push_back(pair<generic_string, generic_string>(getThemeFromXmlFileName(xmlFullPath.c_str()), xmlFullPath)); _themeList.push_back(std::pair<generic_string, generic_string>(getThemeFromXmlFileName(xmlFullPath.c_str()), xmlFullPath));
}; };
void addDefaultThemeFromXml(generic_string xmlFullPath) { void addDefaultThemeFromXml(generic_string xmlFullPath) {
_themeList.push_back(pair<generic_string, generic_string>(TEXT("Default (stylers.xml)"), xmlFullPath)); _themeList.push_back(std::pair<generic_string, generic_string>(TEXT("Default (stylers.xml)"), xmlFullPath));
}; };
generic_string getThemeFromXmlFileName(const TCHAR *fn) const; generic_string getThemeFromXmlFileName(const TCHAR *fn) const;
@ -1124,24 +1122,24 @@ public :
}; };
pair<generic_string, generic_string> & getElementFromIndex(size_t index) { std::pair<generic_string, generic_string> & getElementFromIndex(size_t index) {
//if (index >= _themeList.size()) //if (index >= _themeList.size())
//return pair<generic_string, generic_string>(TEXT(""), TEXT("")); //return pair<generic_string, generic_string>(TEXT(""), TEXT(""));
return _themeList[index]; return _themeList[index];
}; };
private : private :
vector< pair< generic_string, generic_string > > _themeList; std::vector< std::pair< generic_string, generic_string > > _themeList;
generic_string _stylesXmlPath; generic_string _stylesXmlPath;
}; };
class PluginList { class PluginList {
public : public :
void add(generic_string fn, bool isInBL){ void add(generic_string fn, bool isInBL){
_list.push_back(pair<generic_string, bool>(fn, isInBL)); _list.push_back(std::pair<generic_string, bool>(fn, isInBL));
}; };
private : private :
vector<pair<generic_string, bool>>_list; std::vector<std::pair<generic_string, bool>>_list;
}; };
const int NB_LANG = 80; const int NB_LANG = 80;
@ -1278,7 +1276,7 @@ public:
}; };
void setFontList(HWND hWnd); void setFontList(HWND hWnd);
const vector<generic_string> & getFontList() const {return _fontlist;}; const std::vector<generic_string> & getFontList() const { return _fontlist; };
int getNbUserLang() const {return _nbUserLang;}; int getNbUserLang() const {return _nbUserLang;};
UserLangContainer & getULCFromIndex(int i) {return *_userLangArray[i];}; UserLangContainer & getULCFromIndex(int i) {return *_userLangArray[i];};
@ -1304,7 +1302,7 @@ public:
bool ExternalLangHasRoom() const {return _nbExternalLang < NB_MAX_EXTERNAL_LANG;}; bool ExternalLangHasRoom() const {return _nbExternalLang < NB_MAX_EXTERNAL_LANG;};
void getExternalLexerFromXmlTree(TiXmlDocument *doc); void getExternalLexerFromXmlTree(TiXmlDocument *doc);
vector<TiXmlDocument *> * getExternalLexerDoc() { return &_pXmlExternalLexerDoc;}; std::vector<TiXmlDocument *> * getExternalLexerDoc() { return &_pXmlExternalLexerDoc; };
void writeUserDefinedLang(); void writeUserDefinedLang();
void writeShortcuts(); void writeShortcuts();
@ -1329,7 +1327,7 @@ public:
for (int i = 0 ; i < _nbUserLang ; ++i) for (int i = 0 ; i < _nbUserLang ; ++i)
{ {
vector<generic_string> extVect; std::vector<generic_string> extVect;
cutString(_userLangArray[i]->_ext.c_str(), extVect); cutString(_userLangArray[i]->_ext.c_str(), extVect);
for (size_t j = 0, len = extVect.size(); j < len; ++j) for (size_t j = 0, len = extVect.size(); j < len; ++j)
if (!generic_stricmp(extVect[j].c_str(), ext) || (_tcschr(fullName, '.') && !generic_stricmp(extVect[j].c_str(), fullName))) if (!generic_stricmp(extVect[j].c_str(), ext) || (_tcschr(fullName, '.') && !generic_stricmp(extVect[j].c_str(), fullName)))
@ -1389,21 +1387,21 @@ public:
bool isRemappingShortcut() const {return _shortcuts.size() != 0;}; bool isRemappingShortcut() const {return _shortcuts.size() != 0;};
vector<CommandShortcut> & getUserShortcuts() {return _shortcuts;}; std::vector<CommandShortcut> & getUserShortcuts() { return _shortcuts; };
vector<int> & getUserModifiedShortcuts() {return _customizedShortcuts;}; std::vector<int> & getUserModifiedShortcuts() { return _customizedShortcuts; };
void addUserModifiedIndex(int index); void addUserModifiedIndex(int index);
vector<MacroShortcut> & getMacroList() {return _macros;}; std::vector<MacroShortcut> & getMacroList() { return _macros; };
vector<UserCommand> & getUserCommandList() {return _userCommands;}; std::vector<UserCommand> & getUserCommandList() { return _userCommands; };
vector<PluginCmdShortcut> & getPluginCommandList() {return _pluginCommands;}; std::vector<PluginCmdShortcut> & getPluginCommandList() { return _pluginCommands; };
vector<int> & getPluginModifiedKeyIndices() {return _pluginCustomizedCmds;}; std::vector<int> & getPluginModifiedKeyIndices() { return _pluginCustomizedCmds; };
void addPluginModifiedIndex(int index); void addPluginModifiedIndex(int index);
vector<ScintillaKeyMap> & getScintillaKeyList() {return _scintillaKeyCommands;}; std::vector<ScintillaKeyMap> & getScintillaKeyList() { return _scintillaKeyCommands; };
vector<int> & getScintillaModifiedKeyIndices() {return _scintillaModifiedKeyIndices;}; std::vector<int> & getScintillaModifiedKeyIndices() { return _scintillaModifiedKeyIndices; };
void addScintillaModifiedIndex(int index); void addScintillaModifiedIndex(int index);
vector<MenuItemUnit> & getContextMenuItems() {return _contextMenuItems;}; std::vector<MenuItemUnit> & getContextMenuItems() { return _contextMenuItems; };
const Session & getSession() const {return _session;}; const Session & getSession() const {return _session;};
bool hasCustomContextMenu() const {return !_contextMenuItems.empty();}; bool hasCustomContextMenu() const {return !_contextMenuItems.empty();};
@ -1468,7 +1466,7 @@ public:
return _themeSwitcher; return _themeSwitcher;
}; };
vector<generic_string> & getBlackList() {return _blacklist;}; std::vector<generic_string> & getBlackList() { return _blacklist; };
bool isInBlackList(TCHAR *fn) { bool isInBlackList(TCHAR *fn) {
for (size_t i = 0, len = _blacklist.size(); i < len ; ++i) for (size_t i = 0, len = _blacklist.size(); i < len ; ++i)
if (_blacklist[i] == fn) if (_blacklist[i] == fn)
@ -1534,7 +1532,7 @@ private:
TiXmlDocumentA *_pXmlNativeLangDocA, *_pXmlContextMenuDocA; TiXmlDocumentA *_pXmlNativeLangDocA, *_pXmlContextMenuDocA;
vector<TiXmlDocument *> _pXmlExternalLexerDoc; std::vector<TiXmlDocument *> _pXmlExternalLexerDoc;
NppGUI _nppGUI; NppGUI _nppGUI;
ScintillaViewParams _svp; ScintillaViewParams _svp;
@ -1566,8 +1564,8 @@ private:
LexerStylerArray _lexerStylerArray; LexerStylerArray _lexerStylerArray;
StyleArray _widgetStyleArray; StyleArray _widgetStyleArray;
vector<generic_string> _fontlist; std::vector<generic_string> _fontlist;
vector<generic_string> _blacklist; std::vector<generic_string> _blacklist;
PluginList _pluginList; PluginList _pluginList;
HMODULE _hUXTheme; HMODULE _hUXTheme;
@ -1577,15 +1575,15 @@ private:
bool _isLocal; bool _isLocal;
vector<CommandShortcut> _shortcuts; //main menu shortuts. Static size std::vector<CommandShortcut> _shortcuts; //main menu shortuts. Static size
vector<int> _customizedShortcuts; //altered main menu shortcuts. Indices static. Needed when saving alterations std::vector<int> _customizedShortcuts; //altered main menu shortcuts. Indices static. Needed when saving alterations
vector<MacroShortcut> _macros; //macro shortcuts, dynamic size, defined on loading macros and adding/deleting them std::vector<MacroShortcut> _macros; //macro shortcuts, dynamic size, defined on loading macros and adding/deleting them
vector<UserCommand> _userCommands; //run shortcuts, dynamic size, defined on loading run commands and adding/deleting them std::vector<UserCommand> _userCommands; //run shortcuts, dynamic size, defined on loading run commands and adding/deleting them
vector<PluginCmdShortcut> _pluginCommands; //plugin commands, dynamic size, defined on loading plugins std::vector<PluginCmdShortcut> _pluginCommands; //plugin commands, dynamic size, defined on loading plugins
vector<int> _pluginCustomizedCmds; //plugincommands that have been altered. Indices determined after loading ALL plugins. Needed when saving alterations std::vector<int> _pluginCustomizedCmds; //plugincommands that have been altered. Indices determined after loading ALL plugins. Needed when saving alterations
vector<ScintillaKeyMap> _scintillaKeyCommands; //scintilla keycommands. Static size std::vector<ScintillaKeyMap> _scintillaKeyCommands; //scintilla keycommands. Static size
vector<int> _scintillaModifiedKeyIndices; //modified scintilla keys. Indices static, determined by searching for commandId. Needed when saving alterations std::vector<int> _scintillaModifiedKeyIndices; //modified scintilla keys. Indices static, determined by searching for commandId. Needed when saving alterations
LocalizationSwitcher _localizationSwitcher; LocalizationSwitcher _localizationSwitcher;
generic_string _startWithLocFileName; generic_string _startWithLocFileName;
@ -1593,7 +1591,7 @@ private:
ThemeSwitcher _themeSwitcher; ThemeSwitcher _themeSwitcher;
//vector<generic_string> _noMenuCmdNames; //vector<generic_string> _noMenuCmdNames;
vector<MenuItemUnit> _contextMenuItems; std::vector<MenuItemUnit> _contextMenuItems;
Session _session; Session _session;
generic_string _shortcutsPath; generic_string _shortcutsPath;
@ -1621,7 +1619,7 @@ private:
COLORREF _currentDefaultFgColor; COLORREF _currentDefaultFgColor;
static int CALLBACK EnumFontFamExProc(ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX *, int, LPARAM lParam) { static int CALLBACK EnumFontFamExProc(ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX *, int, LPARAM lParam) {
vector<generic_string> *pStrVect = (vector<generic_string> *)lParam; std::vector<generic_string> *pStrVect = (std::vector<generic_string> *)lParam;
size_t vectSize = pStrVect->size(); size_t vectSize = pStrVect->size();
//Search through all the fonts, EnumFontFamiliesEx never states anything about order //Search through all the fonts, EnumFontFamiliesEx never states anything about order

9
PowerEditor/src/ScitillaComponent/AutoCompletion.cpp
View File

@ -25,12 +25,13 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <algorithm>
#include "precompiledHeaders.h" #include <locale>
#include <shlwapi.h>
#include "AutoCompletion.h" #include "AutoCompletion.h"
#include "Notepad_plus_msgs.h" #include "Notepad_plus_msgs.h"
#include <locale>
using namespace std;
static bool isInList(generic_string word, const vector<generic_string> & wordArray) static bool isInList(generic_string word, const vector<generic_string> & wordArray)
{ {

4
PowerEditor/src/ScitillaComponent/AutoCompletion.h
View File

@ -103,14 +103,14 @@ private:
bool _ignoreCase; bool _ignoreCase;
vector<generic_string> _keyWordArray; std::vector<generic_string> _keyWordArray;
generic_string _keyWords; generic_string _keyWords;
size_t _keyWordMaxLen; size_t _keyWordMaxLen;
FunctionCallTip _funcCalltip; FunctionCallTip _funcCalltip;
const TCHAR * getApiFileName(); const TCHAR * getApiFileName();
void getWordArray(vector<generic_string> & wordArray, TCHAR *beginChars); void getWordArray(std::vector<generic_string> & wordArray, TCHAR *beginChars);
}; };
#endif //AUTOCOMPLETION_H #endif //AUTOCOMPLETION_H

5
PowerEditor/src/ScitillaComponent/Buffer.cpp
View File

@ -25,8 +25,9 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <deque>
#include "precompiledHeaders.h" #include <time.h>
#include <sys/stat.h>
#include "Buffer.h" #include "Buffer.h"
#include "Scintilla.h" #include "Scintilla.h"
#include "Parameters.h" #include "Parameters.h"

6
PowerEditor/src/ScitillaComponent/Buffer.h
View File

@ -348,9 +348,9 @@ private :
bool _needLexer; //initially true bool _needLexer; //initially true
//these properties have to be duplicated because of multiple references //these properties have to be duplicated because of multiple references
//All the vectors must have the same size at all times //All the vectors must have the same size at all times
vector< ScintillaEditView * > _referees; std::vector< ScintillaEditView * > _referees;
vector< Position > _positions; std::vector< Position > _positions;
vector< vector<size_t> > _foldStates; std::vector< std::vector<size_t> > _foldStates;
//vector< pair<size_t, pair<size_t, bool> > > _linesUndoState; //vector< pair<size_t, pair<size_t, bool> > > _linesUndoState;

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

@ -33,6 +33,8 @@
#include "UniConversion.h" #include "UniConversion.h"
#include "LongRunningOperation.h" #include "LongRunningOperation.h"
using namespace std;
FindOption * FindReplaceDlg::_env; FindOption * FindReplaceDlg::_env;
FindOption FindReplaceDlg::_options; FindOption FindReplaceDlg::_options;

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

@ -239,7 +239,7 @@ public :
}; };
const TCHAR * getDir2Search() const {return _env->_directory.c_str();}; const TCHAR * getDir2Search() const {return _env->_directory.c_str();};
void getPatterns(vector<generic_string> & patternVect); void getPatterns(std::vector<generic_string> & patternVect);
void launchFindInFilesDlg() { void launchFindInFilesDlg() {
doDialog(FINDINFILES_DLG); doDialog(FINDINFILES_DLG);
@ -361,7 +361,7 @@ private :
}; };
void fillFindHistory(); void fillFindHistory();
void fillComboHistory(int id, const std::vector<generic_string> & strings); void fillComboHistory(int id, const std::vector<generic_string> & strings);
int saveComboHistory(int id, int maxcount, vector<generic_string> & strings); int saveComboHistory(int id, int maxcount, std::vector<generic_string> & strings);
static const int FR_OP_FIND = 1; static const int FR_OP_FIND = 1;
static const int FR_OP_REPLACE = 2; static const int FR_OP_REPLACE = 2;
static const int FR_OP_FIF = 4; static const int FR_OP_FIF = 4;

2
PowerEditor/src/ScitillaComponent/FunctionCallTip.h
View File

@ -62,7 +62,7 @@ private:
//cache some XML values n stuff //cache some XML values n stuff
TCHAR * _funcName; //name of function TCHAR * _funcName; //name of function
stringVec _retVals; //vector of overload return values/types stringVec _retVals; //vector of overload return values/types
vector<stringVec> _overloads; //vector of overload params (=vector) std::vector<stringVec> _overloads; //vector of overload params (=vector)
stringVec _descriptions; //vecotr of function descriptions stringVec _descriptions; //vecotr of function descriptions
int _currentNrOverloads; //current amount of overloads int _currentNrOverloads; //current amount of overloads
int _currentOverload; //current chosen overload int _currentOverload; //current chosen overload

3
PowerEditor/src/ScitillaComponent/ScintillaCtrls.cpp
View File

@ -26,7 +26,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h"
#include "ScintillaCtrls.h" #include "ScintillaCtrls.h"
#include "ScintillaEditView.h" #include "ScintillaEditView.h"
@ -68,7 +67,7 @@ bool ScintillaCtrls::destroyScintilla(HWND handle2Destroy)
_scintVector[i]->destroy(); _scintVector[i]->destroy();
delete _scintVector[i]; delete _scintVector[i];
vector<ScintillaEditView *>::iterator it2delete = _scintVector.begin()+ i; std::vector<ScintillaEditView *>::iterator it2delete = _scintVector.begin()+ i;
_scintVector.erase(it2delete); _scintVector.erase(it2delete);
return true; return true;
} }

3
PowerEditor/src/ScitillaComponent/ScintillaCtrls.h
View File

@ -29,6 +29,9 @@
#ifndef SCINTILLACTRLS_H #ifndef SCINTILLACTRLS_H
#define SCINTILLACTRLS_H #define SCINTILLACTRLS_H
#include <vector>
#include <windows.h>
class ScintillaEditView; class ScintillaEditView;
class ScintillaCtrls { class ScintillaCtrls {

3
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -26,12 +26,13 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h" #include <shlwapi.h>
#include "ScintillaEditView.h" #include "ScintillaEditView.h"
#include "Parameters.h" #include "Parameters.h"
#include "Sorters.h" #include "Sorters.h"
#include "TCHAR.h" #include "TCHAR.h"
using namespace std;
// initialize the static variable // initialize the static variable

6
PowerEditor/src/ScitillaComponent/ScintillaEditView.h
View File

@ -187,7 +187,7 @@ struct SortInPositionOrder {
} }
}; };
typedef vector<ColumnModeInfo> ColumnModeInfos; typedef std::vector<ColumnModeInfo> ColumnModeInfos;
struct LanguageName { struct LanguageName {
const TCHAR * lexerName; const TCHAR * lexerName;
@ -539,7 +539,7 @@ public:
void currentLineUp() const; void currentLineUp() const;
void currentLineDown() const; void currentLineDown() const;
pair<int, int> getSelectionLinesRange() const; std::pair<int, int> getSelectionLinesRange() const;
void currentLinesUp() const; void currentLinesUp() const;
void currentLinesDown() const; void currentLinesDown() const;
@ -912,7 +912,7 @@ protected:
} }
}; };
pair<int, int> getWordRange(); std::pair<int, int> getWordRange();
bool expandWordSelection(); bool expandWordSelection();
}; };

2
PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
View File

@ -37,6 +37,8 @@
#include "FileDialog.h" #include "FileDialog.h"
#include "Common.h" #include "Common.h"
using namespace std;
UserLangContainer * SharedParametersDialog::_pUserLang = NULL; UserLangContainer * SharedParametersDialog::_pUserLang = NULL;
ScintillaEditView * SharedParametersDialog::_pScintilla = NULL; ScintillaEditView * SharedParametersDialog::_pScintilla = NULL;

20
PowerEditor/src/ScitillaComponent/UserDefineDialog.h
View File

@ -52,7 +52,7 @@ static int max(int a, int b) {
#include "tchar.h" #include "tchar.h"
#include "scilexer.h" #include "scilexer.h"
#include <map> #include <map>
using namespace std;
class ScintillaEditView; class ScintillaEditView;
class UserLangContainer; class UserLangContainer;
struct Style; struct Style;
@ -66,18 +66,18 @@ class GlobalMappers
{ {
public: public:
map<generic_string, int> keywordIdMapper; std::map<generic_string, int> keywordIdMapper;
map<int, generic_string> keywordNameMapper; std::map<int, generic_string> keywordNameMapper;
map<generic_string, int> styleIdMapper; std::map<generic_string, int> styleIdMapper;
map<int, generic_string> styleNameMapper; std::map<int, generic_string> styleNameMapper;
map<generic_string, int> temp; std::map<generic_string, int> temp;
map<generic_string, int>::iterator iter; std::map<generic_string, int>::iterator iter;
map<int, int> nestingMapper; std::map<int, int> nestingMapper;
map<int, int> dialogMapper; std::map<int, int> dialogMapper;
map<int, string> setLexerMapper; std::map<int, std::string> setLexerMapper;
// only default constructor is needed // only default constructor is needed
GlobalMappers() GlobalMappers()

14
PowerEditor/src/ScitillaComponent/columnEditor.cpp
View File

@ -26,12 +26,22 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h" #include <vector>
#include <algorithm>
#include <Shlobj.h>
#include <uxtheme.h>
#include "columnEditor.h" #include "columnEditor.h"
#include "ScintillaEditView.h" #include "ScintillaEditView.h"
#include <vector>
void ColumnEditorDlg::init(HINSTANCE hInst, HWND hPere, ScintillaEditView **ppEditView)
{
Window::init(hInst, hPere);
if (!ppEditView)
throw std::runtime_error("StaticDialog::init : ppEditView is null.");
_ppEditView = ppEditView;
}
void ColumnEditorDlg::display(bool toShow) const void ColumnEditorDlg::display(bool toShow) const
{ {
Window::display(toShow); Window::display(toShow);

9
PowerEditor/src/ScitillaComponent/columnEditor.h
View File

@ -33,6 +33,8 @@
#include "columnEditor_rc.h" #include "columnEditor_rc.h"
#endif //COLUMNEDITOR_RC_H #endif //COLUMNEDITOR_RC_H
#include "StaticDialog.h"
class ScintillaEditView; class ScintillaEditView;
const bool activeText = true; const bool activeText = true;
@ -43,12 +45,7 @@ class ColumnEditorDlg : public StaticDialog
public : public :
ColumnEditorDlg() : StaticDialog() {}; ColumnEditorDlg() : StaticDialog() {};
void init(HINSTANCE hInst, HWND hPere, ScintillaEditView **ppEditView) { void init(HINSTANCE hInst, HWND hPere, ScintillaEditView **ppEditView);
Window::init(hInst, hPere);
if (!ppEditView)
throw std::runtime_error("StaticDialog::init : ppEditView is null.");
_ppEditView = ppEditView;
};
virtual void create(int dialogID, bool isRTL = false) { virtual void create(int dialogID, bool isRTL = false) {
StaticDialog::create(dialogID, isRTL); StaticDialog::create(dialogID, isRTL);

3
PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp
View File

@ -31,11 +31,10 @@
// Reverse regex are slow using the new regex engine, and hence cost too much time. // Reverse regex are slow using the new regex engine, and hence cost too much time.
#include "precompiledHeaders.h"
#include "xmlMatchedTagsHighlighter.h" #include "xmlMatchedTagsHighlighter.h"
#include "ScintillaEditView.h" #include "ScintillaEditView.h"
using namespace std;
vector< pair<int, int> > XmlMatchedTagsHighlighter::getAttributesPos(int start, int end) vector< pair<int, int> > XmlMatchedTagsHighlighter::getAttributesPos(int start, int end)
{ {

5
PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.h
View File

@ -29,7 +29,8 @@
#ifndef XMLMATCHEDTAGSHIGHLIGHTER_H #ifndef XMLMATCHEDTAGSHIGHLIGHTER_H
#define XMLMATCHEDTAGSHIGHLIGHTER_H #define XMLMATCHEDTAGSHIGHLIGHTER_H
using namespace std; #include <string>
#include <vector>
class ScintillaEditView; class ScintillaEditView;
@ -68,7 +69,7 @@ private:
FindResult findCloseTag(const std::string& tagName, int start, int end); FindResult findCloseTag(const std::string& tagName, int start, int end);
int findCloseAngle(int startPosition, int endPosition); int findCloseAngle(int startPosition, int endPosition);
vector< pair<int, int> > getAttributesPos(int start, int end); std::vector< std::pair<int, int> > getAttributesPos(int start, int end);
}; };

1
PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.cpp
View File

@ -26,7 +26,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h"
#include "ansiCharPanel.h" #include "ansiCharPanel.h"
#include "ScintillaEditView.h" #include "ScintillaEditView.h"

4
PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.h
View File

@ -29,7 +29,9 @@
#ifndef ANSICHARPANEL_H #ifndef ANSICHARPANEL_H
#define ANSICHARPANEL_H #define ANSICHARPANEL_H
//#include <windows.h> #include <windows.h>
#include <commctrl.h>
#ifndef DOCKINGDLGINTERFACE_H #ifndef DOCKINGDLGINTERFACE_H
#include "DockingDlgInterface.h" #include "DockingDlgInterface.h"
#endif //DOCKINGDLGINTERFACE_H #endif //DOCKINGDLGINTERFACE_H

1
PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.cpp
View File

@ -26,7 +26,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h"
#include "clipboardHistoryPanel.h" #include "clipboardHistoryPanel.h"
#include "ScintillaEditView.h" #include "ScintillaEditView.h"
#include "clipboardFormats.h" #include "clipboardFormats.h"

2
PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp
View File

@ -26,7 +26,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h" #include <iostream>
#include "ColourPicker.h" #include "ColourPicker.h"
#include "ColourPopup.h" #include "ColourPopup.h"

2
PowerEditor/src/WinControls/ColourPicker/ColourPicker.h
View File

@ -29,6 +29,8 @@
#ifndef COLOUR_PICKER_H #ifndef COLOUR_PICKER_H
#define COLOUR_PICKER_H #define COLOUR_PICKER_H
#include "Window.h"
class ColourPopup; class ColourPopup;
#define CPN_COLOURPICKED (BN_CLICKED) #define CPN_COLOURPICKED (BN_CLICKED)

2
PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp
View File

@ -26,7 +26,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h" #include <iostream>
#include "ColourPopup.h" #include "ColourPopup.h"
DWORD colourItems[] = { DWORD colourItems[] = {

2
PowerEditor/src/WinControls/ColourPicker/ColourPopup.h
View File

@ -37,6 +37,8 @@
#include "resource.h" #include "resource.h"
#endif //RESOURCE_H #endif //RESOURCE_H
#include "Window.h"
#define WM_PICKUP_COLOR (COLOURPOPUP_USER + 1) #define WM_PICKUP_COLOR (COLOURPOPUP_USER + 1)
#define WM_PICKUP_CANCEL (COLOURPOPUP_USER + 2) #define WM_PICKUP_CANCEL (COLOURPOPUP_USER + 2)

6
PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp
View File

@ -26,10 +26,14 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h" #include <Shlobj.h>
#include <shlwapi.h>
#include <uxtheme.h>
#include "WordStyleDlg.h" #include "WordStyleDlg.h"
#include "ScintillaEditView.h" #include "ScintillaEditView.h"
using namespace std;
BOOL CALLBACK ColourStaticTextHooker::colourStaticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) BOOL CALLBACK ColourStaticTextHooker::colourStaticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{ {
switch(Message) switch(Message)

2
PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h
View File

@ -121,7 +121,7 @@ public :
void addLastThemeEntry() { void addLastThemeEntry() {
NppParameters *nppParamInst = NppParameters::getInstance(); NppParameters *nppParamInst = NppParameters::getInstance();
ThemeSwitcher & themeSwitcher = nppParamInst->getThemeSwitcher(); ThemeSwitcher & themeSwitcher = nppParamInst->getThemeSwitcher();
pair<generic_string, generic_string> & themeInfo = themeSwitcher.getElementFromIndex(themeSwitcher.size() - 1); std::pair<generic_string, generic_string> & themeInfo = themeSwitcher.getElementFromIndex(themeSwitcher.size() - 1);
::SendMessage(_hSwitch2ThemeCombo, CB_ADDSTRING, 0, (LPARAM)themeInfo.first.c_str()); ::SendMessage(_hSwitch2ThemeCombo, CB_ADDSTRING, 0, (LPARAM)themeInfo.first.c_str());
}; };

3
PowerEditor/src/WinControls/ContextMenu/ContextMenu.cpp
View File

@ -26,7 +26,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h"
#include "ContextMenu.h" #include "ContextMenu.h"
MenuItemUnit::MenuItemUnit(unsigned long cmdID, const TCHAR *itemName, const TCHAR *parentFolderName) : _cmdID(cmdID) MenuItemUnit::MenuItemUnit(unsigned long cmdID, const TCHAR *itemName, const TCHAR *parentFolderName) : _cmdID(cmdID)
@ -52,7 +51,7 @@ ContextMenu::~ContextMenu()
} }
} }
void ContextMenu::create(HWND hParent, const vector<MenuItemUnit> & menuItemArray, const HMENU mainMenuHandle) void ContextMenu::create(HWND hParent, const std::vector<MenuItemUnit> & menuItemArray, const HMENU mainMenuHandle)
{ {
_hParent = hParent; _hParent = hParent;
_hMenu = ::CreatePopupMenu(); _hMenu = ::CreatePopupMenu();

6
PowerEditor/src/WinControls/ContextMenu/ContextMenu.h
View File

@ -29,7 +29,7 @@
#ifndef CONTEXTMENU_H #ifndef CONTEXTMENU_H
#define CONTEXTMENU_H #define CONTEXTMENU_H
using namespace std; #include "Common.h"
struct MenuItemUnit { struct MenuItemUnit {
unsigned long _cmdID; unsigned long _cmdID;
@ -46,7 +46,7 @@ public:
ContextMenu() : _hParent(NULL), _hMenu(NULL) {}; ContextMenu() : _hParent(NULL), _hMenu(NULL) {};
~ContextMenu(); ~ContextMenu();
void create(HWND hParent, const vector<MenuItemUnit> & menuItemArray, const HMENU mainMenuHandle = NULL); void create(HWND hParent, const std::vector<MenuItemUnit> & menuItemArray, const HMENU mainMenuHandle = NULL);
bool isCreated() const {return _hMenu != NULL;}; bool isCreated() const {return _hMenu != NULL;};
void display(const POINT & p) const { void display(const POINT & p) const {
@ -69,7 +69,7 @@ public:
private: private:
HWND _hParent; HWND _hParent;
HMENU _hMenu; HMENU _hMenu;
vector<HMENU> _subMenus; std::vector<HMENU> _subMenus;
}; };

2
PowerEditor/src/WinControls/DockingWnd/Docking.h
View File

@ -29,6 +29,8 @@
#ifndef DOCKING_H #ifndef DOCKING_H
#define DOCKING_H #define DOCKING_H
#include <windows.h>
// ATTENTION : It's a part of interface header, so don't include the others header here // ATTENTION : It's a part of interface header, so don't include the others header here
// styles for containers // styles for containers

3
PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp
View File

@ -25,7 +25,6 @@
//along with this program; if not, write to the Free Software //along with this program; if not, write to the Free Software
//Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h"
#include "dockingResource.h" #include "dockingResource.h"
#include "DockingCont.h" #include "DockingCont.h"
@ -33,6 +32,8 @@
#include "ToolTip.h" #include "ToolTip.h"
#include "Parameters.h" #include "Parameters.h"
using namespace std;
#ifndef WH_MOUSE_LL #ifndef WH_MOUSE_LL
#define WH_MOUSE_LL 14 #define WH_MOUSE_LL 14
#endif #endif

13
PowerEditor/src/WinControls/DockingWnd/DockingCont.h
View File

@ -37,8 +37,9 @@
#include "Docking.h" #include "Docking.h"
#endif //DOCKING_H #endif //DOCKING_H
#include <vector>
using namespace std; #include "StaticDialog.h"
#include "Common.h"
// window styles // window styles
@ -61,8 +62,6 @@ enum eMousePos {
#define CLOSEBTN_POS_TOP 3 #define CLOSEBTN_POS_TOP 3
class DockingCont : public StaticDialog class DockingCont : public StaticDialog
{ {
public: public:
@ -102,10 +101,10 @@ public:
void setActiveTb(INT iItem); void setActiveTb(INT iItem);
INT getActiveTb(); INT getActiveTb();
tTbData * getDataOfActiveTb(); tTbData * getDataOfActiveTb();
vector<tTbData *> getDataOfAllTb() { std::vector<tTbData *> getDataOfAllTb() {
return _vTbData; return _vTbData;
}; };
vector<tTbData *> getDataOfVisTb(); std::vector<tTbData *> getDataOfVisTb();
bool isTbVis(tTbData* data); bool isTbVis(tTbData* data);
void doDialog(bool willBeShown = true, bool isFloating = false); void doDialog(bool willBeShown = true, bool isFloating = false);
@ -234,7 +233,7 @@ private:
eMousePos _hoverMPos; eMousePos _hoverMPos;
// data of added windows // data of added windows
vector<tTbData *> _vTbData; std::vector<tTbData *> _vTbData;
}; };

2
PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.h
View File

@ -38,6 +38,8 @@
#include <assert.h> #include <assert.h>
#include <shlwapi.h> #include <shlwapi.h>
#include "Common.h"
#include "StaticDialog.h"
class DockingDlgInterface : public StaticDialog class DockingDlgInterface : public StaticDialog
{ {

1
PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
View File

@ -33,6 +33,7 @@
#include "Gripper.h" #include "Gripper.h"
#include "parameters.h" #include "parameters.h"
using namespace std;
BOOL DockingManager::_isRegistered = FALSE; BOOL DockingManager::_isRegistered = FALSE;

12
PowerEditor/src/WinControls/DockingWnd/DockingManager.h
View File

@ -40,10 +40,6 @@ class DockingSplitter;
#endif //SPLITTER_CONTAINER_H #endif //SPLITTER_CONTAINER_H
#define DSPC_CLASS_NAME TEXT("dockingManager") #define DSPC_CLASS_NAME TEXT("dockingManager")
using namespace std;
#define CONT_MAP_MAX 50 #define CONT_MAP_MAX 50
@ -83,7 +79,7 @@ public :
int GetContainer(DockingCont* pCont); int GetContainer(DockingCont* pCont);
// get all container in vector // get all container in vector
vector<DockingCont*> & getContainerInfo() { std::vector<DockingCont*> & getContainerInfo() {
return _vContainer; return _vContainer;
}; };
// get dock data (sized areas) // get dock data (sized areas)
@ -124,14 +120,14 @@ private:
RECT _rcWork; RECT _rcWork;
RECT _rect; RECT _rect;
Window **_ppMainWindow; Window **_ppMainWindow;
vector<HWND> _vImageList; std::vector<HWND> _vImageList;
HIMAGELIST _hImageList; HIMAGELIST _hImageList;
vector<DockingCont*> _vContainer; std::vector<DockingCont*> _vContainer;
tDockMgr _dockData; tDockMgr _dockData;
static BOOL _isRegistered; static BOOL _isRegistered;
BOOL _isInitialized; BOOL _isInitialized;
int _iContMap[CONT_MAP_MAX]; int _iContMap[CONT_MAP_MAX];
vector<DockingSplitter *> _vSplitter; std::vector<DockingSplitter *> _vSplitter;
}; };
#endif //DOCKINGMANAGER_H #endif //DOCKINGMANAGER_H

2
PowerEditor/src/WinControls/DockingWnd/Gripper.cpp
View File

@ -34,6 +34,8 @@
#include "DockingManager.h" #include "DockingManager.h"
#include "Parameters.h" #include "Parameters.h"
using namespace std;
#ifndef WH_KEYBOARD_LL #ifndef WH_KEYBOARD_LL
#define WH_KEYBOARD_LL 13 #define WH_KEYBOARD_LL 13
#endif #endif

2
PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
View File

@ -31,6 +31,8 @@
#include "ScintillaEditView.h" #include "ScintillaEditView.h"
#include "localization.h" #include "localization.h"
using namespace std;
#define CX_BITMAP 16 #define CX_BITMAP 16
#define CY_BITMAP 16 #define CY_BITMAP 16

2
PowerEditor/src/WinControls/FunctionList/functionParser.cpp
View File

@ -30,6 +30,8 @@
#include "functionParser.h" #include "functionParser.h"
#include "boostregexsearch.h" #include "boostregexsearch.h"
using namespace std;
FunctionParsersManager::~FunctionParsersManager() FunctionParsersManager::~FunctionParsersManager()
{ {
for (size_t i = 0, len = _parsers.size(); i < len; ++i) for (size_t i = 0, len = _parsers.size(); i < len; ++i)

1
PowerEditor/src/WinControls/Grid/BabyGrid.cpp
View File

@ -10,7 +10,6 @@ Add WM_MOUSEWHEEL, WM_LBUTTONDBLCLK and WM_RBUTTONUP events
Modified by Don HO <don.h@free.fr> Modified by Don HO <don.h@free.fr>
*/ */
#include "precompiledHeaders.h"
#include "babygrid.h" #include "babygrid.h"
#include "Parameters.h" #include "Parameters.h"

2
PowerEditor/src/WinControls/Grid/BabyGrid.h
View File

@ -7,6 +7,8 @@
#ifndef BABYGRID_H #ifndef BABYGRID_H
#include <windows.h>
#ifndef RESOURCE_H #ifndef RESOURCE_H
#include "resource.h" #include "resource.h"
#endif// RESOURCE_H #endif// RESOURCE_H

1
PowerEditor/src/WinControls/Grid/BabyGridWrapper.cpp
View File

@ -26,7 +26,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h"
#include "BabyGridWrapper.h" #include "BabyGridWrapper.h"
const TCHAR *babyGridClassName = TEXT("BABYGRID"); const TCHAR *babyGridClassName = TEXT("BABYGRID");

2
PowerEditor/src/WinControls/Grid/BabyGridWrapper.h
View File

@ -33,6 +33,8 @@
#include "babygrid.h" #include "babygrid.h"
#endif// BABYGRID_H #endif// BABYGRID_H
#include "Window.h"
class BabyGridWrapper : public Window class BabyGridWrapper : public Window
{ {
public : public :

2
PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp
View File

@ -26,10 +26,10 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h"
#include "ShortcutMapper.h" #include "ShortcutMapper.h"
#include "Notepad_plus.h" #include "Notepad_plus.h"
using namespace std;
void ShortcutMapper::initTabs() { void ShortcutMapper::initTabs() {
HWND hTab = _hTabCtrl = ::GetDlgItem(_hSelf, IDC_BABYGRID_TABBAR); HWND hTab = _hTabCtrl = ::GetDlgItem(_hSelf, IDC_BABYGRID_TABBAR);

4
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h
View File

@ -35,9 +35,7 @@
const int nbExtMax = 256; const int nbExtMax = 256;
const int extLenMax = 64; const int extLenMax = 64;
using namespace std; typedef std::vector<generic_string> stringVector;
typedef vector<generic_string> stringVector;
generic_string changeExt(generic_string fn, generic_string ext, bool forceReplaced = true); generic_string changeExt(generic_string fn, generic_string ext, bool forceReplaced = true);
void goToCenter(HWND hwnd); void goToCenter(HWND hwnd);

2
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -31,6 +31,8 @@
#include "lesDlgs.h" #include "lesDlgs.h"
#include "EncodingMapper.h" #include "EncodingMapper.h"
using namespace std;
const int BLINKRATE_FASTEST = 50; const int BLINKRATE_FASTEST = 50;
const int BLINKRATE_SLOWEST = 2500; const int BLINKRATE_SLOWEST = 2500;
const int BLINKRATE_INTERVAL = 50; const int BLINKRATE_INTERVAL = 50;

4
PowerEditor/src/WinControls/Preference/preferenceDlg.h
View File

@ -139,7 +139,7 @@ public :
private : private :
LexerStylerArray _lsArray; LexerStylerArray _lsArray;
BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
vector<LangMenuItem> _langList; std::vector<LangMenuItem> _langList;
}; };
class TabSettings : public StaticDialog class TabSettings : public StaticDialog
@ -168,7 +168,7 @@ public :
PrintSettingsDlg():_focusedEditCtrl(0), _selStart(0), _selEnd(0){}; PrintSettingsDlg():_focusedEditCtrl(0), _selStart(0), _selEnd(0){};
private : private :
BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
vector<strCouple> varList; std::vector<strCouple> varList;
int _focusedEditCtrl; int _focusedEditCtrl;
DWORD _selStart; DWORD _selStart;
DWORD _selEnd; DWORD _selEnd;

2
PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h
View File

@ -22,8 +22,6 @@
#include "RunDlg_rc.h" #include "RunDlg_rc.h"
#endif //RUN_DLG_RC_H #endif //RUN_DLG_RC_H
using namespace std;
#define CURRENTWORD_MAXLENGTH 2048 #define CURRENTWORD_MAXLENGTH 2048
const TCHAR fullCurrentPath[] = TEXT("FULL_CURRENT_PATH"); const TCHAR fullCurrentPath[] = TEXT("FULL_CURRENT_PATH");

1
PowerEditor/src/WinControls/TabBar/ControlsTab.cpp
View File

@ -26,7 +26,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h"
#include "ControlsTab.h" #include "ControlsTab.h"
void ControlsTab::createTabs(WindowVector & winVector) void ControlsTab::createTabs(WindowVector & winVector)

4
PowerEditor/src/WinControls/TabBar/ControlsTab.h
View File

@ -29,10 +29,14 @@
#ifndef CONTROLS_TAB_H #ifndef CONTROLS_TAB_H
#define CONTROLS_TAB_H #define CONTROLS_TAB_H
#ifndef TAB_BAR_H #ifndef TAB_BAR_H
#include "TabBar.h" #include "TabBar.h"
#endif //TAB_BAR_H #endif //TAB_BAR_H
#include "window.h"
#include "Common.h"
struct DlgInfo { struct DlgInfo {
Window *_dlg; Window *_dlg;
generic_string _name; generic_string _name;

4
PowerEditor/src/WinControls/TabBar/TabBar.h
View File

@ -41,6 +41,10 @@
#include "resource.h" #include "resource.h"
#endif //RESOURCE_H #endif //RESOURCE_H
#include <windows.h>
#include <commctrl.h>
#include "Window.h"
//Notification message //Notification message
#define TCN_TABDROPPED (TCN_FIRST - 10) #define TCN_TABDROPPED (TCN_FIRST - 10)
#define TCN_TABDROPPEDOUTSIDE (TCN_FIRST - 11) #define TCN_TABDROPPEDOUTSIDE (TCN_FIRST - 11)

8
PowerEditor/src/WinControls/ToolBar/ToolBar.h
View File

@ -44,8 +44,6 @@
#define _WIN32_IE 0x0600 #define _WIN32_IE 0x0600
#endif //_WIN32_IE #endif //_WIN32_IE
using namespace std;
enum toolBarStatusType {/*TB_HIDE, */TB_SMALL, TB_LARGE, TB_STANDARD}; enum toolBarStatusType {/*TB_HIDE, */TB_SMALL, TB_LARGE, TB_STANDARD};
@ -124,14 +122,14 @@ private :
TBBUTTON *_pTBB; TBBUTTON *_pTBB;
ToolBarIcons _toolBarIcons; ToolBarIcons _toolBarIcons;
toolBarStatusType _state; toolBarStatusType _state;
vector<tDynamicList> _vDynBtnReg; std::vector<tDynamicList> _vDynBtnReg;
size_t _nrButtons; size_t _nrButtons;
size_t _nrDynButtons; size_t _nrDynButtons;
size_t _nrTotalButtons; size_t _nrTotalButtons;
size_t _nrCurrentButtons; size_t _nrCurrentButtons;
ReBar * _pRebar; ReBar * _pRebar;
REBARBANDINFO _rbBand; REBARBANDINFO _rbBand;
vector<iconLocator> _customIconVect; std::vector<iconLocator> _customIconVect;
TiXmlNode *_toolIcons; TiXmlNode *_toolIcons;
@ -173,7 +171,7 @@ public :
void setGrayBackground(int id); void setGrayBackground(int id);
private: private:
vector<int> usedIDs; std::vector<int> usedIDs;
int getNewID(); int getNewID();
void releaseID(int id); void releaseID(int id);

2
PowerEditor/src/WinControls/ToolTip/ToolTip.h
View File

@ -29,7 +29,7 @@
#ifndef __TOOLTIP_H__ #ifndef __TOOLTIP_H__
#define __TOOLTIP_H__ #define __TOOLTIP_H__
using namespace std; #include <commctrl.h>
class ToolTip : public Window class ToolTip : public Window
{ {

2
PowerEditor/src/WinControls/WindowsDlg/SizeableDlg.h
View File

@ -37,6 +37,8 @@
#include "WinMgr.h" #include "WinMgr.h"
#endif //WINMGR_H #endif //WINMGR_H
#include "StaticDialog.h"
class SizeableDlg : public StaticDialog { class SizeableDlg : public StaticDialog {
typedef StaticDialog MyBaseClass; typedef StaticDialog MyBaseClass;
public: public:

3
PowerEditor/src/WinControls/WindowsDlg/WinMgr.h
View File

@ -14,6 +14,9 @@
#pragma once #pragma once
#include <assert.h>
#include <windows.h>
const SIZE SIZEZERO = {0, 0}; const SIZE SIZEZERO = {0, 0};
const SIZE SIZEMAX = {SHRT_MAX, SHRT_MAX}; const SIZE SIZEMAX = {SHRT_MAX, SHRT_MAX};

5
PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
View File

@ -26,12 +26,15 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h" #include <functional>
#include <algorithm>
#include "WindowsDlg.h" #include "WindowsDlg.h"
#include "WindowsDlgRc.h" #include "WindowsDlgRc.h"
#include "DocTabView.h" #include "DocTabView.h"
#include "EncodingMapper.h" #include "EncodingMapper.h"
using namespace std;
#ifndef _countof #ifndef _countof
#define _countof(x) (sizeof(x)/sizeof((x)[0])) #define _countof(x) (sizeof(x)/sizeof((x)[0]))
#endif #endif

2
PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h
View File

@ -33,6 +33,8 @@
#include "SizeableDlg.h" #include "SizeableDlg.h"
#endif //SIZABLE_DLG_H #endif //SIZABLE_DLG_H
#include "Common.h"
class DocTabView; class DocTabView;
class TiXmlNodeA; class TiXmlNodeA;

4
PowerEditor/src/WinControls/shortcut/RunMacroDlg.cpp
View File

@ -27,7 +27,7 @@
// created by Daniel Volk mordorpost@volkarts.com // created by Daniel Volk mordorpost@volkarts.com
#include "precompiledHeaders.h"
#include "RunMacroDlg.h" #include "RunMacroDlg.h"
#include "ScintillaEditView.h" #include "ScintillaEditView.h"
#include "Notepad_plus_msgs.h" #include "Notepad_plus_msgs.h"
@ -37,7 +37,7 @@ void RunMacroDlg::initMacroList()
if (!isCreated()) return; if (!isCreated()) return;
NppParameters *pNppParam = NppParameters::getInstance(); NppParameters *pNppParam = NppParameters::getInstance();
vector<MacroShortcut> & macroList = pNppParam->getMacroList(); std::vector<MacroShortcut> & macroList = pNppParam->getMacroList();
::SendDlgItemMessage(_hSelf, IDC_MACRO_COMBO, CB_RESETCONTENT, 0, 0); ::SendDlgItemMessage(_hSelf, IDC_MACRO_COMBO, CB_RESETCONTENT, 0, 0);

2
PowerEditor/src/WinControls/shortcut/RunMacroDlg.h
View File

@ -34,7 +34,7 @@
#include "RunMacroDlg_rc.h" #include "RunMacroDlg_rc.h"
#endif //RUN_MACRO_DLG_RC_H #endif //RUN_MACRO_DLG_RC_H
using namespace std; #include "StaticDialog.h"
#define RM_CANCEL -1 #define RM_CANCEL -1
#define RM_RUN_MULTI 1 #define RM_RUN_MULTI 1

5
PowerEditor/src/WinControls/shortcut/shortcut.cpp
View File

@ -26,16 +26,15 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "precompiledHeaders.h"
#include "shortcut.h" #include "shortcut.h"
#include "Parameters.h" #include "Parameters.h"
#include "ScintillaEditView.h" #include "ScintillaEditView.h"
#include "resource.h" #include "resource.h"
#include "Notepad_plus_Window.h" #include "Notepad_plus_Window.h"
#include "keys.h" #include "keys.h"
using namespace std;
const int KEY_STR_LEN = 16; const int KEY_STR_LEN = 16;
struct KeyIDNAME { struct KeyIDNAME {

11
PowerEditor/src/WinControls/shortcut/shortcut.h
View File

@ -38,8 +38,7 @@
#endif //SCINTILLA_H #endif //SCINTILLA_H
#include "StaticDialog.h" #include "StaticDialog.h"
#include "Common.h"
using namespace std;
const size_t nameLenMax = 64; const size_t nameLenMax = 64;
@ -259,7 +258,7 @@ public:
private: private:
unsigned long _scintillaKeyID; unsigned long _scintillaKeyID;
int _menuCmdID; int _menuCmdID;
vector<KeyCombo> _keyCombos; std::vector<KeyCombo> _keyCombos;
size_t size; size_t size;
void applyToCurrentIndex(); void applyToCurrentIndex();
void validateDialog(); void validateDialog();
@ -298,7 +297,7 @@ struct recordedMacroStep {
void PlayBack(Window* pNotepad, ScintillaEditView *pEditView); void PlayBack(Window* pNotepad, ScintillaEditView *pEditView);
}; };
typedef vector<recordedMacroStep> Macro; typedef std::vector<recordedMacroStep> Macro;
class MacroShortcut : public CommandShortcut { class MacroShortcut : public CommandShortcut {
friend class NppParameters; friend class NppParameters;
@ -378,13 +377,13 @@ private:
class ScintillaAccelerator { //Handles accelerator keys for scintilla class ScintillaAccelerator { //Handles accelerator keys for scintilla
public: public:
ScintillaAccelerator() : _nrScintillas(0) {}; ScintillaAccelerator() : _nrScintillas(0) {};
void init(vector<HWND> * vScintillas, HMENU hMenu, HWND menuParent); void init(std::vector<HWND> * vScintillas, HMENU hMenu, HWND menuParent);
void updateKeys(); void updateKeys();
void updateKey(ScintillaKeyMap skmOld, ScintillaKeyMap skm); void updateKey(ScintillaKeyMap skmOld, ScintillaKeyMap skm);
private: private:
HMENU _hAccelMenu; HMENU _hAccelMenu;
HWND _hMenuParent; HWND _hMenuParent;
vector<HWND> _vScintillas; std::vector<HWND> _vScintillas;
int _nrScintillas; int _nrScintillas;
void updateMenuItemByID(ScintillaKeyMap skm, int id); void updateMenuItemByID(ScintillaKeyMap skm, int id);

2
PowerEditor/src/lastRecentFileList.h
View File

@ -33,6 +33,8 @@
#include "Parameters.h" #include "Parameters.h"
#endif //PARAMETERS_H #endif //PARAMETERS_H
#include <deque>
struct RecentItem { struct RecentItem {
int _id; int _id;
generic_string _name; generic_string _name;

2
PowerEditor/src/localization.cpp
View File

@ -30,9 +30,9 @@
#include "Notepad_plus.h" #include "Notepad_plus.h"
#include "ShortcutMapper.h" #include "ShortcutMapper.h"
#include "EncodingMapper.h" #include "EncodingMapper.h"
#include "localization.h" #include "localization.h"
using namespace std;
void NativeLangSpeaker::init(TiXmlDocumentA *nativeLangDocRootA, bool loadIfEnglish) void NativeLangSpeaker::init(TiXmlDocumentA *nativeLangDocRootA, bool loadIfEnglish)
{ {

1
PowerEditor/src/uchardet/CharDistribution.cpp
View File

@ -35,7 +35,6 @@
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
#include "precompiledHeaders.h"
#include "CharDistribution.h" #include "CharDistribution.h"
#include "JISFreq.tab" #include "JISFreq.tab"