No changes, just use RAII-based classes in MSW owner drawn menu code.

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

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index da83a4212ca6d890cfc40652ca30672c03026bf4..2da03ca83363744f438fcf8ad0f95f32a6308ae5 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


@@ -11,20 +11,39 @@
 // Created:     13-Jan-2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 by Total Control Software
 // Created:     13-Jan-2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 by Total Control Software

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#include <ctype.h>
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#include "ScintillaWX.h"
-#include "wx/stc/stc.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

 
 

-const int H_SCROLL_MAX  = 4000;
-const int H_SCROLL_STEP = 20;
-const int H_SCROLL_PAGE = 200;
+#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 "wx/stc/private.h"
+#include "PlatWX.h"
+
+#ifdef __WXMSW__
+    // GetHwndOf()
+    #include "wx/msw/private.h"
+#endif

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


@@ -32,99 +51,205 @@ const int H_SCROLL_PAGE = 200;
 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
 bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) {
 };
 
 
 #if wxUSE_DRAG_AND_DROP
 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
 
 
 #if wxUSE_POPUPWIN

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

 #define wxSTCCallTipBase wxPopupWindow
 #define wxSTCCallTipBase wxPopupWindow

-#define param2  wxBORDER_NONE  // popup's 2nd param is flags

 #else
 #else

-#define wxSTCCallTipBase wxWindow
-#define param2 -1 // wxWindows 2nd param is ID
+#include "wx/frame.h"
+#define wxSTCCallTipBase wxFrame

 #endif
 
 #endif
 

+#include "wx/dcbuffer.h"
+

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

-    wxSTCCallTip(wxWindow* parent, CallTip* ct)
-        : wxSTCCallTipBase(parent, param2)
+    wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) :
+#if wxUSE_POPUPWIN
+        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)

         {
         {

-            m_ct = ct;
+            SetBackgroundStyle(wxBG_STYLE_CUSTOM);

         }
 
         }
 

-    void OnPaint(wxPaintEvent& evt) {
-        wxPaintDC dc(this);
-        Surface surfaceWindow;
-        surfaceWindow.Init(&dc);
-        m_ct->PaintCT(&surfaceWindow);
-        surfaceWindow.Release();
+    ~wxSTCCallTip() {
+#if wxUSE_POPUPWIN && defined(__WXGTK__)
+        wxRect rect = GetRect();
+        rect.x = m_cx;
+        rect.y = m_cy;
+        GetParent()->Refresh(false, &rect);
+#endif
+    }
+
+    bool AcceptsFocus() const { return false; }
+
+    void OnPaint(wxPaintEvent& WXUNUSED(evt))
+    {
+        wxAutoBufferedPaintDC dc(this);
+        Surface* surfaceWindow = Surface::Allocate();
+        surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
+        m_ct->PaintCT(surfaceWindow);
+        surfaceWindow->Release();
+        delete surfaceWindow;
+    }
+
+    void OnFocus(wxFocusEvent& event)
+    {
+        GetParent()->SetFocus();
+        event.Skip();
+    }
+
+    void OnLeftDown(wxMouseEvent& event)
+    {
+        wxPoint pt = event.GetPosition();
+        Point p(pt.x, pt.y);
+        m_ct->MouseClick(p);
+        m_swx->CallTipClick();

     }
 
     }
 

-#if wxUSE_POPUPWIN

     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
+#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:
 private:

-    CallTip*    m_ct;
+    CallTip*      m_ct;
+    ScintillaWX*  m_swx;
+    int           m_cx, m_cy;

     DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase)
     EVT_PAINT(wxSTCCallTip::OnPaint)
     DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase)
     EVT_PAINT(wxSTCCallTip::OnPaint)

+    EVT_SET_FOCUS(wxSTCCallTip::OnFocus)
+    EVT_LEFT_DOWN(wxSTCCallTip::OnLeftDown)

 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
 
 
 ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
     capturedMouse = false;
 //----------------------------------------------------------------------
 // Constructor/Destructor
 
 
 ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
     capturedMouse = false;

+    focusEvent = false;

     wMain = win;
     stc   = win;
     wheelRotation = 0;
     Initialise();
     wMain = win;
     stc   = win;
     wheelRotation = 0;
     Initialise();

+#ifdef __WXMSW__
+    sysCaretBitmap = 0;
+    sysCaretWidth = 0;
+    sysCaretHeight = 0;
+#endif

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

-    SetTicking(false);
+    Finalise();

 }
 
 //----------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------


@@ -137,43 +262,61 @@ 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
+    vs.extraFontFlag = true;   // UseAntiAliasing

 }
 
 
 void ScintillaWX::Finalise() {
     ScintillaBase::Finalise();
 }
 
 
 void ScintillaWX::Finalise() {
     ScintillaBase::Finalise();

+    SetTicking(false);
+    SetIdle(false);
+    DestroySystemCaret();

 }
 
 
 void ScintillaWX::StartDrag() {
 #if wxUSE_DRAG_AND_DROP
 }
 
 
 void ScintillaWX::StartDrag() {
 #if wxUSE_DRAG_AND_DROP

-    wxString dragText(drag.s, drag.len);
+    wxString dragText = stc2wx(drag.s, drag.len);

 
     // Send an event to allow the drag text to be changed
     wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId());
     evt.SetEventObject(stc);
     evt.SetDragText(dragText);
 
     // Send an event to allow the drag text to be changed
     wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId());
     evt.SetEventObject(stc);
     evt.SetDragText(dragText);

-    evt.SetDragAllowMove(TRUE);
+    evt.SetDragFlags(wxDrag_DefaultMove);

     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;
-        result = source.DoDragDrop(evt.GetDragAllowMove());
+        dropWentOutside = true;
+        inDragDrop = ddDragging;
+        result = source.DoDragDrop(evt.GetDragFlags());

         if (result == wxDragMove && dropWentOutside)
             ClearSelection();
         if (result == wxDragMove && dropWentOutside)
             ClearSelection();

-        inDragDrop = FALSE;
-        SetDragPosition(invalidPosition);
+        inDragDrop = ddNone;
+        SetDragPosition(SelectionPosition(invalidPosition));

     }
     }

-#endif
+#endif // wxUSE_DRAG_AND_DROP
+}
+
+
+bool ScintillaWX::SetIdle(bool on) {
+    if (idler.state != on) {
+        // connect or disconnect the EVT_IDLE handler
+        if (on)
+            stc->Connect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(wxStyledTextCtrl::OnIdle));
+        else
+            stc->Disconnect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(wxStyledTextCtrl::OnIdle));
+        idler.state = on;
+    }
+    return idler.state;

 }
 
 
 }
 
 


@@ -184,7 +327,7 @@ void ScintillaWX::SetTicking(bool on) {
         if (timer.ticking) {
             steTimer = new wxSTCTimer(this);
             steTimer->Start(timer.tickSize);
         if (timer.ticking) {
             steTimer = new wxSTCTimer(this);
             steTimer->Start(timer.tickSize);

-            timer.tickerID = (int)steTimer;
+            timer.tickerID = steTimer;

         } else {
             steTimer = (wxSTCTimer*)timer.tickerID;
             steTimer->Stop();
         } else {
             steTimer = (wxSTCTimer*)timer.tickerID;
             steTimer->Stop();


@@ -197,11 +340,13 @@ void ScintillaWX::SetTicking(bool on) {
 
 
 void ScintillaWX::SetMouseCapture(bool on) {
 
 
 void ScintillaWX::SetMouseCapture(bool on) {

-    if (on && !capturedMouse)
-        stc->CaptureMouse();
-    else if (!on && capturedMouse)
-        stc->ReleaseMouse();
-    capturedMouse = on;
+    if (mouseDownCaptures) {
+        if (on && !capturedMouse)
+            stc->CaptureMouse();
+        else if (!on && capturedMouse && stc->HasCapture())
+            stc->ReleaseMouse();
+        capturedMouse = on;
+    }

 }
 
 
 }
 
 


@@ -235,15 +380,22 @@ void ScintillaWX::SetHorizontalScrollPos() {
 }
 
 
 }
 
 

+const int H_SCROLL_STEP = 20;
+

 bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
     bool modified = false;
 
 bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
     bool modified = false;
 

+    int vertEnd = nMax;
+    if (!verticalScrollBarVisible)
+        vertEnd = 0;
+
+    // Check the vertical scrollbar

     if (stc->m_vScrollBar == NULL) {  // Use built-in scrollbar
         int  sbMax    = stc->GetScrollRange(wxVERTICAL);
         int  sbThumb  = stc->GetScrollThumb(wxVERTICAL);
         int  sbPos    = stc->GetScrollPos(wxVERTICAL);
     if (stc->m_vScrollBar == NULL) {  // Use built-in scrollbar
         int  sbMax    = stc->GetScrollRange(wxVERTICAL);
         int  sbThumb  = stc->GetScrollThumb(wxVERTICAL);
         int  sbPos    = stc->GetScrollPos(wxVERTICAL);

-        if (sbMax != nMax || sbThumb != nPage) {
-            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax);
+        if (sbMax != vertEnd || sbThumb != nPage) {
+            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, vertEnd+1);

             modified = true;
         }
     }
             modified = true;
         }
     }


@@ -251,31 +403,47 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
         int  sbMax    = stc->m_vScrollBar->GetRange();
         int  sbPage   = stc->m_vScrollBar->GetPageSize();
         int  sbPos    = stc->m_vScrollBar->GetThumbPosition();
         int  sbMax    = stc->m_vScrollBar->GetRange();
         int  sbPage   = stc->m_vScrollBar->GetPageSize();
         int  sbPos    = stc->m_vScrollBar->GetThumbPosition();

-        if (sbMax != nMax || sbPage != nPage) {
-            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax, nPage);
+        if (sbMax != vertEnd || sbPage != nPage) {
+            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, vertEnd+1, nPage);

             modified = true;
         }
     }
 
 
             modified = true;
         }
     }
 
 

-    if (horizontalScrollBarVisible) {
-        if (stc->m_hScrollBar == NULL) {  // Use built-in scrollbar
-            int sbMax    = stc->GetScrollRange(wxHORIZONTAL);
-            int sbThumb  = stc->GetScrollThumb(wxHORIZONTAL);
-            if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) {
-                stc->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX);
-                modified = true;
+    // Check the horizontal scrollbar
+    PRectangle rcText = GetTextRectangle();
+    int horizEnd = scrollWidth;
+    if (horizEnd < 0)
+        horizEnd = 0;
+    if (!horizontalScrollBarVisible || (wrapState != eWrapNone))
+        horizEnd = 0;
+    int pageWidth = rcText.Width();
+
+    if (stc->m_hScrollBar == NULL) {  // Use built-in scrollbar
+        int sbMax    = stc->GetScrollRange(wxHORIZONTAL);
+        int sbThumb  = stc->GetScrollThumb(wxHORIZONTAL);
+        int sbPos    = stc->GetScrollPos(wxHORIZONTAL);
+        if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
+            stc->SetScrollbar(wxHORIZONTAL, sbPos, pageWidth, horizEnd);
+            modified = true;
+            if (scrollWidth < pageWidth) {
+                HorizontalScrollTo(0);

             }
         }
             }
         }

-        else { // otherwise use the one that's been given to us
-            int  sbMax    = stc->m_hScrollBar->GetRange();
-            int  sbPage   = stc->m_hScrollBar->GetPageSize();
-            if ((sbMax != H_SCROLL_MAX) || (sbPage != H_SCROLL_STEP)) {
-                stc->m_hScrollBar->SetScrollbar(0, H_SCROLL_STEP, H_SCROLL_MAX, H_SCROLL_STEP);
-                modified = true;
+    }
+    else { // otherwise use the one that's been given to us
+        int sbMax    = stc->m_hScrollBar->GetRange();
+        int sbThumb  = stc->m_hScrollBar->GetPageSize();
+        int sbPos    = stc->m_hScrollBar->GetThumbPosition();
+        if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
+            stc->m_hScrollBar->SetScrollbar(sbPos, pageWidth, horizEnd, pageWidth);
+            modified = true;
+            if (scrollWidth < pageWidth) {
+                HorizontalScrollTo(0);

             }
         }
     }
             }
         }
     }

+

     return modified;
 }
 
     return modified;
 }
 


@@ -290,14 +458,24 @@ void ScintillaWX::NotifyParent(SCNotification scn) {
 }
 
 
 }
 
 

+// This method is overloaded from ScintillaBase in order to prevent the
+// AutoComplete window from being destroyed when it gets the focus.  There is
+// a side effect that the AutoComp will also not be destroyed when switching
+// to another window, but I think that is okay.
+void ScintillaWX::CancelModes() {
+    if (! focusEvent)
+        AutoCompleteCancel();
+    ct.CallTipCancel();
+    Editor::CancelModes();
+}
+
+

 
 void ScintillaWX::Copy() {
 
 void ScintillaWX::Copy() {

-    if (currentPos != anchor) {
+    if (!sel.Empty()) {

         SelectionText st;
         CopySelectionRange(&st);
         SelectionText st;
         CopySelectionRange(&st);

-        wxTheClipboard->Open();
-        wxTheClipboard->SetData(new wxTextDataObject(wxString(st.s, st.len)));
-        wxTheClipboard->Close();
+        CopyToClipboard(st);

     }
 }
 
     }
 }
 


@@ -306,18 +484,31 @@ void ScintillaWX::Paste() {
     pdoc->BeginUndoAction();
     ClearSelection();
 
     pdoc->BeginUndoAction();
     ClearSelection();
 

+#if wxUSE_DATAOBJ

     wxTextDataObject data;
     wxTextDataObject data;

-    bool gotData;
+    bool gotData = false;

 
 

-    wxTheClipboard->Open();
-    gotData = wxTheClipboard->GetData(data);
-    wxTheClipboard->Close();
+    wxTheClipboard->UsePrimarySelection(false);
+    if (wxTheClipboard->Open()) {
+        gotData = wxTheClipboard->GetData(data);
+        wxTheClipboard->Close();
+    }

     if (gotData) {
     if (gotData) {

-        wxString str = data.GetText();
-        int      len = str.Length();
-        pdoc->InsertString(currentPos, str.c_str(), len);
-        SetEmptySelection(currentPos + len);
+        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);
+        int caretMain = sel.MainCaret();
+        pdoc->InsertString(caretMain, buf, len);
+        SetEmptySelection(caretMain + len);

     }
     }

+#endif // wxUSE_DATAOBJ

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


@@ -325,50 +516,207 @@ void ScintillaWX::Paste() {
 }
 
 
 }
 
 

-bool ScintillaWX::CanPaste() {
-    bool canPaste;
+void ScintillaWX::CopyToClipboard(const SelectionText& st) {
+#if wxUSE_CLIPBOARD
+    if ( !st.len )
+        return;
+
+    wxTheClipboard->UsePrimarySelection(false);
+    if (wxTheClipboard->Open()) {
+        wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len-1));
+        wxTheClipboard->SetData(new wxTextDataObject(text));
+        wxTheClipboard->Close();
+    }
+#else
+    wxUnusedVar(st);
+#endif // wxUSE_CLIPBOARD
+}

 
 

-    wxTheClipboard->Open();
-    canPaste = wxTheClipboard->IsSupported( wxDF_TEXT );
-    wxTheClipboard->Close();

 
 

+bool ScintillaWX::CanPaste() {
+#if wxUSE_CLIPBOARD
+    bool canPaste = false;
+    bool didOpen;
+
+    if (Editor::CanPaste()) {
+        wxTheClipboard->UsePrimarySelection(false);
+        didOpen = !wxTheClipboard->IsOpened();
+        if ( didOpen )
+            wxTheClipboard->Open();
+
+        if (wxTheClipboard->IsOpened()) {
+            canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
+            if (didOpen)
+                wxTheClipboard->Close();
+        }
+    }

     return canPaste;
     return canPaste;

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

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

-    ct.wCallTip = new wxSTCCallTip(stc, &ct);
-    ct.wDraw = ct.wCallTip;
+    if (! ct.wCallTip.Created() ) {
+        ct.wCallTip = new wxSTCCallTip(stc, &ct, this);
+        ct.wDraw = ct.wCallTip;
+    }

 }
 
 
 void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
     if (!label[0])
 }
 
 
 void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
     if (!label[0])

-        popup.GetID()->AppendSeparator();
+        ((wxMenu*)popup.GetID())->AppendSeparator();

     else
     else

-        popup.GetID()->Append(cmd, label);
+        ((wxMenu*)popup.GetID())->Append(cmd, wxGetTranslation(stc2wx(label)));

 
     if (!enabled)
 
     if (!enabled)

-        popup.GetID()->Enable(cmd, enabled);
+        ((wxMenu*)popup.GetID())->Enable(cmd, enabled);

 }
 
 
 }
 
 

+// 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() {

+#ifdef __WXGTK__
+    // Put the selected text in the PRIMARY selection
+    if (!sel.Empty()) {
+        SelectionText st;
+        CopySelectionRange(&st);
+        wxTheClipboard->UsePrimarySelection(true);
+        if (wxTheClipboard->Open()) {
+            wxString text = stc2wx(st.s, st.len);
+            wxTheClipboard->SetData(new wxTextDataObject(text));
+            wxTheClipboard->Close();
+        }
+        wxTheClipboard->UsePrimarySelection(false);
+    }
+#endif
+}
+
+
+void ScintillaWX::UpdateSystemCaret() {
+#ifdef __WXMSW__
+    if (hasFocus) {
+        if (HasCaretSizeChanged()) {
+            DestroySystemCaret();
+            CreateSystemCaret();
+        }
+        Point pos = PointMainCaret();
+        ::SetCaretPos(pos.x, pos.y);
+    }
+#endif
+}

 
 

+
+bool ScintillaWX::HasCaretSizeChanged() {
+#ifdef __WXMSW__
+    if ( (vs.caretWidth && (sysCaretWidth != vs.caretWidth))
+        || (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
+}

 
 

-long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) {
+bool ScintillaWX::DestroySystemCaret() {
+#ifdef __WXMSW__
+    ::HideCaret(GetHwndOf(stc));
+    BOOL retval = ::DestroyCaret();
+    if (sysCaretBitmap) {
+        ::DeleteObject(sysCaretBitmap);
+        sysCaretBitmap = 0;
+    }
+    return retval != 0;
+#else
+    return false;
+#endif
+}
+
+
+//----------------------------------------------------------------------
+
+
+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) {
-//      switch (iMessage) {
-//      case EM_CANPASTE:
-//          return CanPaste();
-//      default:
-        return ScintillaBase::WndProc(iMessage, wParam, lParam);
-//      }
-//      return 0;
+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
+          // because of the little tweak that needs done below for wxGTK.
+          // When updating new versions double check that this is still
+          // needed, and that any new code there is copied here too.
+          Point pt = LocationFromPosition(wParam);
+          char* defn = reinterpret_cast<char *>(lParam);
+          AutoCompleteCancel();
+          pt.y += vs.lineHeight;
+          int ctStyle = ct.UseStyleCallTip() ? STYLE_CALLTIP : STYLE_DEFAULT;
+          if (ct.UseStyleCallTip())
+          {
+              ct.SetForeBack(vs.styles[STYLE_CALLTIP].fore, vs.styles[STYLE_CALLTIP].back);
+          }
+          int caretMain = sel.MainCaret();
+          PRectangle rc = ct.CallTipStart(caretMain, pt,
+                                          defn,
+                                          vs.styles[ctStyle].fontName,
+                                          vs.styles[ctStyle].sizeZoomed,
+                                          CodePage(),
+                                          vs.styles[ctStyle].characterSet,
+                                          wMain);
+          // If the call-tip window would be out of the client
+          // space, adjust so it displays above the text.
+          PRectangle rcClient = GetClientRectangle();
+          if (rc.bottom > rcClient.bottom) {
+#ifdef __WXGTK__
+              int offset = int(vs.lineHeight * 1.25)  + rc.Height();
+#else
+              int offset = vs.lineHeight + rc.Height();
+#endif
+              rc.top -= offset;
+              rc.bottom -= offset;
+          }
+          // Now display the window.
+          CreateCallTipWindow(rc);
+          ct.wCallTip.SetPositionRelative(rc, wMain);
+          ct.wCallTip.Show();
+          break;
+      }
+
+#ifdef SCI_LEXER
+      case SCI_LOADLEXERLIBRARY:
+            LexerManager::GetInstance()->Load((const char*)lParam);
+            break;
+#endif
+
+      default:
+          return ScintillaBase::WndProc(iMessage, wParam, lParam);
+      }
+      return 0;

 }
 
 
 }
 
 


@@ -379,40 +727,45 @@ long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lPar
 void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
 
     paintState = painting;
 void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
 
     paintState = painting;

-    Surface surfaceWindow;
-    surfaceWindow.Init(dc);
-    PRectangle rcPaint = PRectangleFromwxRect(rect);
-    dc->BeginDrawing();
-    Paint(&surfaceWindow, rcPaint);
-    dc->EndDrawing();
-    surfaceWindow.Release();
+    Surface* surfaceWindow = Surface::Allocate();
+    surfaceWindow->Init(dc, wMain.GetID());
+    rcPaint = PRectangleFromwxRect(rect);
+    PRectangle rcClient = GetClientRectangle();
+    paintingAllText = rcPaint.Contains(rcClient);
+
+    ClipChildren(*dc, rcPaint);
+    Paint(surfaceWindow, rcPaint);
+
+    delete surfaceWindow;

     if (paintState == paintAbandoned) {
     if (paintState == paintAbandoned) {

-        // Painting area was insufficient to cover new styling or brace highlight positions
+        // Painting area was insufficient to cover new styling or brace
+        // highlight positions

         FullPaint();
     }
     paintState = notPainting;
         FullPaint();
     }
     paintState = notPainting;

-#ifdef __WXGTK__
-    // On wxGTK the editor window paints can overwrite the listbox...
-    if (ac.Active())
-        ((wxWindow*)ac.lb.GetID())->Refresh(TRUE);
-#endif

 }
 
 
 void ScintillaWX::DoHScroll(int type, int pos) {
     int xPos = xOffset;
 }
 
 
 void ScintillaWX::DoHScroll(int type, int pos) {
     int xPos = xOffset;

+    PRectangle rcText = GetTextRectangle();
+    int pageWidth = rcText.Width() * 2 / 3;

     if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)
         xPos -= H_SCROLL_STEP;
     else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)
         xPos += H_SCROLL_STEP;
     else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)
     if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)
         xPos -= H_SCROLL_STEP;
     else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)
         xPos += H_SCROLL_STEP;
     else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)

-        xPos -= H_SCROLL_PAGE;
-    else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN)
-        xPos += H_SCROLL_PAGE;
+        xPos -= pageWidth;
+    else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN) {
+        xPos += pageWidth;
+        if (xPos > scrollWidth - rcText.Width()) {
+            xPos = scrollWidth - rcText.Width();
+        }
+    }

     else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)
         xPos = 0;
     else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)
     else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)
         xPos = 0;
     else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)

-        xPos = H_SCROLL_MAX;
+        xPos = scrollWidth;

     else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)
         xPos = pos;
 
     else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)
         xPos = pos;
 


@@ -439,8 +792,9 @@ void ScintillaWX::DoVScroll(int type, int pos) {
     ScrollTo(topLineNew);
 }
 
     ScrollTo(topLineNew);
 }
 

-
-void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown) {
+void ScintillaWX::DoMouseWheel(int rotation, int delta,
+                               int linesPerAction, int ctrlDown,
+                               bool isPageScroll ) {

     int topLineNew = topLine;
     int lines;
 
     int topLineNew = topLine;
     int lines;
 


@@ -453,11 +807,16 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int
         }
     }
     else { // otherwise just scroll the window
         }
     }
     else { // otherwise just scroll the window

+        if ( !delta )
+            delta = 120;

         wheelRotation += rotation;
         lines = wheelRotation / delta;
         wheelRotation -= lines * delta;
         if (lines != 0) {
         wheelRotation += rotation;
         lines = wheelRotation / delta;
         wheelRotation -= lines * delta;
         if (lines != 0) {

-            lines *= linesPerAction;
+            if (isPageScroll)
+                lines = lines * LinesOnScreen();  // lines is either +1 or -1
+            else
+                lines *= linesPerAction;

             topLineNew -= lines;
             ScrollTo(topLineNew);
         }
             topLineNew -= lines;
             ScrollTo(topLineNew);
         }


@@ -465,77 +824,155 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int
 }
 
 
 }
 
 

-void ScintillaWX::DoSize(int width, int height) {
-    PRectangle rcClient(0,0,width,height);
-    SetScrollBarsTo(rcClient);
-    DropGraphics();
+void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(height)) {
+    ChangeSize();

 }
 
 void ScintillaWX::DoLoseFocus(){
 }
 
 void ScintillaWX::DoLoseFocus(){

+    focusEvent = true;

     SetFocusState(false);
     SetFocusState(false);

+    focusEvent = false;
+    DestroySystemCaret();

 }
 
 void ScintillaWX::DoGainFocus(){
 }
 
 void ScintillaWX::DoGainFocus(){

+    focusEvent = true;

     SetFocusState(true);
     SetFocusState(true);

+    focusEvent = false;
+    DestroySystemCaret();
+    CreateSystemCaret();

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

-void ScintillaWX::DoButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {
+void ScintillaWX::DoLeftButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {

     ButtonDown(pt, curTime, shift, ctrl, alt);
 }
 
     ButtonDown(pt, curTime, shift, ctrl, alt);
 }
 

-void ScintillaWX::DoButtonUp(Point pt, unsigned int curTime, bool ctrl) {
+void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) {

     ButtonUp(pt, curTime, ctrl);
 }
 
     ButtonUp(pt, curTime, ctrl);
 }
 

-void ScintillaWX::DoButtonMove(Point pt) {
+void ScintillaWX::DoLeftButtonMove(Point pt) {

     ButtonMove(pt);
 }
 
     ButtonMove(pt);
 }
 

+#ifdef __WXGTK__
+void ScintillaWX::DoMiddleButtonUp(Point pt) {
+    // Set the current position to the mouse click point and
+    // then paste in the PRIMARY selection, if any.  wxGTK only.
+    int newPos = PositionFromLocation(pt);
+    MovePositionTo(newPos, Selection::noSel, true);

 
 

-void ScintillaWX::DoAddChar(char ch) {
-    AddChar(ch);
+    pdoc->BeginUndoAction();
+    wxTextDataObject data;
+    bool gotData = false;
+    wxTheClipboard->UsePrimarySelection(true);
+    if (wxTheClipboard->Open()) {
+        gotData = wxTheClipboard->GetData(data);
+        wxTheClipboard->Close();
+    }
+    wxTheClipboard->UsePrimarySelection(false);
+    if (gotData) {
+        wxString   text = wxTextBuffer::Translate(data.GetText(),
+                                                  wxConvertEOLMode(pdoc->eolMode));
+        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+        int        len = strlen(buf);
+        int caretMain = sel.MainCaret();
+        pdoc->InsertString(caretMain, buf, len);
+        SetEmptySelection(caretMain + len);
+    }
+    pdoc->EndUndoAction();
+    NotifyChange();
+    Redraw();
+
+    ShowCaretAtCurrentPosition();
+    EnsureCaretVisible();
+}
+#else
+void ScintillaWX::DoMiddleButtonUp(Point WXUNUSED(pt)) {

 }
 }

+#endif

 
 

-int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed) {
-#ifdef __WXGTK__
-    // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK...
-    if (ctrl && key >= 1 && key <= 26)
-        key += 'A' - 1;
+
+void ScintillaWX::DoAddChar(int key) {
+#if wxUSE_UNICODE
+    wxChar wszChars[2];
+    wszChars[0] = (wxChar)key;
+    wszChars[1] = 0;
+    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(wszChars);
+    AddCharUTF((char*)buf.data(), strlen(buf));
+#else
+    AddChar((char)key);

 #endif
 #endif

+}
+
+
+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;

 
     switch (key) {
 
     switch (key) {

-    case WXK_DOWN: key = SCK_DOWN; break;
-    case WXK_UP: key = SCK_UP; break;
-    case WXK_LEFT: key = SCK_LEFT; break;
-    case WXK_RIGHT: key = SCK_RIGHT; break;
-    case WXK_HOME: key = SCK_HOME; break;
-    case WXK_END: key = SCK_END; break;
-    case WXK_PRIOR: key = SCK_PRIOR; break;
-    case WXK_NEXT: key = SCK_NEXT; 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_RETURN: key = SCK_RETURN; break;
-    case WXK_ADD:
-    case WXK_NUMPAD_ADD:
-        key = SCK_ADD; break;
-    case WXK_SUBTRACT:
-    case WXK_NUMPAD_SUBTRACT:
-        key = SCK_SUBTRACT; break;
-    case WXK_DIVIDE:
-    case WXK_NUMPAD_DIVIDE:
-        key = SCK_DIVIDE; break;
-    case WXK_CONTROL: key = 0; break;
-    case WXK_ALT: key = 0; break;
-    case WXK_SHIFT: key = 0; break;
-    case WXK_MENU: key = 0; break;
+    case WXK_DOWN:              key = SCK_DOWN;     break;
+    case WXK_UP:                key = SCK_UP;       break;
+    case WXK_LEFT:              key = SCK_LEFT;     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:            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_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_SUBTRACT:          // fall through
+    case WXK_NUMPAD_SUBTRACT:   key = SCK_SUBTRACT; break;
+    case WXK_DIVIDE:            // fall through
+    case WXK_NUMPAD_DIVIDE:     key = SCK_DIVIDE;   break;
+    case WXK_CONTROL:           key = 0; break;
+    case WXK_ALT:               key = 0; break;
+    case WXK_SHIFT:             key = 0; break;
+    case WXK_MENU:              key = 0; break;
+    }
+
+#ifdef __WXMAC__
+    if ( evt.MetaDown() ) {
+        // check for a few common Mac Meta-key combos and remap them to Ctrl
+        // for Scintilla
+        switch ( key ) {
+        case 'Z':       // Undo
+        case 'X':       // Cut
+        case 'C':       // Copy
+        case 'V':       // Paste
+        case 'A':       // Select All
+            ctrl = true;
+            break;
+        }

     }
     }

+#endif

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


@@ -552,18 +989,31 @@ void ScintillaWX::DoCommand(int ID) {
 
 
 void ScintillaWX::DoContextMenu(Point pt) {
 
 
 void ScintillaWX::DoContextMenu(Point pt) {

-    ContextMenu(pt);
+    if (displayPopupMenu)
+        ContextMenu(pt);

 }
 
 void ScintillaWX::DoOnListBox() {
     AutoCompleteCompleted();
 }
 
 }
 
 void ScintillaWX::DoOnListBox() {
     AutoCompleteCompleted();
 }
 

+
+void ScintillaWX::DoOnIdle(wxIdleEvent& evt) {
+
+    if ( Idle() )
+        evt.RequestMore();
+    else
+        SetIdle(false);
+}
+

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

-    SetDragPosition(invalidPosition);
+    SetDragPosition(SelectionPosition(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());
 
     // Send an event to allow the drag details to be changed
     wxStyledTextEvent evt(wxEVT_STC_DO_DROP, stc->GetId());


@@ -572,29 +1022,29 @@ 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();
     if (dragResult == wxDragMove || dragResult == wxDragCopy) {
     stc->GetEventHandler()->ProcessEvent(evt);
 
     dragResult = evt.GetDragResult();
     if (dragResult == wxDragMove || dragResult == wxDragCopy) {

-        DropAt(evt.GetPosition(),
-               evt.GetDragText(),
+        DropAt(SelectionPosition(evt.GetPosition()),
+               wx2stc(evt.GetDragText()),

                dragResult == wxDragMove,
                dragResult == wxDragMove,

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

     }
     }

-    return FALSE;
+    return false;

 }
 
 
 }
 
 

-wxDragResult ScintillaWX::DoDragEnter(wxCoord x, wxCoord y, wxDragResult def) {
+wxDragResult ScintillaWX::DoDragEnter(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def) {

     dragResult = def;
     return dragResult;
 }
 
 
 wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
     dragResult = def;
     return dragResult;
 }
 
 
 wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {

-    SetDragPosition(PositionFromLocation(Point(x, y)));
+    SetDragPosition(SelectionPosition(PositionFromLocation(Point(x, y))));

 
     // Send an event to allow the drag result to be changed
     wxStyledTextEvent evt(wxEVT_STC_DRAG_OVER, stc->GetId());
 
     // Send an event to allow the drag result to be changed
     wxStyledTextEvent evt(wxEVT_STC_DRAG_OVER, stc->GetId());


@@ -611,25 +1061,17 @@ wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
 
 
 void ScintillaWX::DoDragLeave() {
 
 
 void ScintillaWX::DoDragLeave() {

-    SetDragPosition(invalidPosition);
+    SetDragPosition(SelectionPosition(invalidPosition));

 }
 }

-#endif
+#endif // wxUSE_DRAG_AND_DROP

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

-// Redraw all of text area. This paint will not be abandoned.
+// Force the whole window to be repainted

 void ScintillaWX::FullPaint() {
 void ScintillaWX::FullPaint() {

-    paintState = painting;
-    rcPaint = GetTextRectangle();
-    paintingAllText = true;
-    wxClientDC dc(stc);
-    Surface surfaceWindow;
-    surfaceWindow.Init(&dc);
-    Paint(&surfaceWindow, rcPaint);
-    surfaceWindow.Release();
-
-//     stc->Refresh(FALSE);
-
-    paintState = notPainting;
+#ifndef __WXMAC__
+    stc->Refresh(false);
+#endif
+    stc->Update();

 }
 
 
 }
 
 


@@ -642,7 +1084,37 @@ void ScintillaWX::DoScrollToColumn(int column) {
     HorizontalScrollTo(column * vs.spaceWidth);
 }
 
     HorizontalScrollTo(column * vs.spaceWidth);
 }
 

+// 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
+//         childRect.SetPosition(tip->GetMyPosition());
+// #endif
+//         rgn.Subtract(childRect);
+//     }
+//     dc.SetClippingRegion(rgn);
+}
+

 
 

+void ScintillaWX::SetUseAntiAliasing(bool useAA) {
+    vs.extraFontFlag = useAA;
+    InvalidateStyleRedraw();
+}
+
+bool ScintillaWX::GetUseAntiAliasing() {
+    return vs.extraFontFlag != 0;
+}

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

+
+#endif // wxUSE_STC