From 5b23ddeefb7dd5cec85e70ab65d309f1f001a952 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Wed, 25 Nov 2009 01:51:04 +0000 Subject: [PATCH] [ADD] Add the style themes. [MODIF] Modify the SetWindowLongPtr argument for 64 bits compiling. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@572 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/bin/themes/Bespin.xml | 767 ++++++++++++++++++ PowerEditor/bin/themes/Black board.xml | 765 +++++++++++++++++ PowerEditor/bin/themes/Choco.xml | 765 +++++++++++++++++ PowerEditor/bin/themes/Deep Black.xml | 736 +++++++++++++++++ PowerEditor/bin/themes/Hello Kitty.xml | 736 +++++++++++++++++ PowerEditor/bin/themes/Mono Industrial.xml | 765 +++++++++++++++++ PowerEditor/bin/themes/Monokai.xml | 765 +++++++++++++++++ PowerEditor/bin/themes/Obsidian.xml | 754 +++++++++++++++++ PowerEditor/bin/themes/Plastic Code Wrap.xml | 765 +++++++++++++++++ PowerEditor/bin/themes/Ruby Blue.xml | 614 ++++++++++++++ PowerEditor/bin/themes/Twilight.xml | 765 +++++++++++++++++ PowerEditor/bin/themes/Vibrant Ink.xml | 737 +++++++++++++++++ PowerEditor/bin/themes/Zenburn.xml | 755 +++++++++++++++++ PowerEditor/bin/themes/vim Dark Blue.xml | 732 +++++++++++++++++ PowerEditor/installer/nppSetup.nsi | 11 +- PowerEditor/installer/packageAll.bat | 1 + PowerEditor/src/Notepad_plus.cpp | 4 +- PowerEditor/src/Parameters.cpp | 49 +- PowerEditor/src/Parameters.h | 2 +- PowerEditor/src/ScitillaComponent/Buffer.cpp | 3 +- .../src/ScitillaComponent/FindReplaceDlg.cpp | 2 +- .../src/WinControls/AboutDlg/URLCtrl.cpp | 8 +- .../WinControls/ColourPicker/ColourPicker.cpp | 4 +- .../WinControls/ColourPicker/ColourPopup.cpp | 2 +- .../WinControls/ColourPicker/WordStyleDlg.h | 4 +- .../WinControls/DockingWnd/DockingCont.cpp | 8 +- .../WinControls/DockingWnd/DockingManager.cpp | 2 +- .../DockingWnd/DockingSplitter.cpp | 2 +- .../src/WinControls/DockingWnd/Gripper.cpp | 2 +- .../OpenSaveFileDialog/FileDialog.cpp | 4 +- .../SplitterContainer/Splitter.cpp | 2 +- .../SplitterContainer/SplitterContainer.cpp | 2 +- .../WinControls/StaticDialog/StaticDialog.cpp | 2 +- .../WinControls/StaticDialog/StaticDialog.h | 2 +- PowerEditor/src/WinControls/TabBar/TabBar.cpp | 4 +- .../src/WinControls/TaskList/TaskList.cpp | 4 +- .../src/WinControls/ToolTip/ToolTip.cpp | 4 +- 37 files changed, 10502 insertions(+), 47 deletions(-) create mode 100644 PowerEditor/bin/themes/Bespin.xml create mode 100644 PowerEditor/bin/themes/Black board.xml create mode 100644 PowerEditor/bin/themes/Choco.xml create mode 100644 PowerEditor/bin/themes/Deep Black.xml create mode 100644 PowerEditor/bin/themes/Hello Kitty.xml create mode 100644 PowerEditor/bin/themes/Mono Industrial.xml create mode 100644 PowerEditor/bin/themes/Monokai.xml create mode 100644 PowerEditor/bin/themes/Obsidian.xml create mode 100644 PowerEditor/bin/themes/Plastic Code Wrap.xml create mode 100644 PowerEditor/bin/themes/Ruby Blue.xml create mode 100644 PowerEditor/bin/themes/Twilight.xml create mode 100644 PowerEditor/bin/themes/Vibrant Ink.xml create mode 100644 PowerEditor/bin/themes/Zenburn.xml create mode 100644 PowerEditor/bin/themes/vim Dark Blue.xml diff --git a/PowerEditor/bin/themes/Bespin.xml b/PowerEditor/bin/themes/Bespin.xml new file mode 100644 index 00000000..d8949dc2 --- /dev/null +++ b/PowerEditor/bin/themes/Bespin.xml @@ -0,0 +1,767 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + the_ID the_post have_posts wp_link_pages the_content + + + + $_POST $_GET $_SESSION + + + + + + + + + + + alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window + XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + import + import + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + ContentScroller + + + onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/Black board.xml b/PowerEditor/bin/themes/Black board.xml new file mode 100644 index 00000000..da2c3c8f --- /dev/null +++ b/PowerEditor/bin/themes/Black board.xml @@ -0,0 +1,765 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/Choco.xml b/PowerEditor/bin/themes/Choco.xml new file mode 100644 index 00000000..9f584de6 --- /dev/null +++ b/PowerEditor/bin/themes/Choco.xml @@ -0,0 +1,765 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ooooo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/Deep Black.xml b/PowerEditor/bin/themes/Deep Black.xml new file mode 100644 index 00000000..1d1f11b9 --- /dev/null +++ b/PowerEditor/bin/themes/Deep Black.xml @@ -0,0 +1,736 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/Hello Kitty.xml b/PowerEditor/bin/themes/Hello Kitty.xml new file mode 100644 index 00000000..b4be34e6 --- /dev/null +++ b/PowerEditor/bin/themes/Hello Kitty.xml @@ -0,0 +1,736 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/Mono Industrial.xml b/PowerEditor/bin/themes/Mono Industrial.xml new file mode 100644 index 00000000..80639363 --- /dev/null +++ b/PowerEditor/bin/themes/Mono Industrial.xml @@ -0,0 +1,765 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/Monokai.xml b/PowerEditor/bin/themes/Monokai.xml new file mode 100644 index 00000000..c25d3ab3 --- /dev/null +++ b/PowerEditor/bin/themes/Monokai.xml @@ -0,0 +1,765 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/Obsidian.xml b/PowerEditor/bin/themes/Obsidian.xml new file mode 100644 index 00000000..bdba5c4e --- /dev/null +++ b/PowerEditor/bin/themes/Obsidian.xml @@ -0,0 +1,754 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/Plastic Code Wrap.xml b/PowerEditor/bin/themes/Plastic Code Wrap.xml new file mode 100644 index 00000000..802feb41 --- /dev/null +++ b/PowerEditor/bin/themes/Plastic Code Wrap.xml @@ -0,0 +1,765 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/Ruby Blue.xml b/PowerEditor/bin/themes/Ruby Blue.xml new file mode 100644 index 00000000..21efde80 --- /dev/null +++ b/PowerEditor/bin/themes/Ruby Blue.xml @@ -0,0 +1,614 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/Twilight.xml b/PowerEditor/bin/themes/Twilight.xml new file mode 100644 index 00000000..7db52359 --- /dev/null +++ b/PowerEditor/bin/themes/Twilight.xml @@ -0,0 +1,765 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/Vibrant Ink.xml b/PowerEditor/bin/themes/Vibrant Ink.xml new file mode 100644 index 00000000..610901d5 --- /dev/null +++ b/PowerEditor/bin/themes/Vibrant Ink.xml @@ -0,0 +1,737 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/Zenburn.xml b/PowerEditor/bin/themes/Zenburn.xml new file mode 100644 index 00000000..1095626f --- /dev/null +++ b/PowerEditor/bin/themes/Zenburn.xml @@ -0,0 +1,755 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ooooo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + if else for while + if else for while + bool long int char + + + + + + + + + if else for while + bool long int char + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/bin/themes/vim Dark Blue.xml b/PowerEditor/bin/themes/vim Dark Blue.xml new file mode 100644 index 00000000..c6de2b77 --- /dev/null +++ b/PowerEditor/bin/themes/vim Dark Blue.xml @@ -0,0 +1,732 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index badcbec2..e79ad48a 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -17,12 +17,13 @@ ; Define the application name !define APPNAME "Notepad++" + !define APPVERSION "5.6" !define APPNAMEANDVERSION "Notepad++ v5.6" -!define APPWEBSITE "http://notepad-plus.sourceforge.net/" - !define VERSION_MAJOR 5 -!define VERSION_MINOR 52 +!define VERSION_MINOR 6 + +!define APPWEBSITE "http://notepad-plus.sourceforge.net/" ; Main Install settings Name "${APPNAMEANDVERSION}" @@ -680,13 +681,13 @@ SubSection "Plugins" Plugins File "..\bin\plugins\Config\NppAutoIndent.ini" SectionEnd -*/ + Section "Document Monitor" DocMonitor Delete "$INSTDIR\plugins\docMonitor.dll" SetOutPath "$INSTDIR\plugins" File "..\bin\plugins\docMonitor.dll" SectionEnd -/* + Section "Change Markers" ChangeMarkers Delete "$INSTDIR\plugins\NppPlugin_ChangeMarker.dll" SetOutPath "$INSTDIR\plugins" diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index dbff221b..3f81b68d 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -29,6 +29,7 @@ copy /Y ".\themes\*.*" .\zipped.package.release\unicode\themes\ copy /Y ".\updater\gpup.exe" .\zipped.package.release\unicode\updater\ +del /F /S /Q .\zipped.package.release\ansi\npp.pdb del /F /S /Q .\zipped.package.release\ansi\config.xml del /F /S /Q .\zipped.package.release\ansi\langs.xml del /F /S /Q .\zipped.package.release\ansi\stylers.xml diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index d0518864..6eb24fbd 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -10073,7 +10073,7 @@ LRESULT CALLBACK Notepad_plus::Notepad_plus_Proc(HWND hwnd, UINT Message, WPARAM { Notepad_plus *pM30ide = (Notepad_plus *)(((LPCREATESTRUCT)lParam)->lpCreateParams); pM30ide->_hSelf = hwnd; - ::SetWindowLongPtr(hwnd, GWL_USERDATA, (LONG)pM30ide); + ::SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pM30ide); return TRUE; } @@ -10133,7 +10133,7 @@ void Notepad_plus::fullScreenToggle() //Set popup style for fullscreen window and store the old style if (!_beforeSpecialView.isPostIt) { - _beforeSpecialView.preStyle = ::SetWindowLongPtr( _hSelf, GWL_STYLE, WS_POPUP ); + _beforeSpecialView.preStyle = ::SetWindowLongPtr(_hSelf, GWL_STYLE, WS_POPUP); if (!_beforeSpecialView.preStyle) { //something went wrong, use default settings _beforeSpecialView.preStyle = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN; } diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 8c5fbd48..d73bb02b 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -119,6 +119,24 @@ WinMenuKeyDefinition winKeyDefs[] = { {VK_NULL, IDM_SEARCH_COPYMARKEDLINES, false, false, false, NULL}, {VK_NULL, IDM_SEARCH_PASTEMARKEDLINES, false, false, false, NULL}, {VK_NULL, IDM_SEARCH_DELETEMARKEDLINES, false, false, false, NULL}, + {VK_NULL, IDM_SEARCH_MARKALLEXT1, false, false, false, NULL}, + {VK_NULL, IDM_SEARCH_MARKALLEXT2, false, false, false, NULL}, + {VK_NULL, IDM_SEARCH_MARKALLEXT3, false, false, false, NULL}, + {VK_NULL, IDM_SEARCH_MARKALLEXT4, false, false, false, NULL}, + {VK_NULL, IDM_SEARCH_MARKALLEXT5, false, false, false, NULL}, + {VK_NULL, IDM_SEARCH_UNMARKALLEXT1, false, false, false, NULL}, + {VK_NULL, IDM_SEARCH_UNMARKALLEXT2, false, false, false, NULL}, + {VK_NULL, IDM_SEARCH_UNMARKALLEXT3, false, false, false, NULL}, + {VK_NULL, IDM_SEARCH_UNMARKALLEXT4, false, false, false, NULL}, + {VK_NULL, IDM_SEARCH_UNMARKALLEXT5, false, false, false, NULL}, + {VK_NULL, IDM_SEARCH_CLEARALLMARKS, false, false, false, NULL}, + {VK_1, IDM_SEARCH_GOPREVMARKER1, true, false, true, NULL}, + {VK_2, IDM_SEARCH_GOPREVMARKER2, true, false, true, NULL}, + {VK_3, IDM_SEARCH_GOPREVMARKER3, true, false, true, NULL}, + {VK_4, IDM_SEARCH_GOPREVMARKER4, true, false, true, NULL}, + {VK_5, IDM_SEARCH_GOPREVMARKER5, true, false, true, NULL}, + {VK_0, IDM_SEARCH_GOPREVMARKER_DEF, true, false, true, NULL}, + {VK_F7, NPPM_INTERNAL_FOCUS_ON_FOUND_RESULTS,false, false, false, TEXT("Switch to found results window")}, {VK_F11, IDM_VIEW_FULLSCREENTOGGLE, false, false, false, NULL}, @@ -174,7 +192,26 @@ WinMenuKeyDefinition winKeyDefs[] = { {VK_NULL, IDM_FORMAT_CONV2_UTF_8, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_CONV2_UCS_2BE, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_CONV2_UCS_2LE, false, false, false, NULL}, - + {VK_NULL, IDM_FORMAT_CP855, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_MAC_CYRILLIC, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_KIO8U_CYRILLIC, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_KIO8R_CYRILLIC, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS437, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN1255, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN1257, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN1258, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN1251, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN1252, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN1254, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_ISO_8859_8, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN1250, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN1253, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN1256, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_TIS_620, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_GB2312, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_SHIFT_JIS, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_EUC_KR, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_BIG5, false, false, false, NULL}, {VK_NULL, IDM_SETTING_PREFERECE, false, false, false, NULL}, {VK_NULL, IDM_LANGSTYLE_CONFIG_DLG, false, false, false, NULL}, {VK_NULL, IDM_SETTING_SHORTCUT_MAPPER, false, false, false, NULL}, @@ -202,14 +239,8 @@ WinMenuKeyDefinition winKeyDefs[] = { {VK_3, IDM_SEARCH_GONEXTMARKER3, true, false, false, NULL}, {VK_4, IDM_SEARCH_GONEXTMARKER4, true, false, false, NULL}, {VK_5, IDM_SEARCH_GONEXTMARKER5, true, false, false, NULL}, - {VK_0, IDM_SEARCH_GONEXTMARKER_DEF, true, false, false, NULL}, - - {VK_1, IDM_SEARCH_GOPREVMARKER1, true, false, true, NULL}, - {VK_2, IDM_SEARCH_GOPREVMARKER2, true, false, true, NULL}, - {VK_3, IDM_SEARCH_GOPREVMARKER3, true, false, true, NULL}, - {VK_4, IDM_SEARCH_GOPREVMARKER4, true, false, true, NULL}, - {VK_5, IDM_SEARCH_GOPREVMARKER5, true, false, true, NULL}, - {VK_0, IDM_SEARCH_GOPREVMARKER_DEF, true, false, true, NULL}, + {VK_0, IDM_SEARCH_GONEXTMARKER_DEF, true, false, false, NULL} + }; diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h index e381409a..5f0491e5 100644 --- a/PowerEditor/src/Parameters.h +++ b/PowerEditor/src/Parameters.h @@ -1283,7 +1283,7 @@ public: void SetTransparent(HWND hwnd, int percent) { if (!_transparentFuncAddr) return; - ::SetWindowLongPtr(hwnd, GWL_EXSTYLE, ::GetWindowLongPtr(hwnd, GWL_EXSTYLE) | 0x00080000); + ::SetWindowLongPtr(hwnd, GWL_EXSTYLE, ::GetWindowLongPtrW(hwnd, GWL_EXSTYLE) | 0x00080000); _transparentFuncAddr(hwnd, 0, percent, 0x00000002); }; diff --git a/PowerEditor/src/ScitillaComponent/Buffer.cpp b/PowerEditor/src/ScitillaComponent/Buffer.cpp index 9b9dbf50..6b44609b 100644 --- a/PowerEditor/src/ScitillaComponent/Buffer.cpp +++ b/PowerEditor/src/ScitillaComponent/Buffer.cpp @@ -712,8 +712,9 @@ bool FileManager::loadFileData(Document doc, const TCHAR * filename, Utf8_16_Rea _pscratchTilla->execute(SCI_SETREADONLY, false); } _pscratchTilla->execute(SCI_CLEARALL); - +#ifdef UNICODE WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); +#endif if (language < L_EXTERNAL) { _pscratchTilla->execute(SCI_SETLEXER, ScintillaEditView::langNames[language].lexerID); diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index 0b1b63c5..22caedd8 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -1644,7 +1644,7 @@ void FindReplaceDlg::findAllIn(InWhat op) _pFinder->_scintView.init(_hInst, _pFinder->getHSelf()); // Subclass the ScintillaEditView for the Finder (Scintilla doesn't notify all key presses) - originalFinderProc = SetWindowLong( _pFinder->_scintView.getHSelf(), GWL_WNDPROC, (LONG) finderProc); + originalFinderProc = SetWindowLongPtr(_pFinder->_scintView.getHSelf(), GWLP_WNDPROC, (LONG_PTR)finderProc); _pFinder->setFinderReadOnly(true); _pFinder->_scintView.execute(SCI_SETCODEPAGE, SC_CP_UTF8); diff --git a/PowerEditor/src/WinControls/AboutDlg/URLCtrl.cpp b/PowerEditor/src/WinControls/AboutDlg/URLCtrl.cpp index 5396b0b5..499e6b1c 100644 --- a/PowerEditor/src/WinControls/AboutDlg/URLCtrl.cpp +++ b/PowerEditor/src/WinControls/AboutDlg/URLCtrl.cpp @@ -152,10 +152,10 @@ void URLCtrl::create(HWND itemHandle, TCHAR * link, COLORREF linkColor) _visitedColor = RGB(128,0,128); // subclass the static control - _oldproc = (WNDPROC)::SetWindowLongPtr(itemHandle, GWL_WNDPROC, (LONG)URLCtrlProc); + _oldproc = (WNDPROC)::SetWindowLongPtr(itemHandle, GWLP_WNDPROC, (LONG_PTR)URLCtrlProc); // associate the URL structure with the static control - ::SetWindowLongPtr(itemHandle, GWL_USERDATA, (LONG)this); + ::SetWindowLongPtr(itemHandle, GWLP_USERDATA, (LONG_PTR)this); } void URLCtrl::create(HWND itemHandle, int cmd, HWND msgDest) @@ -170,10 +170,10 @@ void URLCtrl::create(HWND itemHandle, int cmd, HWND msgDest) _linkColor = RGB(0,0,255); // subclass the static control - _oldproc = (WNDPROC)::SetWindowLongPtr(itemHandle, GWL_WNDPROC, (LONG)URLCtrlProc); + _oldproc = (WNDPROC)::SetWindowLongPtr(itemHandle, GWLP_WNDPROC, (LONG_PTR)URLCtrlProc); // associate the URL structure with the static control - ::SetWindowLongPtr(itemHandle, GWL_USERDATA, (LONG)this); + ::SetWindowLongPtr(itemHandle, GWLP_USERDATA, (LONG_PTR)this); } void URLCtrl::destroy() diff --git a/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp b/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp index 4217b9cf..6a28355e 100644 --- a/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp @@ -41,8 +41,8 @@ void ColourPicker::init(HINSTANCE hInst, HWND parent) } - ::SetWindowLongPtr(_hSelf, GWL_USERDATA, reinterpret_cast(this)); - _buttonDefaultProc = reinterpret_cast(::SetWindowLongPtr(_hSelf, GWL_WNDPROC, reinterpret_cast(staticWinProc))); + ::SetWindowLongPtr(_hSelf, GWLP_USERDATA, (LONG_PTR)this); + _buttonDefaultProc = reinterpret_cast(::SetWindowLongPtr(_hSelf, GWLP_WNDPROC, (LONG_PTR)staticWinProc)); } diff --git a/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp b/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp index 365c17ff..c0f148b5 100644 --- a/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp @@ -61,7 +61,7 @@ BOOL CALLBACK ColourPopup::dlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA { ColourPopup *pColourPopup = (ColourPopup *)(lParam); pColourPopup->_hSelf = hwnd; - ::SetWindowLongPtr(hwnd, GWL_USERDATA, (long)lParam); + ::SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)lParam); pColourPopup->run_dlgProc(message, wParam, lParam); return TRUE; } diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h index 3cfde161..8032e49c 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h @@ -50,8 +50,8 @@ public : return oldColour; }; void hookOn(HWND staticHandle) { - ::SetWindowLongPtr(staticHandle, GWL_USERDATA, (LONG)this); - _oldProc = (WNDPROC)::SetWindowLongPtr(staticHandle, GWL_WNDPROC, (LONG)staticProc); + ::SetWindowLongPtr(staticHandle, GWLP_USERDATA, (LONG_PTR)this); + _oldProc = (WNDPROC)::SetWindowLongPtr(staticHandle, GWLP_WNDPROC, (LONG_PTR)staticProc); }; private : COLORREF _colour; diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp index 8cf36b94..82b642d5 100644 --- a/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp @@ -906,12 +906,12 @@ BOOL CALLBACK DockingCont::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPara _hCaption = ::GetDlgItem(_hSelf, IDC_BTN_CAPTION); // intial subclassing of caption - ::SetWindowLongPtr(_hCaption, GWL_USERDATA, reinterpret_cast(this)); - _hDefaultCaptionProc = reinterpret_cast(::SetWindowLongPtr(_hCaption, GWL_WNDPROC, reinterpret_cast(wndCaptionProc))); + ::SetWindowLongPtr(_hCaption, GWLP_USERDATA, (LONG_PTR)this); + _hDefaultCaptionProc = reinterpret_cast(::SetWindowLongPtr(_hCaption, GWLP_WNDPROC, (LONG_PTR)wndCaptionProc)); // intial subclassing of tab - ::SetWindowLongPtr(_hContTab, GWL_USERDATA, reinterpret_cast(this)); - _hDefaultTabProc = reinterpret_cast(::SetWindowLongPtr(_hContTab, GWL_WNDPROC, reinterpret_cast(wndTabProc))); + ::SetWindowLongPtr(_hContTab, GWLP_USERDATA, (LONG_PTR)this); + _hDefaultTabProc = reinterpret_cast(::SetWindowLongPtr(_hContTab, GWLP_WNDPROC, (LONG_PTR)wndTabProc)); // set min tab width ::SendMessage(_hContTab, TCM_SETMINTABWIDTH, 0, (LPARAM)MIN_TABWIDTH); diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp index 72785884..f2f5d6b4 100644 --- a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp @@ -174,7 +174,7 @@ LRESULT CALLBACK DockingManager::staticWinProc(HWND hwnd, UINT message, WPARAM w case WM_NCCREATE : pDockingManager = (DockingManager *)(((LPCREATESTRUCT)lParam)->lpCreateParams); pDockingManager->_hSelf = hwnd; - ::SetWindowLongPtr(hwnd, GWL_USERDATA, reinterpret_cast(pDockingManager)); + ::SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pDockingManager); return TRUE; default : diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp index 9da4ec21..a47ca21e 100644 --- a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp @@ -122,7 +122,7 @@ LRESULT CALLBACK DockingSplitter::staticWinProc(HWND hwnd, UINT message, WPARAM case WM_NCCREATE : pDockingSplitter = (DockingSplitter *)(((LPCREATESTRUCT)lParam)->lpCreateParams); pDockingSplitter->_hSelf = hwnd; - ::SetWindowLongPtr(hwnd, GWL_USERDATA, reinterpret_cast(pDockingSplitter)); + ::SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pDockingSplitter); return TRUE; default : diff --git a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp index d0859b11..eef2952f 100644 --- a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp @@ -164,7 +164,7 @@ LRESULT CALLBACK Gripper::staticWinProc(HWND hwnd, UINT message, WPARAM wParam, case WM_NCCREATE : pDlgMoving = (Gripper *)(((LPCREATESTRUCT)lParam)->lpCreateParams); pDlgMoving->_hSelf = hwnd; - ::SetWindowLongPtr(hwnd, GWL_USERDATA, reinterpret_cast(pDlgMoving)); + ::SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pDlgMoving); return TRUE; default : diff --git a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp index dc247db7..d8a84f06 100644 --- a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp +++ b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp @@ -337,7 +337,7 @@ UINT_PTR CALLBACK FileDialog::OFNHookProc(HWND hWnd, UINT uMsg, WPARAM wParam, L NppParameters *pNppParam = NppParameters::getInstance(); int index = pNppParam->getFileSaveDlgFilterIndex(); - ::SetWindowLongPtr(hWnd, GWL_USERDATA, (long)staticThis); + ::SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)staticThis); hFileDlg = ::GetParent(hWnd); goToCenter(hFileDlg); @@ -350,7 +350,7 @@ UINT_PTR CALLBACK FileDialog::OFNHookProc(HWND hWnd, UINT uMsg, WPARAM wParam, L // Don't touch the following 3 lines, they are cursed !!! oldProc = (WNDPROC)::GetWindowLongPtr(hFileDlg, GWL_WNDPROC); if ((long)oldProc > 0) - ::SetWindowLongPtr(hFileDlg, GWL_WNDPROC, (LONG)fileDlgProc); + ::SetWindowLongPtr(hFileDlg, GWLP_WNDPROC, (LONG_PTR)fileDlgProc); return FALSE; } diff --git a/PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp b/PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp index 738c7188..da6dc39e 100644 --- a/PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp +++ b/PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp @@ -236,7 +236,7 @@ LRESULT CALLBACK Splitter::staticWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP { Splitter * pSplitter = (Splitter *)((LPCREATESTRUCT)lParam)->lpCreateParams; pSplitter->_hSelf = hWnd; - ::SetWindowLongPtr(hWnd, GWL_USERDATA, (long)pSplitter); + ::SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)pSplitter); return TRUE; } default: diff --git a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp index 6331e967..d4771179 100644 --- a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp +++ b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp @@ -113,7 +113,7 @@ LRESULT CALLBACK SplitterContainer::staticWinProc(HWND hwnd, UINT message, WPARA case WM_NCCREATE : pSplitterContainer = (SplitterContainer *)(((LPCREATESTRUCT)lParam)->lpCreateParams); pSplitterContainer->_hSelf = hwnd; - ::SetWindowLongPtr(hwnd, GWL_USERDATA, reinterpret_cast(pSplitterContainer)); + ::SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pSplitterContainer); return TRUE; default : diff --git a/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp b/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp index b433b424..3c25ccea 100644 --- a/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp +++ b/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp @@ -115,7 +115,7 @@ BOOL CALLBACK StaticDialog::dlgProc(HWND hwnd, UINT message, WPARAM wParam, LPAR { StaticDialog *pStaticDlg = (StaticDialog *)(lParam); pStaticDlg->_hSelf = hwnd; - ::SetWindowLongPtr(hwnd, GWL_USERDATA, (long)lParam); + ::SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)lParam); ::GetWindowRect(hwnd, &(pStaticDlg->_rc)); pStaticDlg->run_dlgProc(message, wParam, lParam); diff --git a/PowerEditor/src/WinControls/StaticDialog/StaticDialog.h b/PowerEditor/src/WinControls/StaticDialog/StaticDialog.h index 85a4958c..bf2c8902 100644 --- a/PowerEditor/src/WinControls/StaticDialog/StaticDialog.h +++ b/PowerEditor/src/WinControls/StaticDialog/StaticDialog.h @@ -46,7 +46,7 @@ public : StaticDialog() : Window() {}; ~StaticDialog(){ if (isCreated()) { - ::SetWindowLongPtr(_hSelf, GWL_USERDATA, (long)NULL); //Prevent run_dlgProc from doing anything, since its virtual + ::SetWindowLongPtr(_hSelf, GWLP_USERDATA, (LONG_PTR)NULL); //Prevent run_dlgProc from doing anything, since its virtual destroy(); } }; diff --git a/PowerEditor/src/WinControls/TabBar/TabBar.cpp b/PowerEditor/src/WinControls/TabBar/TabBar.cpp index 591cf51a..e5499d9a 100644 --- a/PowerEditor/src/WinControls/TabBar/TabBar.cpp +++ b/PowerEditor/src/WinControls/TabBar/TabBar.cpp @@ -286,8 +286,8 @@ void TabBarPlus::init(HINSTANCE hInst, HWND parent, bool isVertical, bool isTrad } _nbCtrl++; - ::SetWindowLongPtr(_hSelf, GWL_USERDATA, reinterpret_cast(this)); - _tabBarDefaultProc = reinterpret_cast(::SetWindowLongPtr(_hSelf, GWL_WNDPROC, reinterpret_cast(TabBarPlus_Proc))); + ::SetWindowLongPtr(_hSelf, GWLP_USERDATA, (LONG_PTR)this); + _tabBarDefaultProc = reinterpret_cast(::SetWindowLongPtr(_hSelf, GWLP_WNDPROC, (LONG_PTR)TabBarPlus_Proc)); } LOGFONT LogFont; diff --git a/PowerEditor/src/WinControls/TaskList/TaskList.cpp b/PowerEditor/src/WinControls/TaskList/TaskList.cpp index b094b9b1..7e62c389 100644 --- a/PowerEditor/src/WinControls/TaskList/TaskList.cpp +++ b/PowerEditor/src/WinControls/TaskList/TaskList.cpp @@ -59,8 +59,8 @@ void TaskList::init(HINSTANCE hInst, HWND parent, HIMAGELIST hImaLst, int nbItem throw int(69); } - ::SetWindowLongPtr(_hSelf, GWL_USERDATA, reinterpret_cast(this)); - _defaultProc = reinterpret_cast(::SetWindowLongPtr(_hSelf, GWL_WNDPROC, reinterpret_cast(staticProc))); + ::SetWindowLongPtr(_hSelf, GWLP_USERDATA, (LONG_PTR)this); + _defaultProc = reinterpret_cast(::SetWindowLongPtr(_hSelf, GWLP_WNDPROC, (LONG_PTR)staticProc)); DWORD exStyle = ListView_GetExtendedListViewStyle(_hSelf); exStyle |= LVS_EX_FULLROWSELECT | LVS_EX_BORDERSELECT ; diff --git a/PowerEditor/src/WinControls/ToolTip/ToolTip.cpp b/PowerEditor/src/WinControls/ToolTip/ToolTip.cpp index 12f07d88..15742b31 100644 --- a/PowerEditor/src/WinControls/ToolTip/ToolTip.cpp +++ b/PowerEditor/src/WinControls/ToolTip/ToolTip.cpp @@ -39,8 +39,8 @@ void ToolTip::init(HINSTANCE hInst, HWND hParent) throw int(6969); } - ::SetWindowLongPtr(_hSelf, GWL_USERDATA, reinterpret_cast(this)); - _defaultProc = reinterpret_cast(::SetWindowLongPtr(_hSelf, GWL_WNDPROC, reinterpret_cast(staticWinProc))); + ::SetWindowLongPtr(_hSelf, GWLP_USERDATA, (LONG_PTR)this); + _defaultProc = reinterpret_cast(::SetWindowLongPtr(_hSelf, GWLP_WNDPROC, (LONG_PTR)staticWinProc)); } }