diff --git a/PowerEditor/src/MISC/Common/Common.cpp b/PowerEditor/src/MISC/Common/Common.cpp index fa2d606e1..0d572343f 100644 --- a/PowerEditor/src/MISC/Common/Common.cpp +++ b/PowerEditor/src/MISC/Common/Common.cpp @@ -18,6 +18,7 @@ //#include "Common.h" //use force include #include #include +#include "Common.h" WcharMbcsConvertor * WcharMbcsConvertor::_pSelf = new WcharMbcsConvertor; @@ -57,6 +58,87 @@ void writeLog(const TCHAR *logFileName, const TCHAR *log2write) fclose(f); } +void folderBrowser(HWND parent, int outputCtrlID) +{ + // This code was copied and slightly modifed from: + // http://www.bcbdev.com/faqs/faq62.htm + + // SHBrowseForFolder returns a PIDL. The memory for the PIDL is + // allocated by the shell. Eventually, we will need to free this + // memory, so we need to get a pointer to the shell malloc COM + // object that will free the PIDL later on. + LPMALLOC pShellMalloc = 0; + if (::SHGetMalloc(&pShellMalloc) == NO_ERROR) + { + // If we were able to get the shell malloc object, + // then proceed by initializing the BROWSEINFO stuct + BROWSEINFO info; + memset(&info, 0, sizeof(info)); + info.hwndOwner = parent; + info.pidlRoot = NULL; + TCHAR szDisplayName[MAX_PATH]; + info.pszDisplayName = szDisplayName; + info.lpszTitle = TEXT("Select a folder to search from"); + info.ulFlags = 0; + info.lpfn = BrowseCallbackProc; + TCHAR directory[MAX_PATH]; + ::GetDlgItemText(parent, outputCtrlID, directory, sizeof(directory)); + info.lParam = reinterpret_cast(directory); + + // Execute the browsing dialog. + LPITEMIDLIST pidl = ::SHBrowseForFolder(&info); + + // pidl will be null if they cancel the browse dialog. + // pidl will be not null when they select a folder. + if (pidl) + { + // Try to convert the pidl to a display generic_string. + // Return is true if success. + TCHAR szDir[MAX_PATH]; + if (::SHGetPathFromIDList(pidl, szDir)) + // Set edit control to the directory path. + ::SetDlgItemText(parent, outputCtrlID, szDir); + pShellMalloc->Free(pidl); + } + pShellMalloc->Release(); + } +} + +void ClientRectToScreenRect(HWND hWnd, RECT* rect) +{ + POINT pt; + + pt.x = rect->left; + pt.y = rect->top; + ::ClientToScreen( hWnd, &pt ); + rect->left = pt.x; + rect->top = pt.y; + + pt.x = rect->right; + pt.y = rect->bottom; + ::ClientToScreen( hWnd, &pt ); + rect->right = pt.x; + rect->bottom = pt.y; +}; + + +void ScreenRectToClientRect(HWND hWnd, RECT* rect) +{ + POINT pt; + + pt.x = rect->left; + pt.y = rect->top; + ::ScreenToClient( hWnd, &pt ); + rect->left = pt.x; + rect->top = pt.y; + + pt.x = rect->right; + pt.y = rect->bottom; + ::ScreenToClient( hWnd, &pt ); + rect->right = pt.x; + rect->bottom = pt.y; +}; + int filter(unsigned int code, struct _EXCEPTION_POINTERS *ep) { if (code == EXCEPTION_ACCESS_VIOLATION) diff --git a/PowerEditor/src/MISC/Common/Common.h b/PowerEditor/src/MISC/Common/Common.h index e52815665..1f5894f74 100644 --- a/PowerEditor/src/MISC/Common/Common.h +++ b/PowerEditor/src/MISC/Common/Common.h @@ -22,6 +22,7 @@ #include #include #include +#include #ifdef UNICODE #include @@ -72,6 +73,17 @@ #define COPYDATA_FILENAMES COPYDATA_FILENAMESA #endif +void folderBrowser(HWND parent, int outputCtrlID); + +// Set a call back with the handle after init to set the path. +// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/callbackfunctions/browsecallbackproc.asp +static int __stdcall BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM, LPARAM pData) +{ + if (uMsg == BFFM_INITIALIZED) + ::SendMessage(hwnd, BFFM_SETSELECTION, TRUE, pData); + return 0; +}; + void systemMessage(const TCHAR *title); //DWORD ShortToLongPathName(LPCTSTR lpszShortPath, LPTSTR lpszLongPath, DWORD cchBuffer); void printInt(int int2print); @@ -81,8 +93,9 @@ int filter(unsigned int code, struct _EXCEPTION_POINTERS *ep); int getCpFromStringValue(const TCHAR * encodingStr); std::generic_string purgeMenuItemString(const TCHAR * menuItemStr, bool keepAmpersand = false); -//void char2wchar(const char* pszCHAR, wchar_t* pszWCHAR, UINT codepage); -//void wchar2char(const wchar_t* pszWCHAR, char* pszCHAR, UINT codepage); +void ClientRectToScreenRect(HWND hWnd, RECT* rect); +void ScreenRectToClientRect(HWND hWnd, RECT* rect); + std::wstring string2wstring(const std::string & rString, UINT codepage); std::string wstring2string(const std::wstring & rwString, UINT codepage); diff --git a/PowerEditor/src/MISC/Process/Process.h b/PowerEditor/src/MISC/Process/Process.h index 73dc6a04e..c89be3d2a 100644 --- a/PowerEditor/src/MISC/Process/Process.h +++ b/PowerEditor/src/MISC/Process/Process.h @@ -20,6 +20,8 @@ #include #include +#include "Common.h" + using namespace std; enum progType {WIN32_PROG, CONSOLE_PROG}; diff --git a/PowerEditor/src/MISC/RegExt/regExtDlg.cpp b/PowerEditor/src/MISC/RegExt/regExtDlg.cpp index 2b5c4ced7..a2f8cafa2 100644 --- a/PowerEditor/src/MISC/RegExt/regExtDlg.cpp +++ b/PowerEditor/src/MISC/RegExt/regExtDlg.cpp @@ -19,6 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include #include "regExtDlg.h" #include "resource.h" +#include "Common.h" const TCHAR *nppName = TEXT("Notepad++_file"); const TCHAR *nppBackup = TEXT("Notepad++_backup"); diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index a76ba1c93..ea5f216c1 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -4841,7 +4841,7 @@ bool Notepad_plus::activateBuffer(BufferID id, int whichOne) SCNotification scnN; scnN.nmhdr.code = NPPN_DOCSWITCHINGOFF; scnN.nmhdr.hwndFrom = _hSelf; - scnN.nmhdr.idFrom = oldBuf; + scnN.nmhdr.idFrom = (uptr_t)oldBuf; _pluginsManager.notify(&scnN); Buffer * pBuf = MainFileManager->getBufferByID(id); @@ -4872,8 +4872,8 @@ bool Notepad_plus::activateBuffer(BufferID id, int whichOne) } notifyBufferActivated(id, whichOne); scnN.nmhdr.code = NPPN_DOCSWITCHINGIN; - scnN.nmhdr.hwndFrom = _hSelf; - scnN.nmhdr.idFrom = id; + //scnN.nmhdr.hwndFrom = _hSelf; + scnN.nmhdr.idFrom = (uptr_t)id; _pluginsManager.notify(&scnN); return true; } diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index 6ccdaa7d3..252d129d9 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -19,7 +19,6 @@ #include "ScintillaEditView.h" #include "Notepad_plus_msgs.h" #include "constant.h" -#include "common_func.h" #include "UniConversion.h" int Searching::convertExtendedToString(const TCHAR * query, TCHAR * result, int length) { //query may equal to result, since it always gets smaller diff --git a/PowerEditor/src/TinyXml/tinyxml.h b/PowerEditor/src/TinyXml/tinyxml.h index e598b7064..f6e7d8035 100644 --- a/PowerEditor/src/TinyXml/tinyxml.h +++ b/PowerEditor/src/TinyXml/tinyxml.h @@ -36,8 +36,8 @@ distribution. #include #include #include - #include +#include "Common.h" // Help out windows: #if defined( _DEBUG ) && !defined( DEBUG ) diff --git a/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp b/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp index 50727eed2..623c60011 100644 --- a/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "ColourPicker.h" - +#include "Common.h" void ColourPicker::init(HINSTANCE hInst, HWND parent) diff --git a/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp b/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp index d2f1f9ef1..ba94cb5da 100644 --- a/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp @@ -18,6 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "ColourPopup.h" +#include "Common.h" DWORD colourItems[] = { RGB( 0, 0, 0), RGB( 64, 0, 0), RGB(128, 0, 0), RGB(128, 64, 64), RGB(255, 0, 0), RGB(255, 128, 128), diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp index 521836489..7ba546f61 100644 --- a/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp @@ -24,8 +24,8 @@ #include "WindowInterface.h" #include "ToolTip.h" #include -#include -#include "common_func.h" +//#include +#include "Common.h" #ifndef WH_MOUSE_LL #define WH_MOUSE_LL 14 @@ -427,7 +427,7 @@ LRESULT DockingCont::runProcCaption(HWND hwnd, UINT Message, WPARAM wParam, LPAR case WM_SIZE: { ::GetWindowRect(hwnd, &_rcCaption); - ScreenToClient(hwnd, &_rcCaption); + ScreenRectToClientRect(hwnd, &_rcCaption); break; } case WM_SETTEXT: @@ -601,7 +601,7 @@ eMousePos DockingCont::isInRect(HWND hwnd, INT x, INT y) eMousePos ret = posOutside; ::GetWindowRect(hwnd, &rc); - ScreenToClient(hwnd, &rc); + ScreenRectToClientRect(hwnd, &rc); if (_isTopCaption == TRUE) { @@ -951,7 +951,7 @@ BOOL CALLBACK DockingCont::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPara getWindowRect(rcWnd); getClientRect(rcClient); - ClientToScreen(_hSelf, &rcClient); + ClientRectToScreenRect(_hSelf, &rcClient); rcWnd.bottom = rcClient.top; /* if in caption */ diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp index f2389bfea..fb6fcebf8 100644 --- a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp @@ -17,7 +17,7 @@ #include "DockingSplitter.h" - +#include "Common.h" BOOL DockingSplitter::_isVertReg = FALSE; BOOL DockingSplitter::_isHoriReg = FALSE; diff --git a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp index 122412c43..21bf39243 100644 --- a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp @@ -460,7 +460,7 @@ void Gripper::doTabReordering(POINT pt) { /* prevent flickering of tabs with different sizes */ ::SendMessage(hTab, TCM_GETITEMRECT, iItem, (LPARAM)&rc); - ClientToScreen(hTab, &rc); + ClientRectToScreenRect(hTab, &rc); if ((rc.left + (_rcItem.right - _rcItem.left)) < pt.x) { @@ -749,13 +749,13 @@ DockingCont* Gripper::workHitTest(POINT pt, RECT *rc) default: break; } - ClientToScreen(_dockData.hWnd, &rcCont); + ClientRectToScreenRect(_dockData.hWnd, &rcCont); if (::PtInRect(&rcCont, pt) == TRUE) { if (rc != NULL) { - ClientToScreen(_dockData.hWnd, rc); + ClientRectToScreenRect(_dockData.hWnd, rc); rc->right -= rc->left; rc->bottom -= rc->top; } diff --git a/PowerEditor/src/WinControls/DockingWnd/Gripper.h b/PowerEditor/src/WinControls/DockingWnd/Gripper.h index a8995382a..d542e80d0 100644 --- a/PowerEditor/src/WinControls/DockingWnd/Gripper.h +++ b/PowerEditor/src/WinControls/DockingWnd/Gripper.h @@ -23,7 +23,6 @@ #include "DockingCont.h" #include "DockingManager.h" #include "commctrl.h" -#include "common_func.h" // Used by getRectAndStyle() to draw the drag rectangle @@ -79,11 +78,11 @@ protected : void initTabInformation(POINT pt); void CalcRectToScreen(HWND hWnd, RECT *rc) { - ClientToScreen(hWnd, rc); + ClientRectToScreenRect(hWnd, rc); ShrinkRcToSize(rc); }; void CalcRectToClient(HWND hWnd, RECT *rc) { - ScreenToClient(hWnd, rc); + ScreenRectToClientRect(hWnd, rc); ShrinkRcToSize(rc); }; void ShrinkRcToSize(RECT *rc) { diff --git a/PowerEditor/src/WinControls/DockingWnd/common_func.cpp b/PowerEditor/src/WinControls/DockingWnd/common_func.cpp deleted file mode 100644 index 76ca18ad5..000000000 --- a/PowerEditor/src/WinControls/DockingWnd/common_func.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include "common_func.h" -#include - -using namespace std; - -void ClientToScreen(HWND hWnd, RECT* rect) -{ - POINT pt; - - pt.x = rect->left; - pt.y = rect->top; - ::ClientToScreen( hWnd, &pt ); - rect->left = pt.x; - rect->top = pt.y; - - pt.x = rect->right; - pt.y = rect->bottom; - ::ClientToScreen( hWnd, &pt ); - rect->right = pt.x; - rect->bottom = pt.y; -}; - - -void ScreenToClient(HWND hWnd, RECT* rect) -{ - POINT pt; - - pt.x = rect->left; - pt.y = rect->top; - ::ScreenToClient( hWnd, &pt ); - rect->left = pt.x; - rect->top = pt.y; - - pt.x = rect->right; - pt.y = rect->bottom; - ::ScreenToClient( hWnd, &pt ); - rect->right = pt.x; - rect->bottom = pt.y; -}; - -void folderBrowser(HWND parent, int outputCtrlID) -{ - // This code was copied and slightly modifed from: - // http://www.bcbdev.com/faqs/faq62.htm - - // SHBrowseForFolder returns a PIDL. The memory for the PIDL is - // allocated by the shell. Eventually, we will need to free this - // memory, so we need to get a pointer to the shell malloc COM - // object that will free the PIDL later on. - LPMALLOC pShellMalloc = 0; - if (::SHGetMalloc(&pShellMalloc) == NO_ERROR) - { - // If we were able to get the shell malloc object, - // then proceed by initializing the BROWSEINFO stuct - BROWSEINFO info; - memset(&info, 0, sizeof(info)); - info.hwndOwner = parent; - info.pidlRoot = NULL; - TCHAR szDisplayName[MAX_PATH]; - info.pszDisplayName = szDisplayName; - generic_string title = TEXT("Select a folder to search from"); - info.lpszTitle = title.c_str(); - info.ulFlags = 0; - info.lpfn = BrowseCallbackProc; - TCHAR directory[MAX_PATH]; - ::GetDlgItemText(parent, outputCtrlID, directory, sizeof(directory)); - info.lParam = reinterpret_cast(directory); - - // Execute the browsing dialog. - LPITEMIDLIST pidl = ::SHBrowseForFolder(&info); - - // pidl will be null if they cancel the browse dialog. - // pidl will be not null when they select a folder. - if (pidl) - { - // Try to convert the pidl to a display generic_string. - // Return is true if success. - TCHAR szDir[MAX_PATH]; - if (::SHGetPathFromIDList(pidl, szDir)) - // Set edit control to the directory path. - ::SetDlgItemText(parent, outputCtrlID, szDir); - pShellMalloc->Free(pidl); - } - pShellMalloc->Release(); - } -} diff --git a/PowerEditor/src/WinControls/DockingWnd/common_func.h b/PowerEditor/src/WinControls/DockingWnd/common_func.h deleted file mode 100644 index 70b61ab67..000000000 --- a/PowerEditor/src/WinControls/DockingWnd/common_func.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef COMMON_FUNC_H -#define COMMON_FUNC_H - -#include "windows.h" -// need this header for SHBrowseForFolder -#include - -void ClientToScreen(HWND hWnd, RECT* rect); -void ScreenToClient(HWND hWnd, RECT* rect); -void folderBrowser(HWND parent, int outputCtrlID); - -// Set a call back with the handle after init to set the path. -// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/callbackfunctions/browsecallbackproc.asp -static int __stdcall BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM, LPARAM pData) -{ - if (uMsg == BFFM_INITIALIZED) - ::SendMessage(hwnd, BFFM_SETSELECTION, TRUE, pData); - return 0; -}; -#endif //COMMON_FUNC_H diff --git a/PowerEditor/src/WinControls/Grid/BabyGrid.cpp b/PowerEditor/src/WinControls/Grid/BabyGrid.cpp index 2f7bf6453..a2ec08fe6 100644 --- a/PowerEditor/src/WinControls/Grid/BabyGrid.cpp +++ b/PowerEditor/src/WinControls/Grid/BabyGrid.cpp @@ -11,6 +11,7 @@ Modified by Don HO */ #include "babygrid.h" +#include "Common.h" #define MAX_GRIDS 20 diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index 3866a6d99..41050c7d9 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -17,7 +17,6 @@ #include #include "preferenceDlg.h" -#include "common_func.h" BOOL CALLBACK PreferenceDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam) { diff --git a/PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp b/PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp index 6f6a3c90e..75b7b1de8 100644 --- a/PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp +++ b/PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp @@ -17,7 +17,7 @@ #include "Splitter.h" -//#include "resource.h" +#include "Common.h" bool Splitter::_isHorizontalRegistered = false; bool Splitter::_isVerticalRegistered = false; diff --git a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp index a333d0708..8fdf1dfc8 100644 --- a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp +++ b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp @@ -16,7 +16,7 @@ //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "SplitterContainer.h" - +#include "Common.h" bool SplitterContainer::_isRegistered = false; diff --git a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h index 623e5403b..0d3cda595 100644 --- a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h +++ b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h @@ -21,6 +21,7 @@ #include "StaticDialog.h" #include "RunDlg_rc.h" #include +#include "Common.h" //static void extractArgs(TCHAR *cmd2Exec, TCHAR *args, const TCHAR *cmdEntier); diff --git a/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp b/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp index 268e5f998..2698cc90c 100644 --- a/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp +++ b/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp @@ -16,6 +16,7 @@ //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "StaticDialog.h" +#include "Common.h" void StaticDialog::goToCenter() { diff --git a/PowerEditor/src/WinControls/StatusBar/StatusBar.cpp b/PowerEditor/src/WinControls/StatusBar/StatusBar.cpp index 36775f703..b8897f4b3 100644 --- a/PowerEditor/src/WinControls/StatusBar/StatusBar.cpp +++ b/PowerEditor/src/WinControls/StatusBar/StatusBar.cpp @@ -16,6 +16,7 @@ //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "StatusBar.h" +#include "Common.h" //#define IDC_STATUSBAR 789 diff --git a/PowerEditor/src/WinControls/TabBar/TabBar.cpp b/PowerEditor/src/WinControls/TabBar/TabBar.cpp index 407427b3e..3d2c09862 100644 --- a/PowerEditor/src/WinControls/TabBar/TabBar.cpp +++ b/PowerEditor/src/WinControls/TabBar/TabBar.cpp @@ -16,6 +16,7 @@ //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "TabBar.h" +#include "Common.h" const COLORREF blue = RGB(0, 0, 0xFF); const COLORREF black = RGB(0, 0, 0); diff --git a/PowerEditor/src/WinControls/TaskList/TaskList.cpp b/PowerEditor/src/WinControls/TaskList/TaskList.cpp index 4a4ccf350..873f8133a 100644 --- a/PowerEditor/src/WinControls/TaskList/TaskList.cpp +++ b/PowerEditor/src/WinControls/TaskList/TaskList.cpp @@ -18,6 +18,7 @@ #include "TaskList.h" #include "TaskListDlg_rc.h" #include "colors.h" +#include "Common.h" void TaskList::init(HINSTANCE hInst, HWND parent, HIMAGELIST hImaLst, int nbItem, int index2set) { diff --git a/PowerEditor/src/WinControls/shortcut/shortcut.h b/PowerEditor/src/WinControls/shortcut/shortcut.h index cba9ae6c0..8c0f6c932 100644 --- a/PowerEditor/src/WinControls/shortcut/shortcut.h +++ b/PowerEditor/src/WinControls/shortcut/shortcut.h @@ -24,6 +24,7 @@ #include "shortcutRc.h" #include "StaticDialog.h" #include "Scintilla.h" +#include "Common.h" using namespace std; diff --git a/PowerEditor/visual.net/notepadPlus.vcproj b/PowerEditor/visual.net/notepadPlus.vcproj index 86d161845..88cf55614 100644 --- a/PowerEditor/visual.net/notepadPlus.vcproj +++ b/PowerEditor/visual.net/notepadPlus.vcproj @@ -135,7 +135,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="false" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\src\WinControls\AboutDlg;..\..\scintilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScitillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\ToolTip;..\src\MISC\Exception" + AdditionalIncludeDirectories="..\src\WinControls\AboutDlg;..\..\scintilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScitillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL" StringPooling="true" ExceptionHandling="2" @@ -239,7 +239,7 @@ > - - @@ -488,7 +484,7 @@ > - -