Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Further changes for x64 builds

Browse Source
This commit is contained in:
Christian Grasser 2015-06-08 08:48:05 +02:00
parent 10d1c91c39
commit 73dee04dea
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -197,7 +197,7 @@ void Searching::displaySectionCentered(int posStart, int posEnd, ScintillaEditVi
pEditView->execute(SCI_SETANCHOR, posStart); pEditView->execute(SCI_SETANCHOR, posStart);
} }
LONG FindReplaceDlg::originalFinderProc = NULL; LONG_PTR FindReplaceDlg::originalFinderProc = NULL;
void FindReplaceDlg::addText2Combo(const TCHAR * txt2add, HWND hCombo, bool) void FindReplaceDlg::addText2Combo(const TCHAR * txt2add, HWND hCombo, bool)
{ {

2
PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
View File

@ -308,7 +308,7 @@ protected :
virtual BOOL CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); virtual BOOL CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
void addText2Combo(const TCHAR * txt2add, HWND comboID, bool isUTF8 = false); void addText2Combo(const TCHAR * txt2add, HWND comboID, bool isUTF8 = false);
generic_string getTextFromCombo(HWND hCombo, bool isUnicode = false) const; generic_string getTextFromCombo(HWND hCombo, bool isUnicode = false) const;
static LONG originalFinderProc; static LONG_PTR originalFinderProc;
// Window procedure for the finder // Window procedure for the finder
static LRESULT FAR PASCAL finderProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); static LRESULT FAR PASCAL finderProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

4
PowerEditor/src/ScitillaComponent/ScintillaEditView.h
View File

@ -83,7 +83,7 @@ class NppParameters;
#define NB_WORD_LIST 4 #define NB_WORD_LIST 4
#define WORD_LIST_LEN 256 #define WORD_LIST_LEN 256
typedef int (* SCINTILLA_FUNC) (void*, int, int, int); typedef sptr_t(*SCINTILLA_FUNC) (void *, unsigned int, uptr_t, sptr_t);
typedef void * SCINTILLA_PTR; typedef void * SCINTILLA_PTR;
#define WM_DOCK_USERDEFINE_DLG (SCINTILLA_USER + 1) #define WM_DOCK_USERDEFINE_DLG (SCINTILLA_USER + 1)
@ -238,7 +238,7 @@ public:
virtual void init(HINSTANCE hInst, HWND hPere); virtual void init(HINSTANCE hInst, HWND hPere);
LRESULT execute(UINT Msg, WPARAM wParam=0, LPARAM lParam=0) const { LRESULT execute(UINT Msg, WPARAM wParam=0, LPARAM lParam=0) const {
return _pScintillaFunc(_pScintillaPtr, static_cast<int>(Msg), static_cast<int>(wParam), static_cast<int>(lParam)); return _pScintillaFunc(_pScintillaPtr, Msg, wParam, lParam);
}; };
void activateBuffer(BufferID buffer); void activateBuffer(BufferID buffer);

6
PowerEditor/src/WinControls/Grid/BabyGridWrapper.h
View File

@ -49,7 +49,7 @@ public :
}; };
void setCursorColour(COLORREF coulour) { void setCursorColour(COLORREF coulour) {
::SendMessage(_hSelf, BGM_SETCURSORCOLOR, (UINT)coulour, 0); ::SendMessage(_hSelf, BGM_SETCURSORCOLOR, (WPARAM)coulour, 0);
}; };
void hideCursor() { void hideCursor() {
@ -64,7 +64,7 @@ public :
_BGCELL cell; _BGCELL cell;
cell.row = row; cell.row = row;
cell.col = col; cell.col = col;
::SendMessage(_hSelf, BGM_SETCELLDATA, (UINT)&cell, (long)text); ::SendMessage(_hSelf, BGM_SETCELLDATA, (WPARAM)&cell, (LPARAM)text);
}; };
void makeColAutoWidth(bool autoWidth = true) { void makeColAutoWidth(bool autoWidth = true) {
@ -79,7 +79,7 @@ public :
_BGCELL cell; _BGCELL cell;
cell.row = row; cell.row = row;
cell.col = col; cell.col = col;
::SendMessage(_hSelf, BGM_DELETECELL, (UINT)&cell, 0); ::SendMessage(_hSelf, BGM_DELETECELL, (WPARAM)&cell, 0);
}; };
void setColWidth(unsigned int col, unsigned int width) { void setColWidth(unsigned int col, unsigned int width) {