From a1866aba6d6db73a09dfd0cf88bfa00401e9c221 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Thu, 2 Sep 2010 00:43:56 +0000 Subject: [PATCH] =?UTF-8?q?[BUG=5FFIXED]=20(Author:=20Fran=C3=A7ois-R=20Bo?= =?UTF-8?q?yer)=20Avoid=20"#if=201=20//"=20from=20making=20CppLexer=20cras?= =?UTF-8?q?h.=20[UPDATE]=20Update=20english.xml=20for=20v5.7.1=20and=20the?= =?UTF-8?q?=20newest=20translations.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@660 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/bin/change.log | 38 +- PowerEditor/installer/nativeLang/Latvian.xml | 246 ++-- PowerEditor/installer/nativeLang/catalan.xml | 519 ++++---- PowerEditor/installer/nativeLang/danish.xml | 3 +- PowerEditor/installer/nativeLang/finnish.xml | 96 +- PowerEditor/installer/nativeLang/italian.xml | 3 + .../installer/nativeLang/portuguese.xml | 956 ++++++++------- PowerEditor/installer/nativeLang/romanian.xml | 78 +- PowerEditor/installer/nativeLang/russian.xml | 1019 ++++++++-------- .../installer/nativeLang/serbianCyrillic.xml | 931 ++++++++------ PowerEditor/installer/nativeLang/swedish.xml | 1082 +++++++++-------- PowerEditor/installer/nppSetup.nsi | 6 +- .../ScitillaComponent/ScintillaEditView.cpp | 24 +- PowerEditor/src/WinControls/Window.h | 4 +- 14 files changed, 2638 insertions(+), 2367 deletions(-) diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index bfa3126a..861b484d 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,18 +1,24 @@ -Notepad++ v5.7 new features and fixed bugs (from v5.6.8) : +Notepad++ v5.7.1 new features and fixed bugs (from v5.7) : + +1. Upgrade Scintilla to version 2.20. +2. Fix Unicode file corrupted on saving bug (the buffer alignment issue). +3. Fix DBCS encodings file saving corruption bug. +4. Fix file containing NULL character loading bug. +5. Fix php syntax highlighting bug. +6. Fix dragging undocked window performance issue while using Vista Aero UI style. +7. Fix a vulnerability: get full ScinLexer.dll path to avoid hijack. +8. Fix Shortcut Mapper inconsistence issue after deleting a macro or an user command. +9. Add 2 line wrap methods (default plus aligned and indent). +10. Add 2 menu commands : "Modify Shortcut/Delete Macro" and "Modify Shortcut/Delete Command". +11. Add "Modify" and "Delete" buttons on Shortcut mapper dialog. +12. Add macro new ability to record search and replace actions. +13. Fix SaveSession bug. +14. Remove characters count feature from the status bar due to its performance issue with UTF8 file. +15. Fix crash issue due to themes switching. +16. Make folding margin hidable. +17. Add NPPM_GETCURRENTNATIVELANGENCODING message (to get the current native language enconding). +18. Change editing settings saving behaviour : one set of settings are applied in 2 scintilla controls (except zoom). -1. Upgrade Scintilla to version 2.12. -2. Add "Inverse bookmark" feature. -3. Add NPPM_SAVECURRENTFILEAS message. -4. Fix premature deallocation bug for import UDL. -5. Add import/export User Defined Language features. -6. File detection : Switch to modified or deleted file while user is asked to reload or keep the file. -7. Fix closing several detected non-existing files bug. -8. Fix language switching to English not working bug. -9. Reduce PostIt/FullScreen restore button size. -10. Fix PostIt wrong restore button position after toggling off fullScreen mode. -11. Fix crashes on new 11 character long UDL names bug. -12. Fix "Save all" inconsistent icon state on toolbar. -13. Add new keywords of HTML 5 and css. Included plugins (Unicode): @@ -21,9 +27,9 @@ Included plugins (Unicode): 2. Spell Checker v1.3.3 3. MIME Tools v1.6 4. NppExport v0.2.8 -5. Compare Plugin 1.5.6 +5. Compare Plugin 1.5.6.1 6. Plugin Manager 0.9.3.1 -7. NppFTP 0.1.3.0 +7. NppFTP 0.23 8. Select 'N' Launch 1.0 diff --git a/PowerEditor/installer/nativeLang/Latvian.xml b/PowerEditor/installer/nativeLang/Latvian.xml index 70077373..ea4adbe7 100644 --- a/PowerEditor/installer/nativeLang/Latvian.xml +++ b/PowerEditor/installer/nativeLang/Latvian.xml @@ -1,5 +1,5 @@ - + @@ -13,31 +13,28 @@ - - - - + + + + - + - + - + @@ -45,21 +42,17 @@ pa - + - + - - + + - + @@ -70,8 +63,7 @@ name="Rietumeiropas"/> - + @@ -97,10 +89,8 @@ dokumentu"/> - - + + @@ -109,20 +99,14 @@ l - - - + + + - + - - + + @@ -135,20 +119,17 @@ reizes..."/> - + - - + + - + @@ -175,32 +156,27 @@ l - + + + - - - + + + - + - - + + @@ -209,27 +185,19 @@ ritin - - - + + + - + - - + + - - + + @@ -237,8 +205,7 @@ kod - + @@ -254,10 +221,8 @@ pal - - + + @@ -271,26 +236,20 @@ sarakstu"/> - - - + + + - - + + - + @@ -367,17 +326,13 @@ titleFindInFiles="Atrast failos"> - + - - - + + + @@ -402,10 +357,8 @@ stilu"/> - - + + @@ -422,10 +375,8 @@ iestat - - + + @@ -452,25 +403,19 @@ simbolus"/> - - - + + + - - + + - + @@ -479,12 +424,9 @@ tausti - - - + + + @@ -495,12 +437,10 @@ klik - + - + @@ -514,14 +454,11 @@ iez - + - + - + @@ -533,20 +470,18 @@ failiem"/> - + - + - + @@ -572,31 +507,24 @@ kompakt - - - + + + - + - - + + - + @@ -610,15 +538,13 @@ nosaukumus"/> - + - + diff --git a/PowerEditor/installer/nativeLang/catalan.xml b/PowerEditor/installer/nativeLang/catalan.xml index e01fbdd7..a20bc28d 100644 --- a/PowerEditor/installer/nativeLang/catalan.xml +++ b/PowerEditor/installer/nativeLang/catalan.xml @@ -1,187 +1,226 @@ + - +
- - - + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + - - + + - @@ -189,34 +228,33 @@ - +
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + @@ -227,23 +265,19 @@ - - - - @@ -254,18 +288,18 @@ - + - + - + - + @@ -282,25 +316,20 @@ - - - - - - + @@ -309,27 +338,28 @@ - + + - + - + + - - + @@ -369,59 +399,50 @@ - - + - + - - + - - - - - + + + + - - + - - + + - - - - + - - - + + - + - @@ -429,117 +450,102 @@ - - + - - - + - + - - + + - - + - - + + - + - - + + - - - - - + - - + - - - - + + + - - + - - - + - - + - - - - - + + + + - + @@ -554,17 +560,14 @@ - + - - - + - @@ -573,4 +576,4 @@ - \ No newline at end of file + diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml index d1cbb973..0f172854 100644 --- a/PowerEditor/installer/nativeLang/danish.xml +++ b/PowerEditor/installer/nativeLang/danish.xml @@ -1,7 +1,7 @@ - +
@@ -32,6 +32,7 @@ + diff --git a/PowerEditor/installer/nativeLang/finnish.xml b/PowerEditor/installer/nativeLang/finnish.xml index f286af9e..c459578e 100644 --- a/PowerEditor/installer/nativeLang/finnish.xml +++ b/PowerEditor/installer/nativeLang/finnish.xml @@ -1,7 +1,7 @@ @@ -33,15 +33,19 @@ - - - - + + + + + + + + @@ -71,7 +75,7 @@ - + @@ -104,7 +108,7 @@ - + @@ -156,25 +160,24 @@ - + - + - - - - + + + + - - + @@ -189,9 +192,9 @@ - + - + @@ -265,7 +268,8 @@ - + + @@ -280,9 +284,9 @@ - - - + + + @@ -326,13 +330,12 @@ - - + + - @@ -355,21 +358,23 @@ - + - + + + - - - + + + - - + + @@ -377,11 +382,11 @@ - - - - - + + + + + @@ -393,7 +398,7 @@ - + @@ -406,9 +411,9 @@ + - - + @@ -509,17 +514,17 @@ - - + + - - + + - + @@ -547,7 +552,6 @@ - diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml index e3cc4bc2..e78351f8 100644 --- a/PowerEditor/installer/nativeLang/italian.xml +++ b/PowerEditor/installer/nativeLang/italian.xml @@ -163,6 +163,7 @@ + @@ -341,6 +342,8 @@ + + diff --git a/PowerEditor/installer/nativeLang/portuguese.xml b/PowerEditor/installer/nativeLang/portuguese.xml index 03d38c51..d17b2456 100644 --- a/PowerEditor/installer/nativeLang/portuguese.xml +++ b/PowerEditor/installer/nativeLang/portuguese.xml @@ -1,451 +1,579 @@ - + - +
- - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- - +
+ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/romanian.xml b/PowerEditor/installer/nativeLang/romanian.xml index fa98a889..8e12327a 100644 --- a/PowerEditor/installer/nativeLang/romanian.xml +++ b/PowerEditor/installer/nativeLang/romanian.xml @@ -5,7 +5,7 @@
- + @@ -27,10 +27,11 @@ - - - - + + + + + @@ -103,8 +104,8 @@ - - + + @@ -122,7 +123,7 @@ - + @@ -154,17 +155,20 @@ - - - + + + + + + - - + + @@ -221,8 +225,8 @@ - - + +
@@ -236,8 +240,8 @@ - - + + @@ -249,7 +253,7 @@ - + @@ -276,15 +280,15 @@ - + - + - + @@ -353,6 +357,8 @@ + + @@ -404,15 +410,15 @@ - - - + + + - + @@ -467,14 +473,14 @@ - + - + - + @@ -518,18 +524,18 @@ - + - + - + - + - - + + @@ -538,7 +544,7 @@ - + @@ -567,7 +573,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml index 7c40cfcf..875df9c6 100644 --- a/PowerEditor/installer/nativeLang/russian.xml +++ b/PowerEditor/installer/nativeLang/russian.xml @@ -1,148 +1,146 @@ - +
- - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -159,425 +157,418 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/PowerEditor/installer/nativeLang/serbianCyrillic.xml b/PowerEditor/installer/nativeLang/serbianCyrillic.xml index f5322561..c4f6e801 100644 --- a/PowerEditor/installer/nativeLang/serbianCyrillic.xml +++ b/PowerEditor/installer/nativeLang/serbianCyrillic.xml @@ -1,446 +1,583 @@ + - +
- - - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/PowerEditor/installer/nativeLang/swedish.xml b/PowerEditor/installer/nativeLang/swedish.xml index b6e6fbf4..76e71dde 100644 --- a/PowerEditor/installer/nativeLang/swedish.xml +++ b/PowerEditor/installer/nativeLang/swedish.xml @@ -1,4 +1,4 @@ - + - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 0fac45e0..2512ade3 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -19,9 +19,9 @@ !define APPNAME "Notepad++" !define APPVERSION "5.7" -!define APPNAMEANDVERSION "Notepad++ v5.7" +!define APPNAMEANDVERSION "Notepad++ v5.7.1" !define VERSION_MAJOR 5 -!define VERSION_MINOR 7 +!define VERSION_MINOR 71 !define APPWEBSITE "http://notepad-plus.sourceforge.net/" @@ -29,7 +29,7 @@ Name "${APPNAMEANDVERSION}" InstallDir "$PROGRAMFILES\Notepad++" InstallDirRegKey HKLM "Software\${APPNAME}" "" -OutFile ".\build\npp.5.7.Installer.exe" +OutFile ".\build\npp.5.7.1.Installer.exe" ; GetWindowsVersion ; diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp index 54d14392..df606027 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp @@ -208,12 +208,6 @@ void ScintillaEditView::init(HINSTANCE hInst, HWND hPere) execute(SCI_SETMARGINSENSITIVEN, _SC_MARGE_FOLDER, true); execute(SCI_SETMARGINSENSITIVEN, _SC_MARGE_SYBOLE, true); - execute(SCI_SETPROPERTY, reinterpret_cast("fold"), reinterpret_cast("1")); - execute(SCI_SETPROPERTY, reinterpret_cast("fold.compact"), reinterpret_cast("0")); - - execute(SCI_SETPROPERTY, reinterpret_cast("fold.html"), reinterpret_cast("1")); - execute(SCI_SETPROPERTY, reinterpret_cast("fold.comment"), reinterpret_cast("1")); - execute(SCI_SETPROPERTY, reinterpret_cast("fold.preprocessor"), reinterpret_cast("1")); execute(SCI_SETFOLDFLAGS, 16); execute(SCI_SETSCROLLWIDTHTRACKING, true); execute(SCI_SETSCROLLWIDTH, 1); //default empty document: override default width of 2000 @@ -528,6 +522,9 @@ void ScintillaEditView::setXmlLexer(LangType type) setEmbeddedPhpLexer(); setEmbeddedAspLexer(); } + execute(SCI_SETPROPERTY, reinterpret_cast("fold"), reinterpret_cast("1")); + execute(SCI_SETPROPERTY, reinterpret_cast("fold.compact"), reinterpret_cast("0")); + execute(SCI_SETPROPERTY, reinterpret_cast("fold.html"), reinterpret_cast("1")); } void ScintillaEditView::setEmbeddedJSLexer() @@ -679,7 +676,7 @@ void ScintillaEditView::setCppLexer(LangType langType) const TCHAR *lexerName = ScintillaEditView::langNames[langType].lexerName; - execute(SCI_SETLEXER, SCLEX_CPP); + execute(SCI_SETLEXER, SCLEX_CPP); if ((langType != L_RC) && (langType != L_JS)) { @@ -758,6 +755,14 @@ void ScintillaEditView::setCppLexer(LangType langType) execute(SCI_SETKEYWORDS, 0, (LPARAM)cppInstrs); execute(SCI_SETKEYWORDS, 1, (LPARAM)cppTypes); + execute(SCI_SETPROPERTY, reinterpret_cast("fold"), reinterpret_cast("1")); + execute(SCI_SETPROPERTY, reinterpret_cast("fold.compact"), reinterpret_cast("0")); + + execute(SCI_SETPROPERTY, reinterpret_cast("fold.comment"), reinterpret_cast("1")); + execute(SCI_SETPROPERTY, reinterpret_cast("fold.preprocessor"), reinterpret_cast("1")); + + // "#if 1 //" make CppLexer crash, so we disable it. + execute(SCI_SETPROPERTY, reinterpret_cast("lexer.cpp.track.preprocessor"), reinterpret_cast("0")); } void ScintillaEditView::setTclLexer() @@ -957,6 +962,11 @@ void ScintillaEditView::setLexer(int lexerID, LangType langType, int whichList) setKeywords(langType, pKwArray[LANG_INDEX_TYPE5], LANG_INDEX_TYPE5); #endif } + execute(SCI_SETPROPERTY, reinterpret_cast("fold"), reinterpret_cast("1")); + execute(SCI_SETPROPERTY, reinterpret_cast("fold.compact"), reinterpret_cast("0")); + + execute(SCI_SETPROPERTY, reinterpret_cast("fold.comment"), reinterpret_cast("1")); + execute(SCI_SETPROPERTY, reinterpret_cast("fold.preprocessor"), reinterpret_cast("1")); } void ScintillaEditView::makeStyle(LangType language, const TCHAR **keywordArray) diff --git a/PowerEditor/src/WinControls/Window.h b/PowerEditor/src/WinControls/Window.h index 4498e2f0..da92d1a0 100644 --- a/PowerEditor/src/WinControls/Window.h +++ b/PowerEditor/src/WinControls/Window.h @@ -81,7 +81,7 @@ public: }; HWND getHSelf() const { - assert(_hSelf != 0); + //assert(_hSelf != 0); return _hSelf; }; @@ -94,7 +94,7 @@ public: }; HINSTANCE getHinst() const { - assert(_hInst != 0); + //assert(_hInst != 0); return _hInst; }; protected: