diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h index 806c80a1..4873558c 100644 --- a/PowerEditor/src/Notepad_plus.h +++ b/PowerEditor/src/Notepad_plus.h @@ -36,7 +36,7 @@ #include "GoToLineDlg.h" #include "columnEditor.h" #include "WordStyleDlg.h" -#include "constant.h" +//#include "constant.h" #include "trayIconControler.h" #include "ContextMenu.h" #include "PluginsManager.h" diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index c20ae725..1ece0aac 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -18,7 +18,7 @@ #include "FindReplaceDlg.h" #include "ScintillaEditView.h" #include "Notepad_plus_msgs.h" -#include "constant.h" +//#include "constant.h" #include "UniConversion.h" int Searching::convertExtendedToString(const TCHAR * query, TCHAR * result, int length) { //query may equal to result, since it always gets smaller diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp index b99886cc..7727bf2d 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp @@ -20,7 +20,7 @@ #include #include "ScintillaEditView.h" #include "Parameters.h" -#include "constant.h" +//#include "constant.h" // initialize the static variable @@ -153,6 +153,9 @@ void ScintillaEditView::init(HINSTANCE hInst, HWND hPere) execute(SCI_SETMARGINMASKN, _SC_MARGE_FOLDER, SC_MASK_FOLDERS); showMargin(_SC_MARGE_FOLDER, true); + //showMargin(3, true); + //showMargin(4, true); + execute(SCI_SETMARGINSENSITIVEN, _SC_MARGE_FOLDER, true); execute(SCI_SETMARGINSENSITIVEN, _SC_MARGE_SYBOLE, true); diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h index 588ffec1..9d86ba10 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h @@ -97,6 +97,14 @@ const UCHAR BASE_16 = 0x01; // Hex const UCHAR BASE_08 = 0x02; // Oct const UCHAR BASE_02 = 0x03; // Bin + +const int MARK_BOOKMARK = 24; +const int MARK_HIDELINESBEGIN = 23; +const int MARK_HIDELINESEND = 22; +// 24 - 16 reserved for Notepad++ internal used +// 15 - 0 are free to use for plugins + + static int getNbChiffre(int aNum, int base) { int nbChiffre = 1; @@ -236,11 +244,16 @@ public: static const int _MARGE_LINENUMBER_NB_CHIFFRE; - void showMargin(int witchMarge, bool willBeShowed = true) { - if (witchMarge == _SC_MARGE_LINENUMBER) + void showMargin(int whichMarge, bool willBeShowed = true) { + if (whichMarge == _SC_MARGE_LINENUMBER) setLineNumberWidth(willBeShowed); else - execute(SCI_SETMARGINWIDTHN, witchMarge, willBeShowed?14:0); + { + int width = 4; + if (whichMarge == _SC_MARGE_SYBOLE || whichMarge == _SC_MARGE_FOLDER) + width = 14; + execute(SCI_SETMARGINWIDTHN, whichMarge, willBeShowed?width:0); + } }; bool hasMarginShowed(int witchMarge) { diff --git a/PowerEditor/src/WinControls/shortcut/RunMacroDlg.cpp b/PowerEditor/src/WinControls/shortcut/RunMacroDlg.cpp index 3fa0b7d4..4cf0bad3 100644 --- a/PowerEditor/src/WinControls/shortcut/RunMacroDlg.cpp +++ b/PowerEditor/src/WinControls/shortcut/RunMacroDlg.cpp @@ -20,7 +20,7 @@ #include "RunMacroDlg.h" #include "ScintillaEditView.h" #include "Notepad_plus_msgs.h" -#include "constant.h" +//#include "constant.h" BOOL CALLBACK RunMacroDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) diff --git a/PowerEditor/src/constant.h b/PowerEditor/src/constant.h deleted file mode 100644 index 68cc4297..00000000 --- a/PowerEditor/src/constant.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef CONSTANT_H -#define CONSTANT_H - -const int MARK_BOOKMARK = 1; -const int MARK_HIDELINESBEGIN = 2; -const int MARK_HIDELINESEND = 3; - -#endif //CONSTANT_H diff --git a/PowerEditor/visual.net/notepadPlus.vcproj b/PowerEditor/visual.net/notepadPlus.vcproj index 0344738d..44515d62 100644 --- a/PowerEditor/visual.net/notepadPlus.vcproj +++ b/PowerEditor/visual.net/notepadPlus.vcproj @@ -507,10 +507,6 @@ RelativePath="..\src\MISC\Common\Common.h" > - -