Rework the wxCusor ctor taking wx stock number to provide as many cursors as

[wxWidgets.git] / src / stc / ScintillaWX.cpp

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 485b612cc995a46a6413af7844b4438f6a70b0b8..76af113dd7640e279ef99dbb329f5afc555fad5a 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        ScintillaWX.cxx
 ////////////////////////////////////////////////////////////////////////////
 // Name:        ScintillaWX.cxx

-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
+// Purpose:     A wxWidgets implementation of Scintilla.  A class derived

 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatformWX.cxx  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer
 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatformWX.cxx  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer


@@ -14,12 +14,36 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STC
+
+#ifndef WX_PRECOMP
+    #include "wx/scrolbar.h"
+    #include "wx/menu.h"
+    #include "wx/timer.h"
+#endif // WX_PRECOMP
+
+#include "wx/textbuf.h"
+#include "wx/dataobj.h"
+#include "wx/clipbrd.h"
+#include "wx/dnd.h"

 
 #include "ScintillaWX.h"
 #include "ExternalLexer.h"
 #include "wx/stc/stc.h"
 
 #include "ScintillaWX.h"
 #include "ExternalLexer.h"
 #include "wx/stc/stc.h"

+#include "wx/stc/private.h"

 #include "PlatWX.h"
 #include "PlatWX.h"

-#include <wx/textbuf.h>
+
+#ifdef __WXMSW__
+    // GetHwndOf()
+    #include "wx/msw/private.h"
+#endif

 
 //----------------------------------------------------------------------
 // Helper classes
 
 //----------------------------------------------------------------------
 // Helper classes


@@ -27,61 +51,97 @@
 class wxSTCTimer : public wxTimer {
 public:
     wxSTCTimer(ScintillaWX* swx) {
 class wxSTCTimer : public wxTimer {
 public:
     wxSTCTimer(ScintillaWX* swx) {

-        this->swx = swx;
+        m_swx = swx;

     }
 
     void Notify() {
     }
 
     void Notify() {

-        swx->DoTick();
+        m_swx->DoTick();

     }
 
 private:
     }
 
 private:

-    ScintillaWX* swx;
+    ScintillaWX* m_swx;

 };
 
 
 #if wxUSE_DRAG_AND_DROP
 };
 
 
 #if wxUSE_DRAG_AND_DROP

+class wxStartDragTimer : public wxTimer {
+public:
+    wxStartDragTimer(ScintillaWX* swx) {
+        m_swx = swx;
+    }
+
+    void Notify() {
+        m_swx->DoStartDrag();
+    }
+
+private:
+    ScintillaWX* m_swx;
+};
+
+

 bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) {
 bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) {

-    return swx->DoDropText(x, y, data);
+    return m_swx->DoDropText(x, y, data);

 }
 
 wxDragResult  wxSTCDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def) {
 }
 
 wxDragResult  wxSTCDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def) {

-    return swx->DoDragEnter(x, y, def);
+    return m_swx->DoDragEnter(x, y, def);

 }
 
 wxDragResult  wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def) {
 }
 
 wxDragResult  wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def) {

-    return swx->DoDragOver(x, y, def);
+    return m_swx->DoDragOver(x, y, def);

 }
 
 void  wxSTCDropTarget::OnLeave() {
 }
 
 void  wxSTCDropTarget::OnLeave() {

-    swx->DoDragLeave();
+    m_swx->DoDragLeave();

 }
 }

-#endif
+#endif // wxUSE_DRAG_AND_DROP

 
 
 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 
 
 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP

-#include <wx/popupwin.h>
+#include "wx/popupwin.h"

 #define wxSTCCallTipBase wxPopupWindow
 #define param2  wxBORDER_NONE  // popup's 2nd param is flags
 #else
 #define wxSTCCallTipBase wxPopupWindow
 #define param2  wxBORDER_NONE  // popup's 2nd param is flags
 #else

-#define wxSTCCallTipBase wxWindow
+#include "wx/frame.h"
+#define wxSTCCallTipBase wxFrame

 #define param2 -1 // wxWindow's 2nd param is ID
 #endif
 
 #define param2 -1 // wxWindow's 2nd param is ID
 #endif
 

+#include "wx/dcbuffer.h"
+

 class wxSTCCallTip : public wxSTCCallTipBase {
 public:
 class wxSTCCallTip : public wxSTCCallTipBase {
 public:

-    wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx)
-        : wxSTCCallTipBase(parent, param2),
-          m_ct(ct), m_swx(swx)
+    wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) :
+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+        wxSTCCallTipBase(parent, wxBORDER_NONE),
+#else
+        wxSTCCallTipBase(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+                         wxFRAME_NO_TASKBAR
+                         | wxFRAME_FLOAT_ON_PARENT
+                         | wxBORDER_NONE
+#ifdef __WXMAC__
+                         | wxPOPUP_WINDOW  
+#endif
+            ), 
+#endif
+          m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)

         {
         }
 
     ~wxSTCCallTip() {
         {
         }
 
     ~wxSTCCallTip() {

+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP && defined(__WXGTK__)
+        wxRect rect = GetRect();
+        rect.x = m_cx;
+        rect.y = m_cy;
+        GetParent()->Refresh(false, &rect);
+#endif

     }
 
     }
 

-    bool AcceptsFocus() const { return FALSE; }
+    bool AcceptsFocus() const { return false; }

 
 

-    void OnPaint(wxPaintEvent& WXUNUSED(evt)) {
-        wxPaintDC dc(this);
+    void OnPaint(wxPaintEvent& WXUNUSED(evt))
+    {
+        wxBufferedPaintDC dc(this);

         Surface* surfaceWindow = Surface::Allocate();
         surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
         m_ct->PaintCT(surfaceWindow);
         Surface* surfaceWindow = Surface::Allocate();
         surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
         m_ct->PaintCT(surfaceWindow);


@@ -89,33 +149,63 @@ public:
         delete surfaceWindow;
     }
 
         delete surfaceWindow;
     }
 

-    void OnFocus(wxFocusEvent& event) {
+    void OnFocus(wxFocusEvent& event)
+    {

         GetParent()->SetFocus();
         event.Skip();
     }
 
         GetParent()->SetFocus();
         event.Skip();
     }
 

-    void OnLeftDown(wxMouseEvent& event) {
+    void OnLeftDown(wxMouseEvent& event)
+    {

         wxPoint pt = event.GetPosition();
         Point p(pt.x, pt.y);
         m_ct->MouseClick(p);
         m_swx->CallTipClick();
     }
 
         wxPoint pt = event.GetPosition();
         Point p(pt.x, pt.y);
         m_ct->MouseClick(p);
         m_swx->CallTipClick();
     }
 

-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP

     virtual void DoSetSize(int x, int y,
                            int width, int height,
     virtual void DoSetSize(int x, int y,
                            int width, int height,

-                           int sizeFlags = wxSIZE_AUTO) {
-        if (x != -1)
+                           int sizeFlags = wxSIZE_AUTO)
+    {
+        // convert coords to screen coords since we're a top-level window
+        if (x != wxDefaultCoord) {
+            m_cx = x;

             GetParent()->ClientToScreen(&x, NULL);
             GetParent()->ClientToScreen(&x, NULL);

-        if (y != -1)
+        }
+        if (y != wxDefaultCoord) {
+            m_cy = y;

             GetParent()->ClientToScreen(NULL, &y);
             GetParent()->ClientToScreen(NULL, &y);

+        }

         wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
     }
         wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
     }

+
+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+#else
+    virtual bool Show( bool show = true )
+    {
+        // Although we're a frame, we always want the parent to be active, so
+        // raise it whenever we get shown.
+        bool rv = wxSTCCallTipBase::Show(show);
+        if (rv && show)
+        {
+            wxTopLevelWindow *frame = wxDynamicCast(
+                wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
+            if (frame)
+                frame->Raise();
+        }
+        return rv;
+    }

 #endif
 #endif

+    
+    wxPoint GetMyPosition()
+    {
+        return wxPoint(m_cx, m_cy);
+    }

 
 private:
     CallTip*      m_ct;
     ScintillaWX*  m_swx;
 
 private:
     CallTip*      m_ct;
     ScintillaWX*  m_swx;

+    int           m_cx, m_cy;

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -126,6 +216,35 @@ BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

+//----------------------------------------------------------------------
+
+#if wxUSE_DATAOBJ
+static wxTextFileType wxConvertEOLMode(int scintillaMode)
+{
+    wxTextFileType type;
+
+    switch (scintillaMode) {
+        case wxSTC_EOL_CRLF:
+            type = wxTextFileType_Dos;
+            break;
+
+        case wxSTC_EOL_CR:
+            type = wxTextFileType_Mac;
+            break;
+
+        case wxSTC_EOL_LF:
+            type = wxTextFileType_Unix;
+            break;
+
+        default:
+            type = wxTextBuffer::typeDefault;
+            break;
+    }
+    return type;
+}
+#endif // wxUSE_DATAOBJ
+
+

 //----------------------------------------------------------------------
 // Constructor/Destructor
 
 //----------------------------------------------------------------------
 // Constructor/Destructor
 


@@ -137,10 +256,21 @@ ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
     stc   = win;
     wheelRotation = 0;
     Initialise();
     stc   = win;
     wheelRotation = 0;
     Initialise();

+#ifdef __WXMSW__
+    sysCaretBitmap = 0;
+    sysCaretWidth = 0;
+    sysCaretHeight = 0;
+#endif
+#if wxUSE_DRAG_AND_DROP
+    startDragTimer = new wxStartDragTimer(this);
+#endif // wxUSE_DRAG_AND_DROP

 }
 
 
 ScintillaWX::~ScintillaWX() {
 }
 
 
 ScintillaWX::~ScintillaWX() {

+#if wxUSE_DRAG_AND_DROP
+    delete startDragTimer;
+#endif // wxUSE_DRAG_AND_DROP

     Finalise();
 }
 
     Finalise();
 }
 


@@ -154,7 +284,7 @@ void ScintillaWX::Initialise() {
     dropTarget = new wxSTCDropTarget;
     dropTarget->SetScintilla(this);
     stc->SetDropTarget(dropTarget);
     dropTarget = new wxSTCDropTarget;
     dropTarget->SetScintilla(this);
     stc->SetDropTarget(dropTarget);

-#endif
+#endif // wxUSE_DRAG_AND_DROP

 #ifdef __WXMAC__
     vs.extraFontFlag = false;  // UseAntiAliasing
 #else
 #ifdef __WXMAC__
     vs.extraFontFlag = false;  // UseAntiAliasing
 #else


@@ -167,10 +297,20 @@ void ScintillaWX::Finalise() {
     ScintillaBase::Finalise();
     SetTicking(false);
     SetIdle(false);
     ScintillaBase::Finalise();
     SetTicking(false);
     SetIdle(false);

+    DestroySystemCaret();

 }
 
 
 void ScintillaWX::StartDrag() {
 }
 
 
 void ScintillaWX::StartDrag() {

+#if wxUSE_DRAG_AND_DROP
+    // We defer the starting of the DnD, otherwise the LeftUp of a normal
+    // click could be lost and the STC will think it is doing a DnD when the
+    // user just wanted a normal click.
+    startDragTimer->Start(200, true);
+#endif // wxUSE_DRAG_AND_DROP
+}
+
+void ScintillaWX::DoStartDrag() {

 #if wxUSE_DRAG_AND_DROP
     wxString dragText = stc2wx(drag.s, drag.len);
 
 #if wxUSE_DRAG_AND_DROP
     wxString dragText = stc2wx(drag.s, drag.len);
 


@@ -178,44 +318,44 @@ void ScintillaWX::StartDrag() {
     wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId());
     evt.SetEventObject(stc);
     evt.SetDragText(dragText);
     wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId());
     evt.SetEventObject(stc);
     evt.SetDragText(dragText);

-    evt.SetDragAllowMove(TRUE);
+    evt.SetDragAllowMove(true);

     evt.SetPosition(wxMin(stc->GetSelectionStart(),
                           stc->GetSelectionEnd()));
     stc->GetEventHandler()->ProcessEvent(evt);
     dragText = evt.GetDragText();
 
     evt.SetPosition(wxMin(stc->GetSelectionStart(),
                           stc->GetSelectionEnd()));
     stc->GetEventHandler()->ProcessEvent(evt);
     dragText = evt.GetDragText();
 

-    if (dragText.Length()) {
+    if (dragText.length()) {

         wxDropSource        source(stc);
         wxTextDataObject    data(dragText);
         wxDragResult        result;
 
         source.SetData(data);
         wxDropSource        source(stc);
         wxTextDataObject    data(dragText);
         wxDragResult        result;
 
         source.SetData(data);

-        dropWentOutside = TRUE;
+        dropWentOutside = true;

         result = source.DoDragDrop(evt.GetDragAllowMove());
         if (result == wxDragMove && dropWentOutside)
             ClearSelection();
         result = source.DoDragDrop(evt.GetDragAllowMove());
         if (result == wxDragMove && dropWentOutside)
             ClearSelection();

-        inDragDrop = FALSE;
+        inDragDrop = false;

         SetDragPosition(invalidPosition);
     }
         SetDragPosition(invalidPosition);
     }

-#endif
+#endif // wxUSE_DRAG_AND_DROP

 }
 
 
 bool ScintillaWX::SetIdle(bool on) {
     if (idler.state != on) {
         // connect or disconnect the EVT_IDLE handler
 }
 
 
 bool ScintillaWX::SetIdle(bool on) {
     if (idler.state != on) {
         // connect or disconnect the EVT_IDLE handler

-        if (on) 
-            stc->Connect(-1, wxEVT_IDLE,
+        if (on)
+            stc->Connect(wxID_ANY, wxEVT_IDLE,

                          (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
         else
                          (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
         else

-            stc->Disconnect(-1, wxEVT_IDLE,
+            stc->Disconnect(wxID_ANY, wxEVT_IDLE,

                             (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
         idler.state = on;
     }
     return idler.state;
 }
 
                             (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
         idler.state = on;
     }
     return idler.state;
 }
 

-    
+

 void ScintillaWX::SetTicking(bool on) {
     wxSTCTimer* steTimer;
     if (timer.ticking != on) {
 void ScintillaWX::SetTicking(bool on) {
     wxSTCTimer* steTimer;
     if (timer.ticking != on) {


@@ -380,20 +520,30 @@ void ScintillaWX::Paste() {
     pdoc->BeginUndoAction();
     ClearSelection();
 
     pdoc->BeginUndoAction();
     ClearSelection();
 

+#if wxUSE_DATAOBJ

     wxTextDataObject data;
     wxTextDataObject data;

-    bool gotData = FALSE;
+    bool gotData = false;

 
 

+    wxTheClipboard->UsePrimarySelection(false);

     if (wxTheClipboard->Open()) {
     if (wxTheClipboard->Open()) {

-        wxTheClipboard->UsePrimarySelection(FALSE);

         gotData = wxTheClipboard->GetData(data);
         wxTheClipboard->Close();
     }
     if (gotData) {
         gotData = wxTheClipboard->GetData(data);
         wxTheClipboard->Close();
     }
     if (gotData) {

-        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
-        int        len = strlen(buf);
+        wxString   text = wxTextBuffer::Translate(data.GetText(),
+                                                  wxConvertEOLMode(pdoc->eolMode));
+        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+
+#if wxUSE_UNICODE
+        // free up the old character buffer in case the text is real big
+        data.SetText(wxEmptyString); 
+        text = wxEmptyString;
+#endif
+        int len = strlen(buf);

         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
     }
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
     }

+#endif // wxUSE_DATAOBJ

 
     pdoc->EndUndoAction();
     NotifyChange();
 
     pdoc->EndUndoAction();
     NotifyChange();


@@ -402,32 +552,40 @@ void ScintillaWX::Paste() {
 
 
 void ScintillaWX::CopyToClipboard(const SelectionText& st) {
 
 
 void ScintillaWX::CopyToClipboard(const SelectionText& st) {

+#if wxUSE_CLIPBOARD
+    wxTheClipboard->UsePrimarySelection(false);

     if (wxTheClipboard->Open()) {
     if (wxTheClipboard->Open()) {

-        wxTheClipboard->UsePrimarySelection(FALSE);
-        wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len));
+        wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len-1));

         wxTheClipboard->SetData(new wxTextDataObject(text));
         wxTheClipboard->Close();
     }
         wxTheClipboard->SetData(new wxTextDataObject(text));
         wxTheClipboard->Close();
     }

+#else
+    wxUnusedVar(st);
+#endif // wxUSE_CLIPBOARD

 }
 
 
 bool ScintillaWX::CanPaste() {
 }
 
 
 bool ScintillaWX::CanPaste() {

-    bool canPaste = FALSE;
+#if wxUSE_CLIPBOARD
+    bool canPaste = false;

     bool didOpen;
 
     if (Editor::CanPaste()) {
     bool didOpen;
 
     if (Editor::CanPaste()) {

+        wxTheClipboard->UsePrimarySelection(false);

         didOpen = !wxTheClipboard->IsOpened();
         if ( didOpen )
             wxTheClipboard->Open();
 
         if (wxTheClipboard->IsOpened()) {
         didOpen = !wxTheClipboard->IsOpened();
         if ( didOpen )
             wxTheClipboard->Open();
 
         if (wxTheClipboard->IsOpened()) {

-            wxTheClipboard->UsePrimarySelection(FALSE);

             canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
             if (didOpen)
                 wxTheClipboard->Close();
         }
     }
     return canPaste;
             canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
             if (didOpen)
                 wxTheClipboard->Close();
         }
     }
     return canPaste;

+#else
+    return false;
+#endif // wxUSE_CLIPBOARD

 }
 
 void ScintillaWX::CreateCallTipWindow(PRectangle) {
 }
 
 void ScintillaWX::CreateCallTipWindow(PRectangle) {


@@ -449,36 +607,96 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
 }
 
 
 }
 
 

-// This is called by the Editor base class whenever something is selected
+// This is called by the Editor base class whenever something is selected.
+// For wxGTK we can put this text in the primary selection and then other apps
+// can paste with the middle button.

 void ScintillaWX::ClaimSelection() {
 void ScintillaWX::ClaimSelection() {

-#if 0
-    // Until wxGTK is able to support using both the primary selection and the
-    // clipboard at the same time I think it causes more problems than it is
-    // worth to implement this method.  Selecting text should not clear the
-    // clipboard.  --Robin

 #ifdef __WXGTK__
     // Put the selected text in the PRIMARY selection
     if (currentPos != anchor) {
         SelectionText st;
         CopySelectionRange(&st);
 #ifdef __WXGTK__
     // Put the selected text in the PRIMARY selection
     if (currentPos != anchor) {
         SelectionText st;
         CopySelectionRange(&st);

+        wxTheClipboard->UsePrimarySelection(true);

         if (wxTheClipboard->Open()) {
         if (wxTheClipboard->Open()) {

-            wxTheClipboard->UsePrimarySelection(TRUE);

             wxString text = stc2wx(st.s, st.len);
             wxTheClipboard->SetData(new wxTextDataObject(text));
             wxString text = stc2wx(st.s, st.len);
             wxTheClipboard->SetData(new wxTextDataObject(text));

-            wxTheClipboard->UsePrimarySelection(FALSE);

             wxTheClipboard->Close();
         }
             wxTheClipboard->Close();
         }

+        wxTheClipboard->UsePrimarySelection(false);
+    }
+#endif
+}
+
+
+void ScintillaWX::UpdateSystemCaret() {
+#ifdef __WXMSW__
+    if (hasFocus) {
+        if (HasCaretSizeChanged()) {
+            DestroySystemCaret();
+            CreateSystemCaret();
+        }
+        Point pos = LocationFromPosition(currentPos);
+        ::SetCaretPos(pos.x, pos.y);

     }
 #endif
     }
 #endif

+}
+
+
+bool ScintillaWX::HasCaretSizeChanged() {
+#ifdef __WXMSW__
+    if (( (0 != vs.caretWidth) && (sysCaretWidth != vs.caretWidth) )
+        || (0 != vs.lineHeight) && (sysCaretHeight != vs.lineHeight)) {
+        return true;
+    }
+#endif
+    return false;
+}
+
+bool ScintillaWX::CreateSystemCaret() {
+#ifdef __WXMSW__
+    sysCaretWidth = vs.caretWidth;
+    if (0 == sysCaretWidth) {
+        sysCaretWidth = 1;
+    }
+    sysCaretHeight = vs.lineHeight;
+    int bitmapSize = (((sysCaretWidth + 15) & ~15) >> 3) * sysCaretHeight;
+    char *bits = new char[bitmapSize];
+    memset(bits, 0, bitmapSize);
+    sysCaretBitmap = ::CreateBitmap(sysCaretWidth, sysCaretHeight, 1,
+                                    1, reinterpret_cast<BYTE *>(bits));
+    delete [] bits;
+    BOOL retval = ::CreateCaret(GetHwndOf(stc), sysCaretBitmap,
+                                sysCaretWidth, sysCaretHeight);
+    ::ShowCaret(GetHwndOf(stc));
+    return retval != 0;
+#else
+    return false;
+#endif
+}
+
+bool ScintillaWX::DestroySystemCaret() {
+#ifdef __WXMSW__
+    ::HideCaret(GetHwndOf(stc));
+    BOOL retval = ::DestroyCaret();
+    if (sysCaretBitmap) {
+        ::DeleteObject(sysCaretBitmap);
+        sysCaretBitmap = 0;
+    }
+    return retval != 0;
+#else
+    return false;

 #endif
 }
 
 
 #endif
 }
 
 

-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) {
       case SCI_CALLTIPSHOW: {
           // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx
       switch (iMessage) {
       case SCI_CALLTIPSHOW: {
           // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx


@@ -493,7 +711,8 @@ long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lPar
                                           defn,
                                           vs.styles[STYLE_DEFAULT].fontName,
                                           vs.styles[STYLE_DEFAULT].sizeZoomed,
                                           defn,
                                           vs.styles[STYLE_DEFAULT].fontName,
                                           vs.styles[STYLE_DEFAULT].sizeZoomed,

-                                          IsUnicodeMode(),
+                                          CodePage(),
+                                          vs.styles[STYLE_DEFAULT].characterSet,

                                           wMain);
           // If the call-tip window would be out of the client
           // space, adjust so it displays above the text.
                                           wMain);
           // If the call-tip window would be out of the client
           // space, adjust so it displays above the text.


@@ -515,10 +734,11 @@ long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lPar
       }
 
 #ifdef SCI_LEXER
       }
 
 #ifdef SCI_LEXER

-       case SCI_LOADLEXERLIBRARY:
+      case SCI_LOADLEXERLIBRARY:

             LexerManager::GetInstance()->Load((const char*)lParam);
             break;
 #endif
             LexerManager::GetInstance()->Load((const char*)lParam);
             break;
 #endif

+

       default:
           return ScintillaBase::WndProc(iMessage, wParam, lParam);
       }
       default:
           return ScintillaBase::WndProc(iMessage, wParam, lParam);
       }


@@ -539,7 +759,6 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
     PRectangle rcClient = GetClientRectangle();
     paintingAllText = rcPaint.Contains(rcClient);
 
     PRectangle rcClient = GetClientRectangle();
     paintingAllText = rcPaint.Contains(rcClient);
 

-    dc->BeginDrawing();

     ClipChildren(*dc, rcPaint);
     Paint(surfaceWindow, rcPaint);
 
     ClipChildren(*dc, rcPaint);
     Paint(surfaceWindow, rcPaint);
 


@@ -550,7 +769,6 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
         FullPaint();
     }
     paintState = notPainting;
         FullPaint();
     }
     paintState = notPainting;

-    dc->EndDrawing();

 }
 
 
 }
 
 


@@ -633,9 +851,6 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta,
 
 
 void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(height)) {
 
 
 void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(height)) {

-//      PRectangle rcClient(0,0,width,height);
-//      SetScrollBarsTo(rcClient);
-//      DropGraphics();

     ChangeSize();
 }
 
     ChangeSize();
 }
 


@@ -643,12 +858,15 @@ void ScintillaWX::DoLoseFocus(){
     focusEvent = true;
     SetFocusState(false);
     focusEvent = false;
     focusEvent = true;
     SetFocusState(false);
     focusEvent = false;

+    DestroySystemCaret();

 }
 
 void ScintillaWX::DoGainFocus(){
     focusEvent = true;
     SetFocusState(true);
     focusEvent = false;
 }
 
 void ScintillaWX::DoGainFocus(){
     focusEvent = true;
     SetFocusState(true);
     focusEvent = false;

+    DestroySystemCaret();
+    CreateSystemCaret();

 }
 
 void ScintillaWX::DoSysColourChange() {
 }
 
 void ScintillaWX::DoSysColourChange() {


@@ -661,6 +879,14 @@ void ScintillaWX::DoLeftButtonDown(Point pt, unsigned int curTime, bool shift, b
 
 void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) {
     ButtonUp(pt, curTime, ctrl);
 
 void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) {
     ButtonUp(pt, curTime, ctrl);

+#if wxUSE_DRAG_AND_DROP
+    if (startDragTimer->IsRunning()) {
+        startDragTimer->Stop();
+        SetDragPosition(invalidPosition);
+        SetEmptySelection(PositionFromLocation(pt));
+        ShowCaretAtCurrentPosition();
+    }
+#endif // wxUSE_DRAG_AND_DROP

 }
 
 void ScintillaWX::DoLeftButtonMove(Point pt) {
 }
 
 void ScintillaWX::DoLeftButtonMove(Point pt) {


@@ -676,15 +902,17 @@ void ScintillaWX::DoMiddleButtonUp(Point pt) {
 
     pdoc->BeginUndoAction();
     wxTextDataObject data;
 
     pdoc->BeginUndoAction();
     wxTextDataObject data;

-    bool gotData = FALSE;
+    bool gotData = false;
+    wxTheClipboard->UsePrimarySelection(true);

     if (wxTheClipboard->Open()) {
     if (wxTheClipboard->Open()) {

-        wxTheClipboard->UsePrimarySelection(TRUE);

         gotData = wxTheClipboard->GetData(data);
         gotData = wxTheClipboard->GetData(data);

-        wxTheClipboard->UsePrimarySelection(FALSE);

         wxTheClipboard->Close();
     }
         wxTheClipboard->Close();
     }

+    wxTheClipboard->UsePrimarySelection(false);

     if (gotData) {
     if (gotData) {

-        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
+        wxString   text = wxTextBuffer::Translate(data.GetText(),
+                                                  wxConvertEOLMode(pdoc->eolMode));
+        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);

         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);


@@ -705,27 +933,25 @@ void ScintillaWX::DoMiddleButtonUp(Point WXUNUSED(pt)) {
 void ScintillaWX::DoAddChar(int key) {
 #if wxUSE_UNICODE
     wxChar wszChars[2];
 void ScintillaWX::DoAddChar(int key) {
 #if wxUSE_UNICODE
     wxChar wszChars[2];

-    wszChars[0] = key;
+    wszChars[0] = (wxChar)key;

     wszChars[1] = 0;
     wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(wszChars);
     AddCharUTF((char*)buf.data(), strlen(buf));
 #else
     wszChars[1] = 0;
     wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(wszChars);
     AddCharUTF((char*)buf.data(), strlen(buf));
 #else

-    AddChar(key);
+    AddChar((char)key);

 #endif
 }
 
 
 #endif
 }
 
 

-#ifdef __WXMAC__
-int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool meta, bool* consumed) {
-#else
-int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNUSED(meta), bool* consumed) {
-#endif
-#if defined(__WXGTK__) || defined(__WXMAC__)
-    // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK
-    // TODO:  Check this, it shouldn't be true any longer.
-    if (ctrl && key >= 1 && key <= 26)
+int  ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
+{
+    int key = evt.GetKeyCode();
+    bool shift = evt.ShiftDown(),
+         ctrl  = evt.ControlDown(),
+         alt   = evt.AltDown();
+
+    if (ctrl && key >= 1 && key <= 26 && key != WXK_BACK)

         key += 'A' - 1;
         key += 'A' - 1;

-#endif

 
     switch (key) {
     case WXK_DOWN:              key = SCK_DOWN;     break;
 
     switch (key) {
     case WXK_DOWN:              key = SCK_DOWN;     break;


@@ -734,15 +960,24 @@ int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNU
     case WXK_RIGHT:             key = SCK_RIGHT;    break;
     case WXK_HOME:              key = SCK_HOME;     break;
     case WXK_END:               key = SCK_END;      break;
     case WXK_RIGHT:             key = SCK_RIGHT;    break;
     case WXK_HOME:              key = SCK_HOME;     break;
     case WXK_END:               key = SCK_END;      break;

-    case WXK_PAGEUP:            // fall through
-    case WXK_PRIOR:             key = SCK_PRIOR;    break;
-    case WXK_PAGEDOWN:          // fall through
-    case WXK_NEXT:              key = SCK_NEXT;     break;
+    case WXK_PAGEUP:            key = SCK_PRIOR;    break;
+    case WXK_PAGEDOWN:          key = SCK_NEXT;     break;
+    case WXK_NUMPAD_DOWN:       key = SCK_DOWN;     break;
+    case WXK_NUMPAD_UP:         key = SCK_UP;       break;
+    case WXK_NUMPAD_LEFT:       key = SCK_LEFT;     break;
+    case WXK_NUMPAD_RIGHT:      key = SCK_RIGHT;    break;
+    case WXK_NUMPAD_HOME:       key = SCK_HOME;     break;
+    case WXK_NUMPAD_END:        key = SCK_END;      break;
+    case WXK_NUMPAD_PAGEUP:     key = SCK_PRIOR;    break;
+    case WXK_NUMPAD_PAGEDOWN:   key = SCK_NEXT;     break;
+    case WXK_NUMPAD_DELETE:     key = SCK_DELETE;   break;
+    case WXK_NUMPAD_INSERT:     key = SCK_INSERT;   break;

     case WXK_DELETE:            key = SCK_DELETE;   break;
     case WXK_INSERT:            key = SCK_INSERT;   break;
     case WXK_ESCAPE:            key = SCK_ESCAPE;   break;
     case WXK_BACK:              key = SCK_BACK;     break;
     case WXK_TAB:               key = SCK_TAB;      break;
     case WXK_DELETE:            key = SCK_DELETE;   break;
     case WXK_INSERT:            key = SCK_INSERT;   break;
     case WXK_ESCAPE:            key = SCK_ESCAPE;   break;
     case WXK_BACK:              key = SCK_BACK;     break;
     case WXK_TAB:               key = SCK_TAB;      break;

+    case WXK_NUMPAD_ENTER:      // fall through

     case WXK_RETURN:            key = SCK_RETURN;   break;
     case WXK_ADD:               // fall through
     case WXK_NUMPAD_ADD:        key = SCK_ADD;      break;
     case WXK_RETURN:            key = SCK_RETURN;   break;
     case WXK_ADD:               // fall through
     case WXK_NUMPAD_ADD:        key = SCK_ADD;      break;


@@ -757,7 +992,7 @@ int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNU
     }
 
 #ifdef __WXMAC__
     }
 
 #ifdef __WXMAC__

-    if ( meta ) {
+    if ( evt.MetaDown() ) {

         // check for a few common Mac Meta-key combos and remap them to Ctrl
         // for Scintilla
         switch ( key ) {
         // check for a few common Mac Meta-key combos and remap them to Ctrl
         // for Scintilla
         switch ( key ) {


@@ -771,7 +1006,7 @@ int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNU
         }
     }
 #endif
         }
     }
 #endif

-    
+

     int rv = KeyDown(key, shift, ctrl, alt, consumed);
 
     if (key)
     int rv = KeyDown(key, shift, ctrl, alt, consumed);
 
     if (key)


@@ -795,7 +1030,7 @@ void ScintillaWX::DoOnListBox() {
     AutoCompleteCompleted();
 }
 
     AutoCompleteCompleted();
 }
 

- 
+

 void ScintillaWX::DoOnIdle(wxIdleEvent& evt) {
 
     if ( Idle() )
 void ScintillaWX::DoOnIdle(wxIdleEvent& evt) {
 
     if ( Idle() )


@@ -803,13 +1038,16 @@ void ScintillaWX::DoOnIdle(wxIdleEvent& evt) {
     else
         SetIdle(false);
 }
     else
         SetIdle(false);
 }

- 
+

 //----------------------------------------------------------------------
 
 #if wxUSE_DRAG_AND_DROP
 bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
     SetDragPosition(invalidPosition);
 
 //----------------------------------------------------------------------
 
 #if wxUSE_DRAG_AND_DROP
 bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
     SetDragPosition(invalidPosition);
 

+    wxString text = wxTextBuffer::Translate(data,
+                                            wxConvertEOLMode(pdoc->eolMode));
+

     // Send an event to allow the drag details to be changed
     wxStyledTextEvent evt(wxEVT_STC_DO_DROP, stc->GetId());
     evt.SetEventObject(stc);
     // Send an event to allow the drag details to be changed
     wxStyledTextEvent evt(wxEVT_STC_DO_DROP, stc->GetId());
     evt.SetEventObject(stc);


@@ -817,7 +1055,7 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
     evt.SetX(x);
     evt.SetY(y);
     evt.SetPosition(PositionFromLocation(Point(x,y)));
     evt.SetX(x);
     evt.SetY(y);
     evt.SetPosition(PositionFromLocation(Point(x,y)));

-    evt.SetDragText(data);
+    evt.SetDragText(text);

     stc->GetEventHandler()->ProcessEvent(evt);
 
     dragResult = evt.GetDragResult();
     stc->GetEventHandler()->ProcessEvent(evt);
 
     dragResult = evt.GetDragResult();


@@ -825,10 +1063,10 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
         DropAt(evt.GetPosition(),
                wx2stc(evt.GetDragText()),
                dragResult == wxDragMove,
         DropAt(evt.GetPosition(),
                wx2stc(evt.GetDragText()),
                dragResult == wxDragMove,

-               FALSE); // TODO: rectangular?
-        return TRUE;
+               false); // TODO: rectangular?
+        return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -858,12 +1096,14 @@ wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
 void ScintillaWX::DoDragLeave() {
     SetDragPosition(invalidPosition);
 }
 void ScintillaWX::DoDragLeave() {
     SetDragPosition(invalidPosition);
 }

-#endif
+#endif // wxUSE_DRAG_AND_DROP

 //----------------------------------------------------------------------
 
 // Force the whole window to be repainted
 void ScintillaWX::FullPaint() {
 //----------------------------------------------------------------------
 
 // Force the whole window to be repainted
 void ScintillaWX::FullPaint() {

+#ifndef __WXMAC__

     stc->Refresh(false);
     stc->Refresh(false);

+#endif

     stc->Update();
 }
 
     stc->Update();
 }
 


@@ -877,24 +1117,25 @@ void ScintillaWX::DoScrollToColumn(int column) {
     HorizontalScrollTo(column * vs.spaceWidth);
 }
 
     HorizontalScrollTo(column * vs.spaceWidth);
 }
 

-#ifdef __WXGTK__
-void ScintillaWX::ClipChildren(wxDC& dc, PRectangle rect) {
-    wxRegion rgn(wxRectFromPRectangle(rect));
-    if (ac.Active()) {
-        wxRect childRect = ((wxWindow*)ac.lb->GetID())->GetRect();
-        rgn.Subtract(childRect);
-    }
-    if (ct.inCallTipMode) {
-        wxRect childRect = ((wxWindow*)ct.wCallTip.GetID())->GetRect();
-        rgn.Subtract(childRect);
-    }
-
-    dc.SetClippingRegion(rgn);
-}
-#else
-void ScintillaWX::ClipChildren(wxDC& WXUNUSED(dc), PRectangle WXUNUSED(rect)) {
+// wxGTK doesn't appear to need this explicit clipping code any longer, but I
+// will leave it here commented out for a while just in case...
+void ScintillaWX::ClipChildren(wxDC& WXUNUSED(dc), PRectangle WXUNUSED(rect))
+{
+//     wxRegion rgn(wxRectFromPRectangle(rect));
+//     if (ac.Active()) {
+//         wxRect childRect = ((wxWindow*)ac.lb->GetID())->GetRect();
+//         rgn.Subtract(childRect);
+//     }
+//     if (ct.inCallTipMode) {
+//         wxSTCCallTip* tip = (wxSTCCallTip*)ct.wCallTip.GetID();
+//         wxRect childRect = tip->GetRect();
+// #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+//         childRect.SetPosition(tip->GetMyPosition());
+// #endif
+//         rgn.Subtract(childRect);
+//     }
+//     dc.SetClippingRegion(rgn);

 }
 }

-#endif

 
 
 void ScintillaWX::SetUseAntiAliasing(bool useAA) {
 
 
 void ScintillaWX::SetUseAntiAliasing(bool useAA) {


@@ -905,6 +1146,8 @@ void ScintillaWX::SetUseAntiAliasing(bool useAA) {
 bool ScintillaWX::GetUseAntiAliasing() {
     return vs.extraFontFlag;
 }
 bool ScintillaWX::GetUseAntiAliasing() {
     return vs.extraFontFlag;
 }

- 
+

 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------

+
+#endif // wxUSE_STC