diff options
Diffstat (limited to 'win32/ScintillaWin.cxx')
-rw-r--r-- | win32/ScintillaWin.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index e93d6ef4b..9476b93bd 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -140,7 +140,7 @@ public: */ class ScintillaWin : public ScintillaBase { - + bool lastKeyDownConsumed; bool capturedMouse; @@ -177,7 +177,6 @@ class ScintillaWin : virtual void StartDrag(); sptr_t WndPaint(uptr_t wParam); sptr_t HandleComposition(uptr_t wParam, sptr_t lParam); - virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); virtual void SetTicking(bool on); virtual void SetMouseCapture(bool on); @@ -212,6 +211,9 @@ class ScintillaWin : void FullPaint(); public: + // Public for benefit of Scintilla_DirectFunction + virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); + /// Implement IUnknown STDMETHODIMP QueryInterface(REFIID riid, PVOID *ppv); STDMETHODIMP_(ULONG)AddRef(); @@ -1935,6 +1937,11 @@ sptr_t ScintillaWin::DirectFunction( return sci->WndProc(iMessage, wParam, lParam); } +extern "C" __declspec(dllexport) sptr_t __stdcall Scintilla_DirectFunction( + ScintillaWin *sci, UINT iMessage, uptr_t wParam, sptr_t lParam) { + return sci->WndProc(iMessage, wParam, lParam); +} + sptr_t PASCAL ScintillaWin::SWndProc( HWND hWnd, UINT iMessage, WPARAM wParam, sptr_t lParam) { //Platform::DebugPrintf("S W:%x M:%x WP:%x L:%x\n", hWnd, iMessage, wParam, lParam); |