Merge branch 'master' of https://github.com/chcg/notepad-plus-plus into GWLP_648

PowerEditor/src/MISC/Common/precompiledHeaders.h

@@ -1,76 +0,0 @@
-// This file is part of Notepad++ project
-// Copyright (C)2003 Don HO <don.h@free.fr>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// Note that the GPL places important restrictions on "derived works", yet
-// it does not provide a detailed definition of that term.  To avoid      
-// misunderstandings, we consider an application to constitute a          
-// "derivative work" for the purpose of this license if it does any of the
-// following:                                                             
-// 1. Integrates source code from Notepad++.
-// 2. Integrates/includes/aggregates Notepad++ into a proprietary executable
-//    installer, such as those produced by InstallShield.
-// 3. Links to a library or executes a program that does any of the above.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-#ifndef PRECOMPILEHEADER_H
-#define PRECOMPILEHEADER_H
-
-// w/o precompiled headers file : 1 minute 55 sec
-
-#define _WIN32_WINNT 0x0501
-
-// C RunTime Header Files
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
-#include <functional>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-// STL Headers
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-#include <deque>
-#include <map>
-#include <memory>
-#include <algorithm>
-#include <exception>	
-
-// Windows Header Files
-#include <windows.h>
-#include <commctrl.h>
-#include <shlwapi.h>
-#include <Shlobj.h>
-#include <uxtheme.h>
-#include <Oleacc.h>
-#include <dbghelp.h>
-#include <eh.h>
-#include <wchar.h>
-
-
-// Notepad++
-#include "Common.h"
-#include "Window.h"
-#include "StaticDialog.h"
-
-#endif //PRECOMPILEHEADER_H

PowerEditor/src/Parameters.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 "precompiledHeaders.h"
+#include <time.h>
+#include <shlwapi.h>
+#include <Shlobj.h>
 #include "Parameters.h"
 #include "FileDialog.h"
 #include "ScintillaEditView.h"

PowerEditor/src/WinControls/AboutDlg/URLCtrl.cpp

@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "URLCtrl.h"
 
 static BYTE XORMask[128] =

PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp

@@ -25,8 +25,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
-#include "precompiledHeaders.h"
+#include <shlwapi.h>
 #include "VerticalFileSwitcherListView.h"
 #include "Buffer.h"
 #include "localization.h"

PowerEditor/src/WinControls/WindowsDlg/SizeableDlg.cpp

@@ -26,8 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
-
 #include "WindowsDlg.h"
 #include "WindowsDlgRc.h"
 

PowerEditor/src/winmain.cpp

@@ -25,11 +25,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-#define _WIN32_WINNT 0x0501
-
 #include "Notepad_plus_Window.h"
 #include "Process.h"
-
 #include "Win32Exception.h"	//Win32 exception
 #include "MiniDumper.h"			//Write dump files
 

PowerEditor/visual.net/notepadPlus.vcxproj

@@ -66,6 +66,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/D_WIN32_WINNT=0x0501 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalOptions>/fixed:no %(AdditionalOptions)</AdditionalOptions>
@@ -107,6 +108,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/D_WIN32_WINNT=0x0501 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;shlwapi.lib;shell32.lib;Oleacc.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -478,7 +480,6 @@ copy ..\src\contextMenu.xml ..\bin\contextMenu.xml
     <ClInclude Include="..\src\Parameters.h" />
     <ClInclude Include="..\src\Misc\PluginsManager\PluginInterface.h" />
     <ClInclude Include="..\src\Misc\PluginsManager\PluginsManager.h" />
-    <ClInclude Include="..\src\MISC\Common\precompiledHeaders.h" />
     <ClInclude Include="..\src\WinControls\Preference\preferenceDlg.h" />
     <ClInclude Include="..\src\ScitillaComponent\Printer.h" />
     <ClInclude Include="..\src\uchardet\prmem.h" />