Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix for Win64 (patch 1690999)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-30 18:34:07 +00:00
parent 760fdb6755
commit 80dc1dd378
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/src/stc/ScintillaWX.cpp
View File

@@ -680,11 +680,11 @@ bool ScintillaWX::DestroySystemCaret() {
//---------------------------------------------------------------------- //----------------------------------------------------------------------
long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) { sptr_t ScintillaWX::DefWndProc(unsigned int /*iMessage*/, uptr_t /*wParam*/, sptr_t /*lParam*/) {
return 0; return 0;
} }
long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) { sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
switch (iMessage) { switch (iMessage) {
case SCI_CALLTIPSHOW: { case SCI_CALLTIPSHOW: {
// NOTE: This is copied here from scintilla/src/ScintillaBase.cxx // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx

12
contrib/src/stc/ScintillaWX.h
View File

@@ -111,12 +111,12 @@ public:
virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true); virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
virtual void ClaimSelection(); virtual void ClaimSelection();
virtual long DefWndProc(unsigned int iMessage, virtual sptr_t DefWndProc(unsigned int iMessage,
unsigned long wParam, uptr_t wParam,
long lParam); sptr_t lParam);
virtual long WndProc(unsigned int iMessage, virtual sptr_t WndProc(unsigned int iMessage,
unsigned long wParam, uptr_t wParam,
long lParam); sptr_t lParam);
virtual void NotifyChange(); virtual void NotifyChange();
virtual void NotifyParent(SCNotification scn); virtual void NotifyParent(SCNotification scn);

4
src/stc/ScintillaWX.cpp
View File

@@ -680,11 +680,11 @@ bool ScintillaWX::DestroySystemCaret() {
//---------------------------------------------------------------------- //----------------------------------------------------------------------
long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) { sptr_t ScintillaWX::DefWndProc(unsigned int /*iMessage*/, uptr_t /*wParam*/, sptr_t /*lParam*/) {
return 0; return 0;
} }
long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) { sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
switch (iMessage) { switch (iMessage) {
case SCI_CALLTIPSHOW: { case SCI_CALLTIPSHOW: {
// NOTE: This is copied here from scintilla/src/ScintillaBase.cxx // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx

12
src/stc/ScintillaWX.h
View File

@@ -111,12 +111,12 @@ public:
virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true); virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
virtual void ClaimSelection(); virtual void ClaimSelection();
virtual long DefWndProc(unsigned int iMessage, virtual sptr_t DefWndProc(unsigned int iMessage,
unsigned long wParam, uptr_t wParam,
long lParam); sptr_t lParam);
virtual long WndProc(unsigned int iMessage, virtual sptr_t WndProc(unsigned int iMessage,
unsigned long wParam, uptr_t wParam,
long lParam); sptr_t lParam);
virtual void NotifyChange(); virtual void NotifyChange();
virtual void NotifyParent(SCNotification scn); virtual void NotifyParent(SCNotification scn);