diff --git a/.gitignore b/.gitignore index 9123cfe3..9ccfbb1a 100644 --- a/.gitignore +++ b/.gitignore @@ -65,7 +65,7 @@ PowerEditor/bin/session.xml PowerEditor/bin/functionList.xml PowerEditor/bin/shortcuts.xml PowerEditor/bin/backup/ -PowerEditor/bin/localization/ +PowerEditor/bin/localization PowerEditor/bin/plugins/ PowerEditor/installer/build/ PowerEditor/installer/minimalist/ @@ -118,4 +118,18 @@ PowerEditor/bin/SourceCodePro-Bold.ttf PowerEditor/bin/SourceCodePro-BoldIt.ttf PowerEditor/bin/SourceCodePro-It.ttf PowerEditor/bin/SourceCodePro-Regular.ttf -*.zip \ No newline at end of file +*.zip + +#------------------------------------------------------------------------------- +# GNU GCC MinGW + +#-- Generated during makefile build +*.d +*.o +/PowerEditor/gcc/resources.res +/PowerEditor/bin/NotepadPP.exe + +#-- Generated manually to make Notepad++ execute properly on Linux using Wine +/PowerEditor/bin/libgcc_s_sjlj-1.dll +/PowerEditor/bin/libstdc++-6.dll +/PowerEditor/bin/libwinpthread-1.dll diff --git a/PowerEditor/gcc/delete.bat b/PowerEditor/gcc/delete.bat deleted file mode 100644 index f984df76..00000000 --- a/PowerEditor/gcc/delete.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -FOR /F "tokens=*" %%G IN ('dir /b /s ..\src\*.o') DO del "%%G" -del resources.res -@echo on \ No newline at end of file diff --git a/PowerEditor/gcc/include/eh.h b/PowerEditor/gcc/include/eh.h deleted file mode 100644 index 783ad7f7..00000000 --- a/PowerEditor/gcc/include/eh.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef EH_H - -typedef void (*exFunc)(unsigned int, EXCEPTION_POINTERS *); - -void _set_se_translator(exFunc) {}; - -#endif //EH_H diff --git a/PowerEditor/gcc/include/various.h b/PowerEditor/gcc/include/various.h index 10f04502..c4bf6f09 100644 --- a/PowerEditor/gcc/include/various.h +++ b/PowerEditor/gcc/include/various.h @@ -9,7 +9,7 @@ //TCS_BOTTOM = 300 //LVS_EX_BORDERSELECT = 500 //TBSTYLE_EX_HIDECLIPPEDBUTTONS = 501 -#define _WIN32_IE 0x501 +//#define _WIN32_IE 0x501 //Theme (uxtheme) #define _WIN32_WINNT 0x0501 @@ -41,11 +41,11 @@ static inline int min(unsigned int a, unsigned int b) { } //__try and __except dont work in gcc, so heres some defines to take em out -#define __try -#define __except(x) if(false) - -#define GetExceptionCode() 0 -#define GetExceptionInformation() NULL +#define __try try +#define __except(x) catch(...) //Missing unicode CRT funcs -double _wtof(const wchar_t * string); +//double _wtof(const wchar_t * string); + +// from MinGW include/driverspecs.h +#define __inout diff --git a/PowerEditor/gcc/makefile b/PowerEditor/gcc/makefile index 440fec33..701dbf1b 100644 --- a/PowerEditor/gcc/makefile +++ b/PowerEditor/gcc/makefile @@ -34,18 +34,27 @@ SCINT_DIR = $(NPP_DIR)/ScitillaComponent #TinyXml TIXML_DIR = $(NPP_DIR)/TinyXml + TIXMLA_DIR = $(TIXML_DIR)/tinyXmlA + +#uchardet +UCHARDET_DIR = $(NPP_DIR)/uchardet #WinControls WIN_DIR = $(NPP_DIR)/WinControls ABOUT_DIR = $(WIN_DIR)/AboutDlg + ANSICHAR_DIR = $(WIN_DIR)/AnsiCharPanel + CLIPBOARD_DIR = $(WIN_DIR)/ClipboardHistory CONTEXT_DIR = $(WIN_DIR)/ContextMenu COLOUR_DIR = $(WIN_DIR)/ColourPicker DOCKING_DIR = $(WIN_DIR)/DockingWnd + DOCMAP_DIR = $(WIN_DIR)/DocumentMap + FINDCHARS_DIR = $(WIN_DIR)/FindCharsInRange + FUNCLIST_DIR = $(WIN_DIR)/FunctionList GRID_DIR = $(WIN_DIR)/Grid IMLIST_DIR = $(WIN_DIR)/ImageListSet OPENSAVE_DIR = $(WIN_DIR)/OpenSaveFileDialog - # PANNER_DIR = $(WIN_DIR)/Panner PREFERENCE_DIR = $(WIN_DIR)/Preference + PRJPANEL_DIR = $(WIN_DIR)/ProjectPanel SHORTCUT_DIR = $(WIN_DIR)/shortcut SPLITTER_DIR = $(WIN_DIR)/SplitterContainer STATICDLG_DIR = $(WIN_DIR)/StaticDialog @@ -56,7 +65,8 @@ WIN_DIR = $(NPP_DIR)/WinControls TOOLBAR_DIR = $(WIN_DIR)/ToolBar TOOLTIP_DIR = $(WIN_DIR)/ToolTip TRAYICON_DIR = $(WIN_DIR)/TrayIcon - TREEVIEW_DIR = $(WIN_DIR)/TreeView + # TREEVIEW_DIR = $(WIN_DIR)/TreeView + VERTFILE_DIR = $(WIN_DIR)/VerticalFileSwitcher WINDOWSDLG_DIR = $(WIN_DIR)/WindowsDlg @@ -77,17 +87,27 @@ SRC_SCINT = $(wildcard $(SCINT_DIR)/*.cpp) #TinyXml SRC_TIXML = $(wildcard $(TIXML_DIR)/*.cpp) + SRC_TIXMLA = $(wildcard $(TIXMLA_DIR)/*.cpp) + +#uchardet +SRC_UCHARDET = $(wildcard $(UCHARDET_DIR)/*.cpp) #WinControls SRC_WIN = $(wildcard $(WIN_DIR)/*.cpp) SRC_ABOUT = $(wildcard $(ABOUT_DIR)/*.cpp) + SRC_ANSICHAR = $(wildcard $(ANSICHAR_DIR)/*.cpp) + SRC_CLIPBOARD = $(wildcard $(CLIPBOARD_DIR)/*.cpp) SRC_CONTEXT = $(wildcard $(CONTEXT_DIR)/*.cpp) SRC_COLOUR = $(wildcard $(COLOUR_DIR)/*.cpp) SRC_DOCKING = $(wildcard $(DOCKING_DIR)/*.cpp) + SRC_DOCMAP = $(wildcard $(DOCMAP_DIR)/*.cpp) + SRC_FINDCHARS = $(wildcard $(FINDCHARS_DIR)/*.cpp) + SRC_FUNCLIST = $(wildcard $(FUNCLIST_DIR)/*.cpp) SRC_GRID = $(wildcard $(GRID_DIR)/*.cpp) SRC_IMLIST = $(wildcard $(IMLIST_DIR)/*.cpp) SRC_OPENSAVE = $(wildcard $(OPENSAVE_DIR)/*.cpp) SRC_PREFERENCE = $(wildcard $(PREFERENCE_DIR)/*.cpp) + SRC_PRJPANEL = $(wildcard $(PRJPANEL_DIR)/*.cpp) SRC_SHORTCUT = $(wildcard $(SHORTCUT_DIR)/*.cpp) SRC_SPLITTER = $(wildcard $(SPLITTER_DIR)/*.cpp) SRC_STATICDLG = $(wildcard $(STATICDLG_DIR)/*.cpp) @@ -98,7 +118,7 @@ SRC_WIN = $(wildcard $(WIN_DIR)/*.cpp) SRC_TOOLBAR = $(wildcard $(TOOLBAR_DIR)/*.cpp) SRC_TOOLTIP = $(wildcard $(TOOLTIP_DIR)/*.cpp) SRC_TRAYICON = $(wildcard $(TRAYICON_DIR)/*.cpp) - SRC_TREEVIEW = $(wildcard $(TREEVIEW_DIR)/*.cpp) + SRC_VERTFILE = $(wildcard $(VERTFILE_DIR)/*.cpp) SRC_WINDOWSDLG = $(wildcard $(WINDOWSDLG_DIR)/*.cpp) # Objects: @@ -118,17 +138,27 @@ OBJ_SCINT = $(patsubst %.cpp,%.o,$(SRC_SCINT)) #TinyXml OBJ_TIXML = $(patsubst %.cpp,%.o,$(SRC_TIXML)) + OBJ_TIXMLA = $(patsubst %.cpp,%.o,$(SRC_TIXMLA)) + +#uchardet +OBJ_UCHARDET = $(patsubst %.cpp,%.o,$(SRC_UCHARDET)) #WinControls OBJ_WIN = $(patsubst %.cpp,%.o,$(SRC_WIN)) OBJ_ABOUT = $(patsubst %.cpp,%.o,$(SRC_ABOUT)) + OBJ_ANSICHAR = $(patsubst %.cpp,%.o,$(SRC_ANSICHAR)) + OBJ_CLIPBOARD = $(patsubst %.cpp,%.o,$(SRC_CLIPBOARD)) OBJ_CONTEXT = $(patsubst %.cpp,%.o,$(SRC_CONTEXT)) OBJ_COLOUR = $(patsubst %.cpp,%.o,$(SRC_COLOUR)) OBJ_DOCKING = $(patsubst %.cpp,%.o,$(SRC_DOCKING)) + OBJ_DOCMAP = $(patsubst %.cpp,%.o,$(SRC_DOCMAP)) + OBJ_FINDCHARS = $(patsubst %.cpp,%.o,$(SRC_FINDCHARS)) + OBJ_FUNCLIST = $(patsubst %.cpp,%.o,$(SRC_FUNCLIST)) OBJ_GRID = $(patsubst %.cpp,%.o,$(SRC_GRID)) OBJ_IMLIST = $(patsubst %.cpp,%.o,$(SRC_IMLIST)) OBJ_OPENSAVE = $(patsubst %.cpp,%.o,$(SRC_OPENSAVE)) OBJ_PREFERENCE = $(patsubst %.cpp,%.o,$(SRC_PREFERENCE)) + OBJ_PRJPANEL = $(patsubst %.cpp,%.o,$(SRC_PRJPANEL)) OBJ_SHORTCUT = $(patsubst %.cpp,%.o,$(SRC_SHORTCUT)) OBJ_SPLITTER = $(patsubst %.cpp,%.o,$(SRC_SPLITTER)) OBJ_STATICDLG = $(patsubst %.cpp,%.o,$(SRC_STATICDLG)) @@ -139,65 +169,102 @@ OBJ_WIN = $(patsubst %.cpp,%.o,$(SRC_WIN)) OBJ_TOOLBAR = $(patsubst %.cpp,%.o,$(SRC_TOOLBAR)) OBJ_TOOLTIP = $(patsubst %.cpp,%.o,$(SRC_TOOLTIP)) OBJ_TRAYICON = $(patsubst %.cpp,%.o,$(SRC_TRAYICON)) - OBJ_TREEVIEW = $(patsubst %.cpp,%.o,$(SRC_TREEVIEW)) + OBJ_VERTFILE = $(patsubst %.cpp,%.o,$(SRC_VERTFILE)) OBJ_WINDOWSDLG = $(patsubst %.cpp,%.o,$(SRC_WINDOWSDLG)) # Collections -DIRS_WIN = $(WIN_DIR) $(ABOUT_DIR) $(CONTEXT_DIR) $(COLOUR_DIR) $(DOCKING_DIR) $(GRID_DIR) $(IMLIST_DIR) $(OPENSAVE_DIR) $(PREFERENCE_DIR) $(SHORTCUT_DIR) $(SPLITTER_DIR) $(STATICDLG_DIR) $(RUNDLG_DIR) $(STATUSBAR_DIR) $(TABBAR_DIR) $(TASKLIST_DIR) $(TOOLBAR_DIR) $(TOOLTIP_DIR) $(TRAYICON_DIR) $(TREEVIEW_DIR) $(WINDOWSDLG_DIR) -DIRS_TIXML = $(TIXML_DIR) +DIRS_WIN = $(WIN_DIR) $(ABOUT_DIR) $(ANSICHAR_DIR) $(CLIPBOARD_DIR) $(CONTEXT_DIR) $(COLOUR_DIR) $(DOCKING_DIR) $(DOCMAP_DIR) $(FINDCHARS_DIR) $(FUNCLIST_DIR) $(GRID_DIR) $(IMLIST_DIR) $(OPENSAVE_DIR) $(PREFERENCE_DIR) $(PRJPANEL_DIR) $(SHORTCUT_DIR) $(SPLITTER_DIR) $(STATICDLG_DIR) $(RUNDLG_DIR) $(STATUSBAR_DIR) $(TABBAR_DIR) $(TASKLIST_DIR) $(TOOLBAR_DIR) $(TOOLTIP_DIR) $(TRAYICON_DIR) $(VERTFILE_DIR) $(WINDOWSDLG_DIR) +DIRS_UCHARDET = $(UCHARDET_DIR) +DIRS_TIXML = $(TIXML_DIR) $(TIXMLA_DIR) DIRS_SCINT = $(SCINT_DIR) DIRS_MISC = $(MISC_DIR) $(COMMON_DIR) $(EXCEPTION_DIR) $(PLUGINS_DIR) $(PROCESS_DIR) $(REGEXT_DIR) -DIRS = $(NPP_DIR) $(DIRS_WIN) $(DIRS_TIXML) $(DIRS_SCINT) $(DIRS_MISC) $(SCI_DIR) +DIRS = $(NPP_DIR) $(DIRS_WIN) $(DIRS_UCHARDET) $(DIRS_TIXML) $(DIRS_SCINT) $(DIRS_MISC) $(SCI_DIR) -SRCS_WIN = $(SRC_WIN) $(SRC_ABOUT) $(SRC_CONTEXT) $(SRC_COLOUR) $(SRC_DOCKING) $(SRC_GRID) $(SRC_IMLIST) $(SRC_OPENSAVE) $(SRC_PREFERENCE) $(SRC_SHORTCUT) $(SRC_SPLITTER) $(SRC_STATICDLG) $(SRC_RUNDLG) $(SRC_STATUSBAR) $(SRC_TABBAR) $(SRC_TASKLIST) $(SRC_TOOLBAR) $(SRC_TOOLTIP) $(SRC_TRAYICON) $(SRC_TREEVIEW) $(SRC_WINDOWSDLG) -SRCS_TIXML = $(SRC_TIXML) +SRCS_WIN = $(SRC_WIN) $(SRC_ABOUT) $(SRC_ANSICHAR) $(SRC_CLIPBOARD) $(SRC_CONTEXT) $(SRC_COLOUR) $(SRC_DOCKING) $(SRC_DOCMAP) $(SRC_FINDCHARS) $(SRC_FUNCLIST) $(SRC_GRID) $(SRC_IMLIST) $(SRC_OPENSAVE) $(SRC_PREFERENCE) $(SRC_PRJPANEL) $(SRC_SHORTCUT) $(SRC_SPLITTER) $(SRC_STATICDLG) $(SRC_RUNDLG) $(SRC_STATUSBAR) $(SRC_TABBAR) $(SRC_TASKLIST) $(SRC_TOOLBAR) $(SRC_TOOLTIP) $(SRC_TRAYICON) $(SRC_VERTFILE) $(SRC_WINDOWSDLG) +SRCS_UCHARDET = $(SRC_UCHARDET) +SRCS_TIXML = $(SRC_TIXML) $(SRC_TIXMLA) SRCS_SCINT = $(SRC_SCINT) SRCS_MISC = $(SRC_MISC) $(SRC_COMMON) $(SRC_EXCEPTION) $(SRC_PLUGINS) $(SRC_PROCESS) $(SRC_REGEXT) -SRCS = $(SRC_NPP) $(SRCS_WIN) $(SRCS_TIXML) $(SRCS_SCINT) $(SRCS_MISC) $(SRC_GCCINCLUDE) +SRCS = $(SRC_NPP) $(SRCS_WIN) $(SRCS_UCHARDET) $(SRCS_TIXML) $(SRCS_SCINT) $(SRCS_MISC) $(SRC_GCCINCLUDE) -OBJS_WIN = $(OBJ_WIN) $(OBJ_ABOUT) $(OBJ_CONTEXT) $(OBJ_COLOUR) $(OBJ_DOCKING) $(OBJ_GRID) $(OBJ_IMLIST) $(OBJ_OPENSAVE) $(OBJ_PREFERENCE) $(OBJ_SHORTCUT) $(OBJ_SPLITTER) $(OBJ_STATICDLG) $(OBJ_RUNDLG) $(OBJ_STATUSBAR) $(OBJ_TABBAR) $(OBJ_TASKLIST) $(OBJ_TOOLBAR) $(OBJ_TOOLTIP) $(OBJ_TRAYICON) $(OBJ_TREEVIEW) $(OBJ_WINDOWSDLG) -OBJS_TIXML = $(OBJ_TIXML) +OBJS_WIN = $(OBJ_WIN) $(OBJ_ABOUT) $(OBJ_ANSICHAR) $(OBJ_CLIPBOARD) $(OBJ_CONTEXT) $(OBJ_COLOUR) $(OBJ_DOCKING) $(OBJ_DOCMAP) $(OBJ_FINDCHARS) $(OBJ_FUNCLIST) $(OBJ_GRID) $(OBJ_IMLIST) $(OBJ_OPENSAVE) $(OBJ_PREFERENCE) $(OBJ_PRJPANEL) $(OBJ_SHORTCUT) $(OBJ_SPLITTER) $(OBJ_STATICDLG) $(OBJ_RUNDLG) $(OBJ_STATUSBAR) $(OBJ_TABBAR) $(OBJ_TASKLIST) $(OBJ_TOOLBAR) $(OBJ_TOOLTIP) $(OBJ_TRAYICON) $(OBJ_VERTFILE) $(OBJ_WINDOWSDLG) +OBJS_UCHARDET = $(OBJ_UCHARDET) +OBJS_TIXML = $(OBJ_TIXML) $(OBJ_TIXMLA) OBJS_SCINT = $(OBJ_SCINT) OBJS_MISC = $(OBJ_MISC) $(OBJ_COMMON) $(OBJ_EXCEPTION) $(OBJ_PLUGINS) $(OBJ_PROCESS) $(OBJ_REGEXT) -OBJS = $(OBJ_NPP) $(OBJS_WIN) $(OBJS_TIXML) $(OBJS_SCINT) $(OBJS_MISC) $(OBJ_GCCINCLUDE) +OBJS = $(OBJ_NPP) $(OBJS_WIN) $(OBJS_UCHARDET) $(OBJS_TIXML) $(OBJS_SCINT) $(OBJS_MISC) $(OBJ_GCCINCLUDE) # Main resource file SRC_RES = ./resources.rc OBJ_RES = $(patsubst %.rc,%.res,$(SRC_RES)) +# XML config files +SRC_XMLCFG = $(addprefix $(NPP_DIR)/,config.model.xml langs.model.xml stylers.model.xml shortcuts.xml functionList.xml contextMenu.xml) +DST_XMLCFG = $(subst $(NPP_DIR),../bin,$(SRC_XMLCFG)) + +DEPS = $(patsubst %.o,%.d,$(OBJS)) + +ifeq ($(OS),Windows_NT) +ifdef ComSpec +SHELL = $(ComSpec) +else +SHELL = cmd.exe +endif + +CROSS_COMPILE = +DIRSEP = \\ +RM = del +CP = copy /Y +else +CROSS_COMPILE ?= i686-w64-mingw32- +DIRSEP = / +RM = rm -f +CP = cp +endif + # Parameters -INCLUDESPECIAL = -include./include/various.h -includeCommon.h +INCLUDESPECIAL = -include./include/various.h # Comment this out for ANSI build UNICODE = -DUNICODE -D_UNICODE -CXX = g++ +CXX = $(CROSS_COMPILE)g++ #CXXFLAGS = -O2 $(INCLUDESPECIAL) -CXXFLAGS = $(INCLUDESPECIAL) -DTIXML_USE_STL $(UNICODE) +CXXFLAGS = $(INCLUDESPECIAL) -DTIXML_USE_STL -DTIXMLA_USE_STL $(UNICODE) -std=c++14 -fpermissive INCLUDES = $(patsubst %,-I%,$(DIRS)) -I./include LDFLAGS = -Wl,--subsystem,windows LIBS = -lcomdlg32 -lcomctl32 -lgdi32 -lole32 -loleacc -lshell32 -lshlwapi -RC = windres +RC = $(CROSS_COMPILE)windres OUT_NPP = NotepadPP.exe EXEC = ../bin/$(OUT_NPP) -all: NotepadPP +all: NotepadPP xmlcfg + +-include $(DEPS) # Main Notepad++ rule -NotepadPP: $(OBJS) $(OBJ_RES) - $(CXX) $(CXXFLAGS) $(INCLUDES) $(LDFLAGS) $(OBJS) $(OBJ_RES) -o $(EXEC) $(LIBS) +NotepadPP: $(EXEC) -NotepadPPUnicode: $(OBJS) $(OBJ_RES) - $(CXX) $(CXXFLAGS) $(INCLUDES) $(LDFLAGS) $(OBJS) $(OBJ_RES) -o $(EXEC) $(LIBS) +$(EXEC): $(OBJS) $(OBJ_RES) + $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@ %.o: %.cpp - $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@ + $(CXX) $(CXXFLAGS) $(INCLUDES) -MMD -c $< -o $@ %.res: %.rc $(RC) $(INCLUDES) $(UNICODE) --input=$< --output=$@ --input-format=rc --output-format=coff +xmlcfg: $(DST_XMLCFG) + +$(DST_XMLCFG): $(dir $(firstword $(DST_XMLCFG)))%.xml: $(dir $(firstword $(SRC_XMLCFG)))%.xml + $(CP) $(subst /,$(DIRSEP),$< $@) + # Cleanup clean: - @delete.bat + -@$(RM) $(subst /,$(DIRSEP),$(OBJS) $(OBJ_RES)) + -@$(RM) $(subst /,$(DIRSEP),$(DST_XMLCFG)) + -@$(RM) $(subst /,$(DIRSEP),$(DEPS)) + +.PHONY: all clean NotepadPP diff --git a/PowerEditor/gcc/readme.txt b/PowerEditor/gcc/readme.txt index 26b20b6a..e6602b2b 100644 --- a/PowerEditor/gcc/readme.txt +++ b/PowerEditor/gcc/readme.txt @@ -1,5 +1,24 @@ -makefile was renewed after the v5.0 release. -It was testing with a MingW distribution containing -gcc (GCC) 3.4.5 (mingw-vista special r3) -The default make rule should suffice for building Notepad++, -the clean rule call batch file with commands to remove .o files and resource file \ No newline at end of file +makefile was renewed after the v6.8.7 release. + +It was tested with a MinGW-w64 distribution containing +GCC 5.2.0 (cross-compiled with i686-w64-mingw32 on Arch Linux) and +GCC 4.9.2 (natively on Windows 7, will not work anymore with this version). + +The default make rule should suffice for building Notepad++, +and copying the required .xml config files. +If cross-compiling you may have to pass a custom CROSS_COMPILE +variable depending on your Linux distribution. +The clean rule removes .o/.d and .res and the copied .xml files + +For localization support in the editor preferences you have to copy the +PowerEditor/installer/nativeLang/ directory to PowerEditor/bin/ with the new +directory name "localization". +On Linux a symbolic link suffices: + $ ln -s ../installer/nativeLang localization + +For execution with Wine some additional DLLs from the MinGW package have to be +found inside of the PowerEditor/bin/ directory, which can be achieved by using +links again, e.g.: + $ ln -s /usr/i686-w64-mingw32/bin/libgcc_s_sjlj-1.dll + $ ln -s /usr/i686-w64-mingw32/bin/libstdc++-6.dll + $ ln -s /usr/i686-w64-mingw32/bin/libwinpthread-1.dll diff --git a/PowerEditor/gcc/resources.rc b/PowerEditor/gcc/resources.rc index c39177f0..76d1b321 100644 --- a/PowerEditor/gcc/resources.rc +++ b/PowerEditor/gcc/resources.rc @@ -6,14 +6,21 @@ #include "../src/ScitillaComponent/FindReplaceDlg.rc" #include "../src/ScitillaComponent/UserDefineDialog.rc" #include "../src/MISC/RegExt/regExtDlg.rc" +#include "../src/WinControls/AnsiCharPanel/ansiCharPanel.rc" +#include "../src/WinControls/ClipboardHistory/clipboardHistoryPanel.rc" #include "../src/WinControls/ColourPicker/ColourPopup.rc" #include "../src/WinControls/ColourPicker/WordStyleDlg.rc" #include "../src/WinControls/DockingWnd/DockingGUIWidget.rc" +#include "../src/WinControls/DocumentMap/documentMap.rc" +#include "../src/WinControls/FindCharsInRange/findCharsInRange.rc" +#include "../src/WinControls/FunctionList/functionListPanel.rc" #include "../src/WinControls/Grid/ShortcutMapper.rc" #include "../src/WinControls/Preference/preference.rc" +#include "../src/WinControls/ProjectPanel/ProjectPanel.rc" #include "../src/WinControls/shortcut/RunMacroDlg.rc" #include "../src/WinControls/shortcut/shortcut.rc" #include "../src/WinControls/TaskList/TaskListDlg.rc" #include "../src/WinControls/StaticDialog/RunDlg/RunDlg.rc" +#include "../src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.rc" #include "../src/WinControls/WindowsDlg/WindowsDlg.rc" #include "../src/Notepad_plus.rc" diff --git a/PowerEditor/src/EncodingMapper.cpp b/PowerEditor/src/EncodingMapper.cpp index 27c02c49..6cef0f91 100644 --- a/PowerEditor/src/EncodingMapper.cpp +++ b/PowerEditor/src/EncodingMapper.cpp @@ -31,7 +31,7 @@ #include "Scintilla.h" // Don't change the order -EncodingUnit encodings[] = { +static EncodingUnit encodings[] = { {1250, "windows-1250"}, //IDM_FORMAT_WIN_1250 {1251, "windows-1251"}, //IDM_FORMAT_WIN_1251 {1252, "windows-1252"}, //IDM_FORMAT_WIN_1252 diff --git a/PowerEditor/src/MISC/Common/Common.cpp b/PowerEditor/src/MISC/Common/Common.cpp index 93a0d152..7f2a3b24 100644 --- a/PowerEditor/src/MISC/Common/Common.cpp +++ b/PowerEditor/src/MISC/Common/Common.cpp @@ -25,8 +25,9 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include +#include #include -#include +#include #include #include "StaticDialog.h" @@ -823,7 +824,11 @@ double stodLocale(const generic_string& str, _locale_t loc, size_t* idx) const wchar_t* ptr = str.c_str(); errno = 0; wchar_t* eptr; +#ifdef __MINGW32__ + double ans = ::wcstod(ptr, &eptr); +#else double ans = ::_wcstod_l(ptr, &eptr, loc); +#endif if (ptr == eptr) throw new std::invalid_argument("invalid stod argument"); if (errno == ERANGE) diff --git a/PowerEditor/src/MISC/Common/Sorters.h b/PowerEditor/src/MISC/Common/Sorters.h index 388976e5..b0d335f6 100644 --- a/PowerEditor/src/MISC/Common/Sorters.h +++ b/PowerEditor/src/MISC/Common/Sorters.h @@ -122,12 +122,18 @@ class NumericSorter : public ISorter public: NumericSorter(bool isDescending, size_t fromColumn, size_t toColumn) : ISorter(isDescending, fromColumn, toColumn) { - _usLocale = ::_wcreate_locale(LC_NUMERIC, TEXT("en-US")); +#ifdef __MINGW32__ + _usLocale = NULL; +#else + _usLocale = ::_create_locale(LC_NUMERIC, "en-US"); +#endif }; ~NumericSorter() { +#ifndef __MINGW32__ ::_free_locale(_usLocale); +#endif } std::vector sort(std::vector lines) override diff --git a/PowerEditor/src/MISC/Exception/Win32Exception.cpp b/PowerEditor/src/MISC/Exception/Win32Exception.cpp index 3c8b55ec..3b2441fd 100644 --- a/PowerEditor/src/MISC/Exception/Win32Exception.cpp +++ b/PowerEditor/src/MISC/Exception/Win32Exception.cpp @@ -56,12 +56,16 @@ Win32Exception::Win32Exception(EXCEPTION_POINTERS * info) void Win32Exception::installHandler() { +#ifndef __MINGW32__ _set_se_translator(Win32Exception::translate); +#endif } void Win32Exception::removeHandler() { +#ifndef __MINGW32__ _set_se_translator(NULL); +#endif } void Win32Exception::translate(unsigned code, EXCEPTION_POINTERS * info) diff --git a/PowerEditor/src/MISC/Process/Process.cpp b/PowerEditor/src/MISC/Process/Process.cpp index 60bbad8d..a224eece 100644 --- a/PowerEditor/src/MISC/Process/Process.cpp +++ b/PowerEditor/src/MISC/Process/Process.cpp @@ -27,7 +27,7 @@ #include "Parameters.h" -#include "process.h" +#include "Process.h" void Process::run() diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 05d73ef0..e3a168c0 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -30,7 +30,7 @@ #include "Notepad_plus.h" #include "Notepad_plus_Window.h" #include "FileDialog.h" -#include "printer.h" +#include "Printer.h" #include "FileNameStringSplitter.h" #include "lesDlgs.h" #include "Utf8_16.h" diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index de216873..e12dfb81 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -61,149 +61,149 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_M30ICON ICON "icons\\npp.ico" -IDI_CHAMELEON ICON "icons\\chameleon.ico" -//IDI_JESUISCHARLIE ICON "icons\\Je_suis_Charlie.ico" -IDI_NEW_OFF_ICON ICON "icons\\new_off.ico" -IDI_OPEN_OFF_ICON ICON "icons\\open_off.ico" -IDI_SAVE_OFF_ICON ICON "icons\\save_off.ico" -IDI_SAVEALL_OFF_ICON ICON "icons\\saveall_off.ico" -IDI_CLOSE_OFF_ICON ICON "icons\\supp_off.ico" -IDI_CLOSEALL_OFF_ICON ICON "icons\\suppall_off.ico" -IDI_CUT_OFF_ICON ICON "icons\\cut_off.ico" -IDI_COPY_OFF_ICON ICON "icons\\dupli_off.ico" -IDI_PASTE_OFF_ICON ICON "icons\\paste_off.ico" -IDI_UNDO_OFF_ICON ICON "icons\\undo_off.ico" -IDI_REDO_OFF_ICON ICON "icons\\redo_off.ico" -IDI_FIND_OFF_ICON ICON "icons\\find_off.ico" -IDI_REPLACE_OFF_ICON ICON "icons\\findrep_off.ico" -IDI_ZOOMIN_OFF_ICON ICON "icons\\zoomIn_off.ico" -IDI_ZOOMOUT_OFF_ICON ICON "icons\\zoomOut_off.ico" -IDI_VIEW_UD_DLG_OFF_ICON ICON "icons\\userDefineDlg_off.ico" -IDI_VIEW_ALL_CHAR_OFF_ICON ICON "icons\\allChars_off.ico" -IDI_VIEW_INDENT_OFF_ICON ICON "icons\\indentGuide_off.ico" -IDI_VIEW_WRAP_OFF_ICON ICON "icons\\wrap_off.ico" -IDI_PRINT_OFF_ICON ICON "icons\\imprim_off.ico" -IDI_NEW_ON_ICON ICON "icons\\new_on.ico" -IDI_OPEN_ON_ICON ICON "icons\\open_on.ico" -IDI_SAVE_ON_ICON ICON "icons\\save_on.ico" -IDI_SAVEALL_ON_ICON ICON "icons\\saveall_on.ico" -IDI_CLOSE_ON_ICON ICON "icons\\supp_on.ico" -IDI_CLOSEALL_ON_ICON ICON "icons\\suppall_on.ico" -IDI_CUT_ON_ICON ICON "icons\\cut_on.ico" -IDI_COPY_ON_ICON ICON "icons\\dupli_on.ico" -IDI_PASTE_ON_ICON ICON "icons\\paste_on.ico" -IDI_UNDO_ON_ICON ICON "icons\\undo_on.ico" -IDI_REDO_ON_ICON ICON "icons\\redo_on.ico" -IDI_FIND_ON_ICON ICON "icons\\find_on.ico" -IDI_REPLACE_ON_ICON ICON "icons\\findrep_on.ico" -IDI_ZOOMIN_ON_ICON ICON "icons\\zoomIn_on.ico" -IDI_ZOOMOUT_ON_ICON ICON "icons\\zoomOut_on.ico" -IDI_VIEW_UD_DLG_ON_ICON ICON "icons\\userDefineDlg_on.ico" -IDI_VIEW_ALL_CHAR_ON_ICON ICON "icons\\allChars_on.ico" -IDI_VIEW_INDENT_ON_ICON ICON "icons\\indentGuide_on.ico" -IDI_VIEW_WRAP_ON_ICON ICON "icons\\wrap_on.ico" -IDI_PRINT_ON_ICON ICON "icons\\imprim_on.ico" +IDI_M30ICON ICON "icons/npp.ico" +IDI_CHAMELEON ICON "icons/chameleon.ico" +//IDI_JESUISCHARLIE ICON "icons/Je_suis_Charlie.ico" +IDI_NEW_OFF_ICON ICON "icons/new_off.ico" +IDI_OPEN_OFF_ICON ICON "icons/open_off.ico" +IDI_SAVE_OFF_ICON ICON "icons/save_off.ico" +IDI_SAVEALL_OFF_ICON ICON "icons/saveall_off.ico" +IDI_CLOSE_OFF_ICON ICON "icons/supp_off.ico" +IDI_CLOSEALL_OFF_ICON ICON "icons/suppall_off.ico" +IDI_CUT_OFF_ICON ICON "icons/cut_off.ico" +IDI_COPY_OFF_ICON ICON "icons/dupli_off.ico" +IDI_PASTE_OFF_ICON ICON "icons/paste_off.ico" +IDI_UNDO_OFF_ICON ICON "icons/undo_off.ico" +IDI_REDO_OFF_ICON ICON "icons/redo_off.ico" +IDI_FIND_OFF_ICON ICON "icons/find_off.ico" +IDI_REPLACE_OFF_ICON ICON "icons/findrep_off.ico" +IDI_ZOOMIN_OFF_ICON ICON "icons/zoomIn_off.ico" +IDI_ZOOMOUT_OFF_ICON ICON "icons/zoomOut_off.ico" +IDI_VIEW_UD_DLG_OFF_ICON ICON "icons/userDefineDlg_off.ico" +IDI_VIEW_ALL_CHAR_OFF_ICON ICON "icons/allChars_off.ico" +IDI_VIEW_INDENT_OFF_ICON ICON "icons/indentGuide_off.ico" +IDI_VIEW_WRAP_OFF_ICON ICON "icons/wrap_off.ico" +IDI_PRINT_OFF_ICON ICON "icons/imprim_off.ico" +IDI_NEW_ON_ICON ICON "icons/new_on.ico" +IDI_OPEN_ON_ICON ICON "icons/open_on.ico" +IDI_SAVE_ON_ICON ICON "icons/save_on.ico" +IDI_SAVEALL_ON_ICON ICON "icons/saveall_on.ico" +IDI_CLOSE_ON_ICON ICON "icons/supp_on.ico" +IDI_CLOSEALL_ON_ICON ICON "icons/suppall_on.ico" +IDI_CUT_ON_ICON ICON "icons/cut_on.ico" +IDI_COPY_ON_ICON ICON "icons/dupli_on.ico" +IDI_PASTE_ON_ICON ICON "icons/paste_on.ico" +IDI_UNDO_ON_ICON ICON "icons/undo_on.ico" +IDI_REDO_ON_ICON ICON "icons/redo_on.ico" +IDI_FIND_ON_ICON ICON "icons/find_on.ico" +IDI_REPLACE_ON_ICON ICON "icons/findrep_on.ico" +IDI_ZOOMIN_ON_ICON ICON "icons/zoomIn_on.ico" +IDI_ZOOMOUT_ON_ICON ICON "icons/zoomOut_on.ico" +IDI_VIEW_UD_DLG_ON_ICON ICON "icons/userDefineDlg_on.ico" +IDI_VIEW_ALL_CHAR_ON_ICON ICON "icons/allChars_on.ico" +IDI_VIEW_INDENT_ON_ICON ICON "icons/indentGuide_on.ico" +IDI_VIEW_WRAP_ON_ICON ICON "icons/wrap_on.ico" +IDI_PRINT_ON_ICON ICON "icons/imprim_on.ico" -IDI_SAVE_DISABLE_ICON ICON "icons\\save_dis.ico" -IDI_SAVEALL_DISABLE_ICON ICON "icons\\saveall_dis.ico" -IDI_CUT_DISABLE_ICON ICON "icons\\cut_dis.ico" -IDI_COPY_DISABLE_ICON ICON "icons\\dupli_dis.ico" -IDI_PASTE_DISABLE_ICON ICON "icons\\paste_dis.ico" -IDI_UNDO_DISABLE_ICON ICON "icons\\undo_dis.ico" -IDI_REDO_DISABLE_ICON ICON "icons\\redo_dis.ico" +IDI_SAVE_DISABLE_ICON ICON "icons/save_dis.ico" +IDI_SAVEALL_DISABLE_ICON ICON "icons/saveall_dis.ico" +IDI_CUT_DISABLE_ICON ICON "icons/cut_dis.ico" +IDI_COPY_DISABLE_ICON ICON "icons/dupli_dis.ico" +IDI_PASTE_DISABLE_ICON ICON "icons/paste_dis.ico" +IDI_UNDO_DISABLE_ICON ICON "icons/undo_dis.ico" +IDI_REDO_DISABLE_ICON ICON "icons/redo_dis.ico" // -IDI_SAVED_ICON ICON "icons\\saved.ico" -IDI_UNSAVED_ICON ICON "icons\\unsaved.ico" -IDI_READONLY_ICON ICON "icons\\readonly.ico" -IDI_DELETE_ICON ICON "icons\\delete.ico" +IDI_SAVED_ICON ICON "icons/saved.ico" +IDI_UNSAVED_ICON ICON "icons/unsaved.ico" +IDI_READONLY_ICON ICON "icons/readonly.ico" +IDI_DELETE_ICON ICON "icons/delete.ico" -IDI_FIND_RESULT_ICON ICON "icons\\findResult.ico" +IDI_FIND_RESULT_ICON ICON "icons/findResult.ico" -IDC_DRAG_TAB CURSOR "cursors\\drag.cur" -IDC_DRAG_INTERDIT_TAB CURSOR "cursors\\drag_interdit.cur" -IDC_DRAG_PLUS_TAB CURSOR "cursors\\drag_plus.cur" -IDC_DRAG_OUT_TAB CURSOR "cursors\\drag_out.cur" +IDC_DRAG_TAB CURSOR "cursors/drag.cur" +IDC_DRAG_INTERDIT_TAB CURSOR "cursors/drag_interdit.cur" +IDC_DRAG_PLUS_TAB CURSOR "cursors/drag_plus.cur" +IDC_DRAG_OUT_TAB CURSOR "cursors/drag_out.cur" -IDR_FILENEW BITMAP "icons\\newFile.bmp" -IDR_FILEOPEN BITMAP "icons\\openFile.bmp" -IDR_FILESAVE BITMAP "icons\\saveFile.bmp" -IDR_SAVEALL BITMAP "icons\\saveAll.bmp" -IDR_CLOSEFILE BITMAP "icons\\closeFile.bmp" -IDR_CLOSEALL BITMAP "icons\\closeAll.bmp" -IDR_FIND BITMAP "icons\\find.bmp" -IDR_REPLACE BITMAP "icons\\findReplace.bmp" -IDR_ZOOMIN BITMAP "icons\\zoomIn.bmp" -IDR_ZOOMOUT BITMAP "icons\\zoomOut.bmp" -IDR_WRAP BITMAP "icons\\wrap.bmp" -IDR_INVISIBLECHAR BITMAP "icons\\invisibleChar.bmp" -IDR_INDENTGUIDE BITMAP "icons\\indentGuide.bmp" -IDR_SHOWPANNEL BITMAP "icons\\showPannel.bmp" -IDR_STARTRECORD BITMAP "icons\\startRecord.bmp" -IDR_STOPRECORD BITMAP "icons\\stopRecord.bmp" -IDR_PLAYRECORD BITMAP "icons\\playRecord.bmp" -IDR_M_PLAYRECORD BITMAP "icons\\playRecord_m.bmp" -IDR_SAVERECORD BITMAP "icons\\saveRecord.bmp" -IDR_CUT BITMAP "icons\\cut.bmp" -IDR_COPY BITMAP "icons\\copy.bmp" -IDR_PASTE BITMAP "icons\\paste.bmp" -IDR_UNDO BITMAP "icons\\undo.bmp" -IDR_REDO BITMAP "icons\\redo.bmp" -IDR_SYNCV BITMAP "icons\\syncV.bmp" -IDR_SYNCH BITMAP "icons\\syncH.bmp" -IDR_PRINT BITMAP "icons\\print.bmp" -IDR_CLOSETAB BITMAP "icons\\closeTabButton.bmp" -IDR_CLOSETAB_INACT BITMAP "icons\\closeTabButton_inact.bmp" -IDR_CLOSETAB_HOVER BITMAP "icons\\closeTabButton_hover.bmp" -IDR_CLOSETAB_PUSH BITMAP "icons\\closeTabButton_push.bmp" -IDR_DOCMAP BITMAP "icons\\docMap.bmp" -IDR_FUNC_LIST BITMAP "icons\\functionList.bmp" -IDR_DOCMAP_ICO ICON "icons\\docMap.ico" -IDR_FUNC_LIST_ICO ICON "icons\\functionList.ico" -IDR_PROJECTPANEL_ICO ICON "icons\\projectPanel.ico" -IDR_CLIPBOARDPANEL_ICO ICON "icons\\clipboardPanel.ico" -IDR_ASCIIPANEL_ICO ICON "icons\\asciiPanel.ico" -IDR_DOCSWITCHER_ICO ICON "icons\\docSwitcher.ico" -IDI_STARTRECORD_OFF_ICON ICON "icons\\startrecord_off.ico" -IDI_STARTRECORD_ON_ICON ICON "icons\\startrecord_on.ico" -IDI_STARTRECORD_DISABLE_ICON ICON "icons\\startrecord_dis.ico" -IDI_STOPRECORD_OFF_ICON ICON "icons\\stoprecord_off.ico" -IDI_STOPRECORD_ON_ICON ICON "icons\\stoprecord_on.ico" -IDI_STOPRECORD_DISABLE_ICON ICON "icons\\stoprecord_dis.ico" -IDI_PLAYRECORD_OFF_ICON ICON "icons\\playrecord_off.ico" -IDI_PLAYRECORD_ON_ICON ICON "icons\\playrecord_on.ico" -IDI_PLAYRECORD_DISABLE_ICON ICON "icons\\playrecord_dis.ico" -IDI_SAVERECORD_OFF_ICON ICON "icons\\saverecord_off.ico" -IDI_SAVERECORD_ON_ICON ICON "icons\\saverecord_on.ico" -IDI_SAVERECORD_DISABLE_ICON ICON "icons\\saverecord_dis.ico" +IDR_FILENEW BITMAP "icons/newFile.bmp" +IDR_FILEOPEN BITMAP "icons/openFile.bmp" +IDR_FILESAVE BITMAP "icons/saveFile.bmp" +IDR_SAVEALL BITMAP "icons/saveAll.bmp" +IDR_CLOSEFILE BITMAP "icons/closeFile.bmp" +IDR_CLOSEALL BITMAP "icons/closeAll.bmp" +IDR_FIND BITMAP "icons/find.bmp" +IDR_REPLACE BITMAP "icons/findReplace.bmp" +IDR_ZOOMIN BITMAP "icons/zoomIn.bmp" +IDR_ZOOMOUT BITMAP "icons/zoomOut.bmp" +IDR_WRAP BITMAP "icons/wrap.bmp" +IDR_INVISIBLECHAR BITMAP "icons/invisibleChar.bmp" +IDR_INDENTGUIDE BITMAP "icons/indentGuide.bmp" +IDR_SHOWPANNEL BITMAP "icons/showPannel.bmp" +IDR_STARTRECORD BITMAP "icons/startRecord.bmp" +IDR_STOPRECORD BITMAP "icons/stopRecord.bmp" +IDR_PLAYRECORD BITMAP "icons/playRecord.bmp" +IDR_M_PLAYRECORD BITMAP "icons/playRecord_m.bmp" +IDR_SAVERECORD BITMAP "icons/saveRecord.bmp" +IDR_CUT BITMAP "icons/cut.bmp" +IDR_COPY BITMAP "icons/copy.bmp" +IDR_PASTE BITMAP "icons/paste.bmp" +IDR_UNDO BITMAP "icons/undo.bmp" +IDR_REDO BITMAP "icons/redo.bmp" +IDR_SYNCV BITMAP "icons/syncV.bmp" +IDR_SYNCH BITMAP "icons/syncH.bmp" +IDR_PRINT BITMAP "icons/print.bmp" +IDR_CLOSETAB BITMAP "icons/closeTabButton.bmp" +IDR_CLOSETAB_INACT BITMAP "icons/closeTabButton_inact.bmp" +IDR_CLOSETAB_HOVER BITMAP "icons/closeTabButton_hover.bmp" +IDR_CLOSETAB_PUSH BITMAP "icons/closeTabButton_push.bmp" +IDR_DOCMAP BITMAP "icons/docMap.bmp" +IDR_FUNC_LIST BITMAP "icons/functionList.bmp" +IDR_DOCMAP_ICO ICON "icons/docMap.ico" +IDR_FUNC_LIST_ICO ICON "icons/functionList.ico" +IDR_PROJECTPANEL_ICO ICON "icons/projectPanel.ico" +IDR_CLIPBOARDPANEL_ICO ICON "icons/clipboardPanel.ico" +IDR_ASCIIPANEL_ICO ICON "icons/asciiPanel.ico" +IDR_DOCSWITCHER_ICO ICON "icons/docSwitcher.ico" +IDI_STARTRECORD_OFF_ICON ICON "icons/startrecord_off.ico" +IDI_STARTRECORD_ON_ICON ICON "icons/startrecord_on.ico" +IDI_STARTRECORD_DISABLE_ICON ICON "icons/startrecord_dis.ico" +IDI_STOPRECORD_OFF_ICON ICON "icons/stoprecord_off.ico" +IDI_STOPRECORD_ON_ICON ICON "icons/stoprecord_on.ico" +IDI_STOPRECORD_DISABLE_ICON ICON "icons/stoprecord_dis.ico" +IDI_PLAYRECORD_OFF_ICON ICON "icons/playrecord_off.ico" +IDI_PLAYRECORD_ON_ICON ICON "icons/playrecord_on.ico" +IDI_PLAYRECORD_DISABLE_ICON ICON "icons/playrecord_dis.ico" +IDI_SAVERECORD_OFF_ICON ICON "icons/saverecord_off.ico" +IDI_SAVERECORD_ON_ICON ICON "icons/saverecord_on.ico" +IDI_SAVERECORD_DISABLE_ICON ICON "icons/saverecord_dis.ico" -IDI_SYNCV_OFF_ICON ICON "icons\\syncV_off.ico" -IDI_SYNCV_ON_ICON ICON "icons\\syncV_on.ico" -IDI_SYNCV_DISABLE_ICON ICON "icons\\syncV_dis.ico" -IDI_SYNCH_OFF_ICON ICON "icons\\syncH_off.ico" -IDI_SYNCH_ON_ICON ICON "icons\\syncH_on.ico" -IDI_SYNCH_DISABLE_ICON ICON "icons\\syncH_dis.ico" +IDI_SYNCV_OFF_ICON ICON "icons/syncV_off.ico" +IDI_SYNCV_ON_ICON ICON "icons/syncV_on.ico" +IDI_SYNCV_DISABLE_ICON ICON "icons/syncV_dis.ico" +IDI_SYNCH_OFF_ICON ICON "icons/syncH_off.ico" +IDI_SYNCH_ON_ICON ICON "icons/syncH_on.ico" +IDI_SYNCH_DISABLE_ICON ICON "icons/syncH_dis.ico" // multi run macro -IDI_MMPLAY_DIS_ICON ICON "icons\\playrecord_m_dis.ico" -IDI_MMPLAY_OFF_ICON ICON "icons\\playrecord_m_off.ico" -IDI_MMPLAY_ON_ICON ICON "icons\\playrecord_m_on.ico" +IDI_MMPLAY_DIS_ICON ICON "icons/playrecord_m_dis.ico" +IDI_MMPLAY_OFF_ICON ICON "icons/playrecord_m_off.ico" +IDI_MMPLAY_ON_ICON ICON "icons/playrecord_m_on.ico" -IDI_PROJECT_WORKSPACE BITMAP "icons\\project_work_space.bmp" -IDI_PROJECT_WORKSPACEDIRTY BITMAP "icons\\project_work_space_dirty.bmp" -IDI_PROJECT_PROJECT BITMAP "icons\\project_root.bmp" -IDI_PROJECT_FOLDEROPEN BITMAP "icons\\project_folder_open.bmp" -IDI_PROJECT_FOLDERCLOSE BITMAP "icons\\project_folder_close.bmp" -IDI_PROJECT_FILE BITMAP "icons\\project_file.bmp" -IDI_PROJECT_FILEINVALID BITMAP "icons\\project_file_invalid.bmp" +IDI_PROJECT_WORKSPACE BITMAP "icons/project_work_space.bmp" +IDI_PROJECT_WORKSPACEDIRTY BITMAP "icons/project_work_space_dirty.bmp" +IDI_PROJECT_PROJECT BITMAP "icons/project_root.bmp" +IDI_PROJECT_FOLDEROPEN BITMAP "icons/project_folder_open.bmp" +IDI_PROJECT_FOLDERCLOSE BITMAP "icons/project_folder_close.bmp" +IDI_PROJECT_FILE BITMAP "icons/project_file.bmp" +IDI_PROJECT_FILEINVALID BITMAP "icons/project_file_invalid.bmp" -IDI_FUNCLIST_ROOT BITMAP "icons\\project_file.bmp" -IDI_FUNCLIST_NODE BITMAP "icons\\funcList_node.bmp" -IDI_FUNCLIST_LEAF BITMAP "icons\\funcList_leaf.bmp" +IDI_FUNCLIST_ROOT BITMAP "icons/project_file.bmp" +IDI_FUNCLIST_NODE BITMAP "icons/funcList_node.bmp" +IDI_FUNCLIST_LEAF BITMAP "icons/funcList_leaf.bmp" -IDI_FUNCLIST_SORTBUTTON BITMAP "icons\\funclstSort.bmp" -IDI_FUNCLIST_RELOADBUTTON BITMAP "icons\\funclstReload.bmp" +IDI_FUNCLIST_SORTBUTTON BITMAP "icons/funclstSort.bmp" +IDI_FUNCLIST_RELOADBUTTON BITMAP "icons/funclstReload.bmp" IDR_M30_MENU MENU BEGIN @@ -361,8 +361,8 @@ BEGIN MENUITEM "Previous Search Result", IDM_SEARCH_GOTOPREVFOUND MENUITEM "&Go to...", IDM_SEARCH_GOTOLINE MENUITEM "Go to Matching Brace", IDM_SEARCH_GOTOMATCHINGBRACE - MENUITEM "Select All Between Matching Braces" IDM_SEARCH_SELECTMATCHINGBRACES - MENUITEM "Mar&k..." IDM_SEARCH_MARK + MENUITEM "Select All Between Matching Braces", IDM_SEARCH_SELECTMATCHINGBRACES + MENUITEM "Mar&k...", IDM_SEARCH_MARK MENUITEM SEPARATOR POPUP "Mark All" @@ -450,18 +450,18 @@ BEGIN POPUP "Tab" BEGIN - MENUITEM "1st Tab" IDM_VIEW_TAB1 - MENUITEM "2nd Tab" IDM_VIEW_TAB2 - MENUITEM "3rd Tab" IDM_VIEW_TAB3 - MENUITEM "4th Tab" IDM_VIEW_TAB4 - MENUITEM "5th Tab" IDM_VIEW_TAB5 - MENUITEM "6th Tab" IDM_VIEW_TAB6 - MENUITEM "7th Tab" IDM_VIEW_TAB7 - MENUITEM "8th Tab" IDM_VIEW_TAB8 - MENUITEM "9th Tab" IDM_VIEW_TAB9 + MENUITEM "1st Tab", IDM_VIEW_TAB1 + MENUITEM "2nd Tab", IDM_VIEW_TAB2 + MENUITEM "3rd Tab", IDM_VIEW_TAB3 + MENUITEM "4th Tab", IDM_VIEW_TAB4 + MENUITEM "5th Tab", IDM_VIEW_TAB5 + MENUITEM "6th Tab", IDM_VIEW_TAB6 + MENUITEM "7th Tab", IDM_VIEW_TAB7 + MENUITEM "8th Tab", IDM_VIEW_TAB8 + MENUITEM "9th Tab", IDM_VIEW_TAB9 MENUITEM SEPARATOR - MENUITEM "Next Tab" IDM_VIEW_TAB_NEXT - MENUITEM "Previous Tab" IDM_VIEW_TAB_PREV + MENUITEM "Next Tab", IDM_VIEW_TAB_NEXT + MENUITEM "Previous Tab", IDM_VIEW_TAB_PREV END MENUITEM "Word wrap", IDM_VIEW_WRAP MENUITEM "Focus on Another View", IDM_VIEW_SWITCHTO_OTHER_VIEW diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp index 54852c0a..bedc48f2 100644 --- a/PowerEditor/src/NppIO.cpp +++ b/PowerEditor/src/NppIO.cpp @@ -33,7 +33,7 @@ #include "EncodingMapper.h" #include "VerticalFileSwitcher.h" #include "functionListPanel.h" -#include +#include using namespace std; diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 126a38d1..793a3025 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include "Parameters.h" #include "FileDialog.h" #include "ScintillaEditView.h" diff --git a/PowerEditor/src/ScitillaComponent/Buffer.h b/PowerEditor/src/ScitillaComponent/Buffer.h index 76102735..0c857be7 100644 --- a/PowerEditor/src/ScitillaComponent/Buffer.h +++ b/PowerEditor/src/ScitillaComponent/Buffer.h @@ -29,6 +29,7 @@ +class Notepad_plus; class Buffer; typedef Buffer* BufferID; //each buffer has unique ID by which it can be retrieved #define BUFFER_INVALID (BufferID)0 diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index a2198af9..d0a094c2 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -25,7 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -#include +#include #include #include "FindReplaceDlg.h" #include "ScintillaEditView.h" diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc index 79fa923f..7eaa2446 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc @@ -87,7 +87,7 @@ BEGIN CONTROL "&. matches newline",IDREDOTMATCHNL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,167,67,9 END -IDB_INCREMENTAL_BG BITMAP "..\\icons\\incrementalBg.bmp" +IDB_INCREMENTAL_BG BITMAP "../icons/incrementalBg.bmp" IDD_INCREMENT_FIND DIALOGEX 0, 0, 400, 20 STYLE DS_SYSMODAL | DS_CONTROL | DS_FIXEDSYS | WS_CHILD | WS_CLIPCHILDREN diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp index d3dfa53b..343d0e8a 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp @@ -30,7 +30,7 @@ #include "ScintillaEditView.h" #include "Parameters.h" #include "Sorters.h" -#include "TCHAR.h" +#include "tchar.h" #include using namespace std; @@ -171,7 +171,7 @@ void ScintillaEditView::init(HINSTANCE hInst, HWND hPere) { if (!_hLib) { - throw std::exception("ScintillaEditView::init : SCINTILLA ERROR - Can not load the dynamic library"); + throw std::runtime_error("ScintillaEditView::init : SCINTILLA ERROR - Can not load the dynamic library"); } Window::init(hInst, hPere); @@ -188,7 +188,7 @@ void ScintillaEditView::init(HINSTANCE hInst, HWND hPere) if (!_hSelf) { - throw std::exception("ScintillaEditView::init : CreateWindowEx() function return null"); + throw std::runtime_error("ScintillaEditView::init : CreateWindowEx() function return null"); } _pScintillaFunc = (SCINTILLA_FUNC)::SendMessage(_hSelf, SCI_GETDIRECTFUNCTION, 0, 0); @@ -198,12 +198,12 @@ void ScintillaEditView::init(HINSTANCE hInst, HWND hPere) if (!_pScintillaFunc) { - throw std::exception("ScintillaEditView::init : SCI_GETDIRECTFUNCTION message failed"); + throw std::runtime_error("ScintillaEditView::init : SCI_GETDIRECTFUNCTION message failed"); } if (!_pScintillaPtr) { - throw std::exception("ScintillaEditView::init : SCI_GETDIRECTPOINTER message failed"); + throw std::runtime_error("ScintillaEditView::init : SCI_GETDIRECTPOINTER message failed"); } execute(SCI_SETMARGINMASKN, _SC_MARGE_FOLDER, SC_MASK_FOLDERS); diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.h b/PowerEditor/src/ScitillaComponent/UserDefineDialog.h index 2ae1fa2d..cc44cf08 100644 --- a/PowerEditor/src/ScitillaComponent/UserDefineDialog.h +++ b/PowerEditor/src/ScitillaComponent/UserDefineDialog.h @@ -41,16 +41,8 @@ #ifndef URLCTRL_INCLUDED #include "URLCtrl.h" #endif// URLCTRL_INCLUDED -#ifdef __GNUC__ -static int min(int a, int b) { - return (ab)?a:b; -}; -#endif //__GNUC__ #include "tchar.h" -#include "scilexer.h" +#include "SciLexer.h" #include class ScintillaEditView; diff --git a/PowerEditor/src/ScitillaComponent/UserDefineLangReference.h b/PowerEditor/src/ScitillaComponent/UserDefineLangReference.h index 3f8c7a92..6d51fdc7 100644 --- a/PowerEditor/src/ScitillaComponent/UserDefineLangReference.h +++ b/PowerEditor/src/ScitillaComponent/UserDefineLangReference.h @@ -29,7 +29,7 @@ #ifndef USER_DEFINE_LANG_REFERENCE_H #define USER_DEFINE_LANG_REFERENCE_H -#include "scilexer.h" +#include "SciLexer.h" const int langNameLenMax = 33; const int extsLenMax = 256; diff --git a/PowerEditor/src/ScitillaComponent/columnEditor.cpp b/PowerEditor/src/ScitillaComponent/columnEditor.cpp index 32236560..d57daef0 100644 --- a/PowerEditor/src/ScitillaComponent/columnEditor.cpp +++ b/PowerEditor/src/ScitillaComponent/columnEditor.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include "columnEditor.h" #include "ScintillaEditView.h" diff --git a/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlA.h b/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlA.h index ea8cf17c..645c6033 100644 --- a/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlA.h +++ b/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlA.h @@ -60,6 +60,7 @@ distribution. #include #include #include +#include "Common.h" class TiXmlDocumentA; class TiXmlElementA; diff --git a/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlparserA.cpp b/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlparserA.cpp index d7d4f375..882d611b 100644 --- a/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlparserA.cpp +++ b/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlparserA.cpp @@ -23,6 +23,7 @@ distribution. */ +#include #include "tinyxmlA.h" //#define DEBUG_PARSER diff --git a/PowerEditor/src/TinyXml/tinyxmlparser.cpp b/PowerEditor/src/TinyXml/tinyxmlparser.cpp index 45ff2621..bf79f0e8 100644 --- a/PowerEditor/src/TinyXml/tinyxmlparser.cpp +++ b/PowerEditor/src/TinyXml/tinyxmlparser.cpp @@ -23,6 +23,7 @@ distribution. */ +#include #include "tinyxml.h" //#define DEBUG_PARSER diff --git a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp index a04aebea..4085b1d4 100644 --- a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp +++ b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp @@ -27,7 +27,7 @@ -#include +#include #include #include "AboutDlg.h" diff --git a/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp b/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp index e8c1f8f5..e7efe253 100644 --- a/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp +++ b/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp @@ -27,6 +27,7 @@ +#include #include "ListView.h" #include "Parameters.h" #include "localization.h" diff --git a/PowerEditor/src/WinControls/AnsiCharPanel/ListView.h b/PowerEditor/src/WinControls/AnsiCharPanel/ListView.h index e19e22c4..1f4dc53a 100644 --- a/PowerEditor/src/WinControls/AnsiCharPanel/ListView.h +++ b/PowerEditor/src/WinControls/AnsiCharPanel/ListView.h @@ -29,7 +29,7 @@ #ifndef LISTVIEW_H #define LISTVIEW_H -#include "window.h" +#include "Window.h" #include "Common.h" class ListView : public Window diff --git a/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp b/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp index b265f184..a526f36a 100644 --- a/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp @@ -25,6 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include +#include #include "ColourPicker.h" #include "ColourPopup.h" diff --git a/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp b/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp index 5cd271ae..fdf528fd 100644 --- a/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp @@ -27,6 +27,7 @@ #include +#include #include "ColourPopup.h" DWORD colourItems[] = { diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp index 1f037d1e..cce9e427 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp @@ -26,7 +26,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -#include +#include #include #include #include "WordStyleDlg.h" diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc index 95d8f8bd..ced8d150 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc @@ -27,7 +27,7 @@ #include "windows.h" -#include "wordstyledlgres.h" +#include "WordStyleDlgRes.h" #ifndef IDC_STATIC #define IDC_STATIC -1 diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp index 3b4d4ae8..d85e0ad8 100644 --- a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp @@ -27,11 +27,12 @@ +#include #include "DockingManager.h" #include "DockingSplitter.h" #include "DockingCont.h" #include "Gripper.h" -#include "parameters.h" +#include "Parameters.h" using namespace std; diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp index de016cf2..0e6f7acd 100644 --- a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp @@ -27,6 +27,7 @@ +#include #include "DockingSplitter.h" #include "Notepad_plus_msgs.h" #include "Parameters.h" diff --git a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp index 84cd39ef..81929c99 100644 --- a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp @@ -29,6 +29,7 @@ // speed and consistency of the drag-rectangle - August 2010, Joern Gruel (jg) +#include #include "Gripper.h" #include "DockingManager.h" #include "Parameters.h" diff --git a/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.cpp b/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.cpp index 17e22338..ecaffd71 100644 --- a/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.cpp +++ b/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.cpp @@ -27,7 +27,7 @@ #include "FindCharsInRange.h" -#include "FindCharsInRange_rc.h" +#include "findCharsInRange_rc.h" INT_PTR CALLBACK FindCharsInRangeDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { diff --git a/PowerEditor/src/WinControls/FunctionList/functionParser.cpp b/PowerEditor/src/WinControls/FunctionList/functionParser.cpp index 6e7aabd3..e3ee280a 100644 --- a/PowerEditor/src/WinControls/FunctionList/functionParser.cpp +++ b/PowerEditor/src/WinControls/FunctionList/functionParser.cpp @@ -28,7 +28,7 @@ #include #include "ScintillaEditView.h" #include "functionParser.h" -#include "boostregexsearch.h" +#include "BoostRegexSearch.h" using namespace std; diff --git a/PowerEditor/src/WinControls/Grid/BabyGrid.cpp b/PowerEditor/src/WinControls/Grid/BabyGrid.cpp index d334688d..69e488e5 100644 --- a/PowerEditor/src/WinControls/Grid/BabyGrid.cpp +++ b/PowerEditor/src/WinControls/Grid/BabyGrid.cpp @@ -10,7 +10,7 @@ Add WM_MOUSEWHEEL, WM_LBUTTONDBLCLK and WM_RBUTTONUP events Modified by Don HO */ -#include "babygrid.h" +#include "BabyGrid.h" #include "Parameters.h" #define MAX_GRIDS 20 diff --git a/PowerEditor/src/WinControls/Grid/BabyGridWrapper.h b/PowerEditor/src/WinControls/Grid/BabyGridWrapper.h index 57d7270b..96ec3a56 100644 --- a/PowerEditor/src/WinControls/Grid/BabyGridWrapper.h +++ b/PowerEditor/src/WinControls/Grid/BabyGridWrapper.h @@ -30,7 +30,7 @@ #define BABYGRIDWRAPPER #ifndef BABYGRID_H -#include "babygrid.h" +#include "BabyGrid.h" #endif// BABYGRID_H #include "Window.h" diff --git a/PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp b/PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp index 8f8a7cba..0dd309cf 100644 --- a/PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp +++ b/PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp @@ -26,6 +26,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#include #include "ImageListSet.h" void IconList::create(HINSTANCE hInst, int iconSize) diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index 6e0d393a..8d390db7 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -26,7 +26,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include -#include +#include #include #include "preferenceDlg.h" #include "lesDlgs.h" @@ -44,7 +44,7 @@ const int BORDERWIDTH_INTERVAL = 1; // This int encoding array is built from "EncodingUnit encodings[]" (see EncodingMapper.cpp) // And DefaultNewDocDlg will use "int encoding array" to get more info from "EncodingUnit encodings[]" -int encodings[] = { +static int encodings[] = { 1250, 1251, 1252, diff --git a/PowerEditor/src/WinControls/ProjectPanel/TreeView.h b/PowerEditor/src/WinControls/ProjectPanel/TreeView.h index 58616ed1..26015a21 100644 --- a/PowerEditor/src/WinControls/ProjectPanel/TreeView.h +++ b/PowerEditor/src/WinControls/ProjectPanel/TreeView.h @@ -30,7 +30,7 @@ #include #include -#include "window.h" +#include "Window.h" #include "Common.h" struct TreeStateNode { diff --git a/PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp b/PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp index 3282957d..ac64ae3e 100644 --- a/PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp +++ b/PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp @@ -25,6 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include +#include #include #include "Splitter.h" diff --git a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp index 7badd615..092f6a4c 100644 --- a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp +++ b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp @@ -25,6 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include +#include #include #include "SplitterContainer.h" #include diff --git a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h index dd00114e..83dc6f72 100644 --- a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h +++ b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h @@ -18,7 +18,7 @@ #ifndef RUN_DLG_H #define RUN_DLG_H -#include +#include #include "Common.h" #ifndef RUN_DLG_RC_H diff --git a/PowerEditor/src/WinControls/StatusBar/StatusBar.cpp b/PowerEditor/src/WinControls/StatusBar/StatusBar.cpp index 904d1b41..f0c483aa 100644 --- a/PowerEditor/src/WinControls/StatusBar/StatusBar.cpp +++ b/PowerEditor/src/WinControls/StatusBar/StatusBar.cpp @@ -26,6 +26,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#include #include #include #include "StatusBar.h" diff --git a/PowerEditor/src/WinControls/TabBar/ControlsTab.h b/PowerEditor/src/WinControls/TabBar/ControlsTab.h index 702f5944..5a509733 100644 --- a/PowerEditor/src/WinControls/TabBar/ControlsTab.h +++ b/PowerEditor/src/WinControls/TabBar/ControlsTab.h @@ -34,7 +34,7 @@ #include "TabBar.h" #endif //TAB_BAR_H -#include "window.h" +#include "Window.h" #include "Common.h" struct DlgInfo diff --git a/PowerEditor/src/WinControls/TabBar/TabBar.cpp b/PowerEditor/src/WinControls/TabBar/TabBar.cpp index 634870fe..67a95ae2 100644 --- a/PowerEditor/src/WinControls/TabBar/TabBar.cpp +++ b/PowerEditor/src/WinControls/TabBar/TabBar.cpp @@ -27,6 +27,7 @@ +#include #include "TabBar.h" #include "Parameters.h" diff --git a/PowerEditor/src/WinControls/TaskList/TaskList.cpp b/PowerEditor/src/WinControls/TaskList/TaskList.cpp index 42205a46..ba65176f 100644 --- a/PowerEditor/src/WinControls/TaskList/TaskList.cpp +++ b/PowerEditor/src/WinControls/TaskList/TaskList.cpp @@ -27,6 +27,7 @@ +#include #include "TaskList.h" #include "TaskListDlg_rc.h" #include "colors.h" diff --git a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp index b038f7ee..d13a48f7 100644 --- a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp +++ b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp @@ -27,8 +27,9 @@ +#include #include "ToolBar.h" -#include "Shortcut.h" +#include "shortcut.h" #include "Parameters.h" #include "FindReplaceDlg_rc.h" diff --git a/PowerEditor/src/WinControls/ToolTip/ToolTip.cpp b/PowerEditor/src/WinControls/ToolTip/ToolTip.cpp index f005fdd5..a4a892e4 100644 --- a/PowerEditor/src/WinControls/ToolTip/ToolTip.cpp +++ b/PowerEditor/src/WinControls/ToolTip/ToolTip.cpp @@ -27,6 +27,7 @@ #include +#include #include "ToolTip.h" INT_PTR CALLBACK dlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp index 1f8dbec2..73795f2f 100644 --- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp +++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp @@ -26,6 +26,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include +#include #include "VerticalFileSwitcherListView.h" #include "Buffer.h" #include "localization.h" diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.h b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.h index 6877feec..0baeb3c7 100644 --- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.h +++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.h @@ -29,7 +29,7 @@ #ifndef VERTICALFILESWITCHERLISTVIEW_H #define VERTICALFILESWITCHERLISTVIEW_H -#include "window.h" +#include "Window.h" #include "TaskListDlg.h" class Buffer; diff --git a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlgRc.h b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlgRc.h index 2fd1a10f..72a47148 100644 --- a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlgRc.h +++ b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlgRc.h @@ -30,7 +30,9 @@ #define WINDOWS_DLG_RC_H #ifdef __GNUC__ +#ifndef _WIN32_IE #define _WIN32_IE 0x0600 +#endif #ifndef LVS_OWNERDATA #define LVS_OWNERDATA 4096 diff --git a/PowerEditor/src/WinControls/shortcut/shortcut.cpp b/PowerEditor/src/WinControls/shortcut/shortcut.cpp index 8fdb284b..66050921 100644 --- a/PowerEditor/src/WinControls/shortcut/shortcut.cpp +++ b/PowerEditor/src/WinControls/shortcut/shortcut.cpp @@ -26,6 +26,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#include #include "shortcut.h" #include "Parameters.h" #include "ScintillaEditView.h" diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h index 073ed698..df31d692 100644 Binary files a/PowerEditor/src/localizationString.h and b/PowerEditor/src/localizationString.h differ