Skip to content

Gwlp 648, Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_*#129

Merged
donho merged 10 commits intonotepad-plus-plus:masterfrom
chcg:GWLP_648
Jun 23, 2015
Merged

Gwlp 648, Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_*#129
donho merged 10 commits intonotepad-plus-plus:masterfrom
chcg:GWLP_648

Conversation

@chcg
Copy link
Contributor

@chcg chcg commented May 27, 2015

Added patch from http://sourceforge.net/p/notepad-plus/patches/648/ as preparation for x64 builds + some additional cleanups regarding Set/GetWindowLongPtr

chcg added 3 commits May 27, 2015 22:06
@chcg
Add patch from http://sourceforge.net/p/notepad-plus/patches/648/ by …
4d694ea 
…Xileer Torias with comment:

Updated the GetWindowLongPtr and SetWindowLongPtrW nIndex reference as per https://msdn.microsoft.com/en-us/library/windows/desktop/ms633585%28v=vs.85%29.aspx and https://msdn.microsoft.com/en-us/library/windows/desktop/ms644898(v=vs.85).aspx

This alters the function to be compatible with both x86, and x64 as to simplify future x64 builds.
@chcg
Further x86, x64 compatibility fix by reinterpret_cast<LONG_PTR> inst…
311c7d5 
…ead of reinterpret_cast<LONG> for SetWindowLongPtr
@chcg
Cleanup usage of remaining Pre-Unicode interface usage of SetWindowLo…
c3697d2 
…ngPtrW, SetWindowLongPtrA -> SetWindowLongPtr; GetWindowLongPtrW -> GetWindowLongPtr
NN---
NN--- reviewed May 28, 2015
View reviewed changes
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
Copy link
Contributor

@NN--- NN--- May 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you think this code is not needed anymore ?

Copy link
Contributor Author

@chcg chcg May 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think this part is a leftover of the old days with ANSI and Unicode version (https://notepad-plus-plus.org/download/v5.9.6.2.html) , but

_callWindowProc = CallWindowProcW;
should be
_callWindowProc = CallWindowProc;

@chcg
Copy link
Contributor Author

chcg commented May 28, 2015

"Code enhancement" was just the name used on donho:master, used unchanged by sync of this patch with the current master revision

@Croydon
Copy link
Contributor

Croydon commented May 28, 2015

@chcg Well, my comment was addressed to @donho. I did directly comment his commit, but GitHub is displaying all comments on all commits ;)

@ariccio
Copy link
Contributor

ariccio commented May 29, 2015

I did directly comment his commit, but GitHub is displaying all comments on all commits ;)

Hmm. Yes, this is a bit confusing >:(

@NN---
Copy link
Contributor

NN--- commented Jun 1, 2015

It has now conflicts.
Please update the PR.

NN--- added a commit to NN---/notepad-plus-plus that referenced this pull request Jun 2, 2015
@NN---
Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_* since we use …
36a7f03 
…GetWindowLongPtr (GWLP) and SetWindowLongPtr.

These functions work with LONG_PTR and not LONG.

See notepad-plus-plus#129
@NN--- NN--- mentioned this pull request Jun 2, 2015
Closed
@NN---
Copy link
Contributor

NN--- commented Jun 6, 2015

Merge conflicts :(

NN--- added a commit to NN---/notepad-plus-plus that referenced this pull request Jun 7, 2015
@NN---
Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_* since we use …
4223ea7 
…GetWindowLongPtr (GWLP) and SetWindowLongPtr.

These functions work with LONG_PTR and not LONG.

See notepad-plus-plus#129
@chcg chcg changed the title Gwlp 648 Gwlp 648, Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_* Jun 9, 2015
@chcg chcg mentioned this pull request Jun 11, 2015
Merged
@NN---
Copy link
Contributor

NN--- commented Jun 16, 2015

I think this should move to milestone 7 with the #178

@donho donho merged commit 10dfc33 into notepad-plus-plus:master Jun 23, 2015
@milipili milipili added the enhancement Proposed enhancements of existing features label Jun 23, 2015
@milipili milipili modified the milestone: 6.x Jun 29, 2015
@chcg chcg deleted the GWLP_648 branch January 2, 2021 09:46
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 9, 2023
@chcg
Update to Scintilla 5.3.3 and Lexilla 5.2.2
a4f32cc 
update to https://www.scintilla.org/scintilla533.zip with:

    Released 8 February 2023.
    Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug notepad-plus-plus#2372.
    Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
    When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion.
    On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug notepad-plus-plus#2374.
    On GTK, support IME context. Feature notepad-plus-plus#1476.
    On GTK on Win32, fix scrolling speed to not be too fast. Bug notepad-plus-plus#2375.
    On Qt, fix indicator drawing past left of text pane over margin. Bug notepad-plus-plus#2373, Bug notepad-plus-plus#1956.
    On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

    Released 8 February 2023.
    C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue notepad-plus-plus#130.
    Matlab: Include more prefix and suffix characters in numeric literals. Issue notepad-plus-plus#120.
    Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue notepad-plus-plus#18.
    Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue notepad-plus-plus#129.
    Modula-3: Fix endless loop in folder. Issue notepad-plus-plus#128.
    Modula-3: Fix access to lines beyond document end in folder. Issue notepad-plus-plus#131.
    Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request notepad-plus-plus#122.
    X12: Support empty envelopes. Bug notepad-plus-plus#2369.
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 9, 2023
@chcg
Update to Scintilla 5.3.3 and Lexilla 5.2.2
093a015 
update to https://www.scintilla.org/scintilla533.zip with:

    Released 8 February 2023.
    Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug notepad-plus-plus#2372.
    Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
    When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion.
    On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug notepad-plus-plus#2374.
    On GTK, support IME context. Feature notepad-plus-plus#1476.
    On GTK on Win32, fix scrolling speed to not be too fast. Bug notepad-plus-plus#2375.
    On Qt, fix indicator drawing past left of text pane over margin. Bug notepad-plus-plus#2373, Bug notepad-plus-plus#1956.
    On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

    Released 8 February 2023.
    C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue notepad-plus-plus#130.
    Matlab: Include more prefix and suffix characters in numeric literals. Issue notepad-plus-plus#120.
    Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue notepad-plus-plus#18.
    Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue notepad-plus-plus#129.
    Modula-3: Fix endless loop in folder. Issue notepad-plus-plus#128.
    Modula-3: Fix access to lines beyond document end in folder. Issue notepad-plus-plus#131.
    Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request notepad-plus-plus#122.
    X12: Support empty envelopes. Bug notepad-plus-plus#2369.

update CMakeLists.txt to latest changes within vcxproj file
@chcg chcg mentioned this pull request Feb 9, 2023
Closed
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 10, 2023
@chcg
Update to Scintilla 5.3.3 and Lexilla 5.2.2
3b9f557 
update to https://www.scintilla.org/scintilla533.zip with:

    Released 8 February 2023.
    Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug notepad-plus-plus#2372.
    Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
    When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion.
    On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug notepad-plus-plus#2374.
    On GTK, support IME context. Feature notepad-plus-plus#1476.
    On GTK on Win32, fix scrolling speed to not be too fast. Bug notepad-plus-plus#2375.
    On Qt, fix indicator drawing past left of text pane over margin. Bug notepad-plus-plus#2373, Bug notepad-plus-plus#1956.
    On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

    Released 8 February 2023.
    C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue notepad-plus-plus#130.
    Matlab: Include more prefix and suffix characters in numeric literals. Issue notepad-plus-plus#120.
    Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue notepad-plus-plus#18.
    Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue notepad-plus-plus#129.
    Modula-3: Fix endless loop in folder. Issue notepad-plus-plus#128.
    Modula-3: Fix access to lines beyond document end in folder. Issue notepad-plus-plus#131.
    Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request notepad-plus-plus#122.
    X12: Support empty envelopes. Bug notepad-plus-plus#2369.

update CMakeLists.txt to latest changes within vcxproj file
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 11, 2023
@chcg
Update to Scintilla 5.3.3 and Lexilla 5.2.2
73c7cde 
update to https://www.scintilla.org/scintilla533.zip with:

    Released 8 February 2023.
    Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug notepad-plus-plus#2372.
    Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
    When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion.
    On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug notepad-plus-plus#2374.
    On GTK, support IME context. Feature notepad-plus-plus#1476.
    On GTK on Win32, fix scrolling speed to not be too fast. Bug notepad-plus-plus#2375.
    On Qt, fix indicator drawing past left of text pane over margin. Bug notepad-plus-plus#2373, Bug notepad-plus-plus#1956.
    On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

    Released 8 February 2023.
    C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue notepad-plus-plus#130.
    Matlab: Include more prefix and suffix characters in numeric literals. Issue notepad-plus-plus#120.
    Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue notepad-plus-plus#18.
    Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue notepad-plus-plus#129.
    Modula-3: Fix endless loop in folder. Issue notepad-plus-plus#128.
    Modula-3: Fix access to lines beyond document end in folder. Issue notepad-plus-plus#131.
    Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request notepad-plus-plus#122.
    X12: Support empty envelopes. Bug notepad-plus-plus#2369.

update CMakeLists.txt to latest changes within vcxproj file
donho pushed a commit that referenced this pull request Feb 12, 2023
@chcg @donho
Update to Scintilla 5.3.3 and Lexilla 5.2.2
43182e1 
update to https://www.scintilla.org/scintilla533.zip with:

   1. Released 8 February 2023.
   2. Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug #2372.
   3. Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
   4. When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion.
   5. On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug #2374.
   6. On GTK, support IME context. Feature #1476.
   7. On GTK on Win32, fix scrolling speed to not be too fast. Bug #2375.
   8. On Qt, fix indicator drawing past left of text pane over margin. Bug #2373, Bug #1956.
   9. On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

   1. Released 8 February 2023.
   2. C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue #130.
   3. Matlab: Include more prefix and suffix characters in numeric literals. Issue #120.
   4. Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue #18.
   5. Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue #129.
   6. Modula-3: Fix endless loop in folder. Issue #128.
   7. Modula-3: Fix access to lines beyond document end in folder. Issue #131.
   8. Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request #122.
   9. X12: Support empty envelopes. Bug #2369.

update CMakeLists.txt to latest changes within vcxproj file

Close #13082
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

enhancement Proposed enhancements of existing features

Projects

None yet

Milestone

6.x

Development

Successfully merging this pull request may close these issues.

6 participants

@chcg @Croydon @ariccio @NN--- @donho @milipili