tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-20 12:24:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
Don HO 2018-06-24 01:16:01 +02:00
parent bac637ddfa
commit 593cf451fb
7 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PowerEditor/src/Notepad_plus.cpp
View File

@ -6835,6 +6835,5 @@ bool Notepad_plus::undoStreamComment(bool tryBlockComment)
} }
} }
while(1); //do as long as stream-comments are within selection while(1); //do as long as stream-comments are within selection
//return retVal;
} }

5
PowerEditor/src/Notepad_plus.rc
View File

@ -501,7 +501,6 @@ BEGIN
MENUITEM "Word wrap", IDM_VIEW_WRAP MENUITEM "Word wrap", IDM_VIEW_WRAP
MENUITEM "Focus on Another View", IDM_VIEW_SWITCHTO_OTHER_VIEW MENUITEM "Focus on Another View", IDM_VIEW_SWITCHTO_OTHER_VIEW
MENUITEM "Hide Lines", IDM_VIEW_HIDELINES MENUITEM "Hide Lines", IDM_VIEW_HIDELINES
//MENUITEM "User-Defined Dialogue...", IDM_VIEW_USER_DLG
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Fold All", IDM_VIEW_TOGGLE_FOLDALL MENUITEM "Fold All", IDM_VIEW_TOGGLE_FOLDALL
MENUITEM "Unfold All", IDM_VIEW_TOGGLE_UNFOLDALL MENUITEM "Unfold All", IDM_VIEW_TOGGLE_UNFOLDALL
@ -592,7 +591,6 @@ BEGIN
POPUP "Central European" POPUP "Central European"
BEGIN BEGIN
//MENUITEM "ISO 8859-16", IDM_FORMAT_ISO_8859_16
MENUITEM "OEM 852", IDM_FORMAT_DOS_852 MENUITEM "OEM 852", IDM_FORMAT_DOS_852
MENUITEM "Windows-1250", IDM_FORMAT_WIN_1250 MENUITEM "Windows-1250", IDM_FORMAT_WIN_1250
END END
@ -642,7 +640,6 @@ BEGIN
POPUP "Thai" POPUP "Thai"
BEGIN BEGIN
//MENUITEM "ISO 8859-11", IDM_FORMAT_ISO_8859_11
MENUITEM "TIS-620", IDM_FORMAT_TIS_620 MENUITEM "TIS-620", IDM_FORMAT_TIS_620
END END
@ -953,12 +950,10 @@ BEGIN
POPUP "&?" POPUP "&?"
BEGIN BEGIN
//MENUITEM "Help Contents", IDM_HELP
MENUITEM "Command Line Arguments...", IDM_CMDLINEARGUMENTS MENUITEM "Command Line Arguments...", IDM_CMDLINEARGUMENTS
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Notepad++ Home", IDM_HOMESWEETHOME MENUITEM "Notepad++ Home", IDM_HOMESWEETHOME
MENUITEM "Notepad++ Project Page", IDM_PROJECTPAGE MENUITEM "Notepad++ Project Page", IDM_PROJECTPAGE
//MENUITEM "Online Documentation", IDM_ONLINEHELP
MENUITEM "Notepad++ Community (Forum)", IDM_FORUM MENUITEM "Notepad++ Community (Forum)", IDM_FORUM
MENUITEM "Live Support", IDM_ONLINESUPPORT MENUITEM "Live Support", IDM_ONLINESUPPORT
MENUITEM "Get More Plugins", IDM_PLUGINSHOME MENUITEM "Get More Plugins", IDM_PLUGINSHOME

1
PowerEditor/src/Notepad_plus_Window.cpp
View File

@ -246,7 +246,6 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
if (!cmdLineParams->_easterEggName.empty()) if (!cmdLineParams->_easterEggName.empty())
{ {
//::MessageBoxA(NULL, destStr.c_str(), "", MB_OK);
if (cmdLineParams->_quoteType == 0) // Easter Egg Name if (cmdLineParams->_quoteType == 0) // Easter Egg Name
{ {
int iQuote = _notepad_plus_plus_core.getQuoteIndexFrom(cmdLineParams->_easterEggName.c_str()); int iQuote = _notepad_plus_plus_core.getQuoteIndexFrom(cmdLineParams->_easterEggName.c_str());

3
PowerEditor/src/NppCommands.cpp
View File

@ -2169,12 +2169,9 @@ void Notepad_plus::command(int id)
case IDM_FORMAT_ISO_8859_7 : case IDM_FORMAT_ISO_8859_7 :
case IDM_FORMAT_ISO_8859_8 : case IDM_FORMAT_ISO_8859_8 :
case IDM_FORMAT_ISO_8859_9 : case IDM_FORMAT_ISO_8859_9 :
//case IDM_FORMAT_ISO_8859_10 :
//case IDM_FORMAT_ISO_8859_11 :
case IDM_FORMAT_ISO_8859_13 : case IDM_FORMAT_ISO_8859_13 :
case IDM_FORMAT_ISO_8859_14 : case IDM_FORMAT_ISO_8859_14 :
case IDM_FORMAT_ISO_8859_15 : case IDM_FORMAT_ISO_8859_15 :
//case IDM_FORMAT_ISO_8859_16 :
case IDM_FORMAT_DOS_437 : case IDM_FORMAT_DOS_437 :
case IDM_FORMAT_DOS_720 : case IDM_FORMAT_DOS_720 :
case IDM_FORMAT_DOS_737 : case IDM_FORMAT_DOS_737 :

1
PowerEditor/src/Parameters.h
View File

@ -91,7 +91,6 @@ enum ChangeDetect {cdDisabled=0, cdEnabled=1, cdAutoUpdate=2, cdGo2end=3, cdAuto
enum BackupFeature {bak_none = 0, bak_simple = 1, bak_verbose = 2}; enum BackupFeature {bak_none = 0, bak_simple = 1, bak_verbose = 2};
enum OpenSaveDirSetting {dir_followCurrent = 0, dir_last = 1, dir_userDef = 2}; enum OpenSaveDirSetting {dir_followCurrent = 0, dir_last = 1, dir_userDef = 2};
enum MultiInstSetting {monoInst = 0, multiInstOnSession = 1, multiInst = 2}; enum MultiInstSetting {monoInst = 0, multiInstOnSession = 1, multiInst = 2};
//enum CloudChoice {noCloud = 0, dropbox = 1, oneDrive = 2, googleDrive = 3};
const int LANG_INDEX_INSTR = 0; const int LANG_INDEX_INSTR = 0;
const int LANG_INDEX_INSTR2 = 1; const int LANG_INDEX_INSTR2 = 1;

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

@ -54,7 +54,6 @@ UserDefineDialog ScintillaEditView::_userDefineDlg;
const int ScintillaEditView::_SC_MARGE_LINENUMBER = 0; const int ScintillaEditView::_SC_MARGE_LINENUMBER = 0;
const int ScintillaEditView::_SC_MARGE_SYBOLE = 1; const int ScintillaEditView::_SC_MARGE_SYBOLE = 1;
const int ScintillaEditView::_SC_MARGE_FOLDER = 2; const int ScintillaEditView::_SC_MARGE_FOLDER = 2;
//const int ScintillaEditView::_SC_MARGE_MODIFMARKER = 3;
WNDPROC ScintillaEditView::_scintillaDefaultProc = NULL; WNDPROC ScintillaEditView::_scintillaDefaultProc = NULL;
string ScintillaEditView::_defaultCharList = ""; string ScintillaEditView::_defaultCharList = "";

6
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp
View File

@ -34,14 +34,12 @@
#include <algorithm> #include <algorithm>
FileDialog *FileDialog::staticThis = NULL; FileDialog *FileDialog::staticThis = NULL;
//int FileDialog::_dialogFileBoxId = (NppParameters::getInstance())->getWinVersion() < WV_W2K?edt1:cmb13;
FileDialog::FileDialog(HWND hwnd, HINSTANCE hInst) FileDialog::FileDialog(HWND hwnd, HINSTANCE hInst)
: _nbCharFileExt(0), _nbExt(0), _fileExt(NULL), _extTypeIndex(-1) : _nbCharFileExt(0), _nbExt(0), _fileExt(NULL), _extTypeIndex(-1)
{ {
staticThis = this; staticThis = this;
//for (int i = 0 ; i < nbExtMax ; i++)
// _extArray[i][0] = '\0';
memset(_fileName, 0, sizeof(_fileName)); memset(_fileName, 0, sizeof(_fileName));
_winVersion = (NppParameters::getInstance())->getWinVersion(); _winVersion = (NppParameters::getInstance())->getWinVersion();
@ -200,7 +198,6 @@ stringVector * FileDialog::doOpenMultiFilesDlg()
{ {
TCHAR dir[MAX_PATH]; TCHAR dir[MAX_PATH];
::GetCurrentDirectory(MAX_PATH, dir); ::GetCurrentDirectory(MAX_PATH, dir);
//_ofn.lpstrInitialDir = dir;
NppParameters * params = NppParameters::getInstance(); NppParameters * params = NppParameters::getInstance();
_ofn.lpstrInitialDir = params->getWorkingDir(); _ofn.lpstrInitialDir = params->getWorkingDir();
@ -258,7 +255,6 @@ TCHAR * FileDialog::doSaveDlg()
{ {
TCHAR dir[MAX_PATH]; TCHAR dir[MAX_PATH];
::GetCurrentDirectory(MAX_PATH, dir); ::GetCurrentDirectory(MAX_PATH, dir);
//_ofn.lpstrInitialDir = dir;
NppParameters * params = NppParameters::getInstance(); NppParameters * params = NppParameters::getInstance();
_ofn.lpstrInitialDir = params->getWorkingDir(); _ofn.lpstrInitialDir = params->getWorkingDir();