supporting -1 as 'to' parameter for selections

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

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 565bfabb2c41b0830829a5a0b9bbcd14cdfc5783..76af113dd7640e279ef99dbb329f5afc555fad5a 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -14,16 +14,35 @@
 // 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()
 
 #ifdef __WXMSW__
     // GetHwndOf()

-    #include <wx/msw/private.h>
+    #include "wx/msw/private.h"

 #endif
 
 //----------------------------------------------------------------------
 #endif
 
 //----------------------------------------------------------------------


@@ -32,52 +51,79 @@
 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>
+#include "wx/dcbuffer.h"

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

-    wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx)
-        : wxSTCCallTipBase(parent, param2),
+    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)
         {
         }
           m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)
         {
         }


@@ -93,7 +139,8 @@ public:
 
     bool AcceptsFocus() const { return false; }
 
 
     bool AcceptsFocus() const { return false; }
 

-    void OnPaint(wxPaintEvent& WXUNUSED(evt)) {
+    void OnPaint(wxPaintEvent& WXUNUSED(evt))
+    {

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


@@ -102,22 +149,25 @@ 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) {
+                           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);
         if (x != wxDefaultCoord) {
             m_cx = x;
             GetParent()->ClientToScreen(&x, NULL);


@@ -128,9 +178,27 @@ public:
         }
         wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
     }
         }
         wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
     }

-#endif

 
 

-    wxPoint GetMyPosition() {
+#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
+    
+    wxPoint GetMyPosition()
+    {

         return wxPoint(m_cx, m_cy);
     }
 
         return wxPoint(m_cx, m_cy);
     }
 


@@ -150,6 +218,7 @@ END_EVENT_TABLE()
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+#if wxUSE_DATAOBJ

 static wxTextFileType wxConvertEOLMode(int scintillaMode)
 {
     wxTextFileType type;
 static wxTextFileType wxConvertEOLMode(int scintillaMode)
 {
     wxTextFileType type;


@@ -173,6 +242,7 @@ static wxTextFileType wxConvertEOLMode(int scintillaMode)
     }
     return type;
 }
     }
     return type;
 }

+#endif // wxUSE_DATAOBJ

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


@@ -191,10 +261,16 @@ ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
     sysCaretWidth = 0;
     sysCaretHeight = 0;
 #endif
     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();
 }
 


@@ -208,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


@@ -226,6 +302,15 @@ void ScintillaWX::Finalise() {
 
 
 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);
 


@@ -239,7 +324,7 @@ void ScintillaWX::StartDrag() {
     stc->GetEventHandler()->ProcessEvent(evt);
     dragText = evt.GetDragText();
 
     stc->GetEventHandler()->ProcessEvent(evt);
     dragText = evt.GetDragText();
 

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

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


@@ -252,7 +337,7 @@ void ScintillaWX::StartDrag() {
         inDragDrop = false;
         SetDragPosition(invalidPosition);
     }
         inDragDrop = false;
         SetDragPosition(invalidPosition);
     }

-#endif
+#endif // wxUSE_DRAG_AND_DROP

 }
 
 
 }
 
 


@@ -435,11 +520,12 @@ void ScintillaWX::Paste() {
     pdoc->BeginUndoAction();
     ClearSelection();
 
     pdoc->BeginUndoAction();
     ClearSelection();
 

+#if wxUSE_DATAOBJ

     wxTextDataObject data;
     bool gotData = false;
 
     wxTextDataObject data;
     bool gotData = false;
 

+    wxTheClipboard->UsePrimarySelection(false);

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

-        wxTheClipboard->UsePrimarySelection(false);

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


@@ -447,10 +533,17 @@ void ScintillaWX::Paste() {
         wxString   text = wxTextBuffer::Translate(data.GetText(),
                                                   wxConvertEOLMode(pdoc->eolMode));
         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
         wxString   text = wxTextBuffer::Translate(data.GetText(),
                                                   wxConvertEOLMode(pdoc->eolMode));
         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);

-        int        len = strlen(buf);
+
+#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();


@@ -459,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() {

+#if wxUSE_CLIPBOARD

     bool canPaste = false;
     bool didOpen;
 
     if (Editor::CanPaste()) {
     bool canPaste = false;
     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) {


@@ -506,28 +607,24 @@ 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
     }
 #endif

-#endif

 }
 
 
 }
 
 


@@ -595,11 +692,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) {
       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


@@ -662,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);
 


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

-    dc->EndDrawing();

 }
 
 
 }
 
 


@@ -784,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) {


@@ -800,12 +903,12 @@ void ScintillaWX::DoMiddleButtonUp(Point pt) {
     pdoc->BeginUndoAction();
     wxTextDataObject data;
     bool gotData = false;
     pdoc->BeginUndoAction();
     wxTextDataObject data;
     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) {
         wxString   text = wxTextBuffer::Translate(data.GetText(),
                                                   wxConvertEOLMode(pdoc->eolMode));
     if (gotData) {
         wxString   text = wxTextBuffer::Translate(data.GetText(),
                                                   wxConvertEOLMode(pdoc->eolMode));


@@ -847,7 +950,7 @@ int  ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
          ctrl  = evt.ControlDown(),
          alt   = evt.AltDown();
 
          ctrl  = evt.ControlDown(),
          alt   = evt.AltDown();
 

-    if (ctrl && key >= 1 && key <= 26)
+    if (ctrl && key >= 1 && key <= 26 && key != WXK_BACK)

         key += 'A' - 1;
 
     switch (key) {
         key += 'A' - 1;
 
     switch (key) {


@@ -857,10 +960,18 @@ int  ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
     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_DELETE:            key = SCK_DELETE;   break;
     case WXK_INSERT:            key = SCK_INSERT;   break;
     case WXK_ESCAPE:            key = SCK_ESCAPE;   break;


@@ -985,7 +1096,7 @@ 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
 //----------------------------------------------------------------------
 
 // Force the whole window to be repainted


@@ -1006,28 +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) {
-        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);
-}
-#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) {


@@ -1041,3 +1149,5 @@ bool ScintillaWX::GetUseAntiAliasing() {
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------

+
+#endif // wxUSE_STC