synthetize 'button up' event before doubleclick, too

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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 103ce927962f45cb8b23b8421579be49116221ea..da83a4212ca6d890cfc40652ca30672c03026bf4 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -22,7 +22,7 @@
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-const int H_SCROLL_MAX  = 2000;
+const int H_SCROLL_MAX  = 4000;

 const int H_SCROLL_STEP = 20;
 const int H_SCROLL_PAGE = 200;
 
 const int H_SCROLL_STEP = 20;
 const int H_SCROLL_PAGE = 200;
 


@@ -44,7 +44,7 @@ private:
 };
 
 
 };
 
 

-
+#if wxUSE_DRAG_AND_DROP

 bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) {
     return swx->DoDropText(x, y, data);
 }
 bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) {
     return swx->DoDropText(x, y, data);
 }


@@ -60,12 +60,22 @@ wxDragResult  wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def
 void  wxSTCDropTarget::OnLeave() {
     swx->DoDragLeave();
 }
 void  wxSTCDropTarget::OnLeave() {
     swx->DoDragLeave();
 }

+#endif

 
 
 
 

-class wxSTCCallTip : public wxWindow {
+#if wxUSE_POPUPWIN
+#include <wx/popupwin.h>
+#define wxSTCCallTipBase wxPopupWindow
+#define param2  wxBORDER_NONE  // popup's 2nd param is flags
+#else
+#define wxSTCCallTipBase wxWindow
+#define param2 -1 // wxWindows 2nd param is ID
+#endif
+
+class wxSTCCallTip : public wxSTCCallTipBase {

 public:
 public:

-    wxSTCCallTip(wxWindow* parent, int ID, CallTip* ct)
-        : wxWindow(parent, ID)
+    wxSTCCallTip(wxWindow* parent, CallTip* ct)
+        : wxSTCCallTipBase(parent, param2)

         {
             m_ct = ct;
         }
         {
             m_ct = ct;
         }


@@ -78,14 +88,28 @@ public:
         surfaceWindow.Release();
     }
 
         surfaceWindow.Release();
     }
 

+#if wxUSE_POPUPWIN
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO) {
+        if (x != -1)
+            GetParent()->ClientToScreen(&x, NULL);
+        if (y != -1)
+            GetParent()->ClientToScreen(NULL, &y);
+        wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
+    }
+#endif
+
+private:

     CallTip*    m_ct;
     DECLARE_EVENT_TABLE()
 };
 
     CallTip*    m_ct;
     DECLARE_EVENT_TABLE()
 };
 

-BEGIN_EVENT_TABLE(wxSTCCallTip, wxWindow)
+BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase)

     EVT_PAINT(wxSTCCallTip::OnPaint)
 END_EVENT_TABLE()
 
     EVT_PAINT(wxSTCCallTip::OnPaint)
 END_EVENT_TABLE()
 

+

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


@@ -109,9 +133,11 @@ ScintillaWX::~ScintillaWX() {
 
 void ScintillaWX::Initialise() {
     //ScintillaBase::Initialise();
 
 void ScintillaWX::Initialise() {
     //ScintillaBase::Initialise();

+#if wxUSE_DRAG_AND_DROP

     dropTarget = new wxSTCDropTarget;
     dropTarget->SetScintilla(this);
     stc->SetDropTarget(dropTarget);
     dropTarget = new wxSTCDropTarget;
     dropTarget->SetScintilla(this);
     stc->SetDropTarget(dropTarget);

+#endif

 }
 
 
 }
 
 


@@ -121,16 +147,33 @@ void ScintillaWX::Finalise() {
 
 
 void ScintillaWX::StartDrag() {
 
 
 void ScintillaWX::StartDrag() {

-    wxDropSource        source(wMain.GetID());
-    wxTextDataObject    data(dragChars);
-    wxDragResult        result;
-
-    source.SetData(data);
-    result = source.DoDragDrop(TRUE);
-    if (result == wxDragMove && dropWentOutside)
-        ClearSelection();
-    inDragDrop = FALSE;
-    SetDragPosition(invalidPosition);
+#if wxUSE_DRAG_AND_DROP
+    wxString dragText(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);
+    evt.SetDragAllowMove(TRUE);
+    evt.SetPosition(wxMin(stc->GetSelectionStart(),
+                          stc->GetSelectionEnd()));
+    stc->GetEventHandler()->ProcessEvent(evt);
+    dragText = evt.GetDragText();
+
+    if (dragText.Length()) {
+        wxDropSource        source(stc);
+        wxTextDataObject    data(dragText);
+        wxDragResult        result;
+
+        source.SetData(data);
+        dropWentOutside = TRUE;
+        result = source.DoDragDrop(evt.GetDragAllowMove());
+        if (result == wxDragMove && dropWentOutside)
+            ClearSelection();
+        inDragDrop = FALSE;
+        SetDragPosition(invalidPosition);
+    }
+#endif

 }
 
 
 }
 
 


@@ -155,9 +198,9 @@ void ScintillaWX::SetTicking(bool on) {
 
 void ScintillaWX::SetMouseCapture(bool on) {
     if (on && !capturedMouse)
 
 void ScintillaWX::SetMouseCapture(bool on) {
     if (on && !capturedMouse)

-        wMain.GetID()->CaptureMouse();
+        stc->CaptureMouse();

     else if (!on && capturedMouse)
     else if (!on && capturedMouse)

-        wMain.GetID()->ReleaseMouse();
+        stc->ReleaseMouse();

     capturedMouse = on;
 }
 
     capturedMouse = on;
 }
 


@@ -169,36 +212,69 @@ bool ScintillaWX::HaveMouseCapture() {
 
 void ScintillaWX::ScrollText(int linesToMove) {
     int dy = vs.lineHeight * (linesToMove);
 
 void ScintillaWX::ScrollText(int linesToMove) {
     int dy = vs.lineHeight * (linesToMove);

-    wMain.GetID()->ScrollWindow(0, dy);
-    wMain.GetID()->Update();
+    stc->ScrollWindow(0, dy);
+    stc->Update();

 }
 
 void ScintillaWX::SetVerticalScrollPos() {
 }
 
 void ScintillaWX::SetVerticalScrollPos() {

-    wMain.GetID()->SetScrollPos(wxVERTICAL, topLine);
+    if (stc->m_vScrollBar == NULL) {  // Use built-in scrollbar
+        stc->SetScrollPos(wxVERTICAL, topLine);
+    }
+    else { // otherwise use the one that's been given to us
+        stc->m_vScrollBar->SetThumbPosition(topLine);
+    }

 }
 
 void ScintillaWX::SetHorizontalScrollPos() {
 }
 
 void ScintillaWX::SetHorizontalScrollPos() {

-    wMain.GetID()->SetScrollPos(wxHORIZONTAL, xOffset);
+    if (stc->m_hScrollBar == NULL) {  // Use built-in scrollbar
+        stc->SetScrollPos(wxHORIZONTAL, xOffset);
+    }
+    else { // otherwise use the one that's been given to us
+        stc->m_hScrollBar->SetThumbPosition(xOffset);
+    }

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

-    int  sbMax    = wMain.GetID()->GetScrollRange(wxVERTICAL);
-    int  sbThumb  = wMain.GetID()->GetScrollThumb(wxVERTICAL);
-    int  sbPos    = wMain.GetID()->GetScrollPos(wxVERTICAL);

 
 

-
-    if (sbMax != nMax || sbThumb != nPage) {
-        wMain.GetID()->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax);
-        modified = true;
+    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);
+            modified = true;
+        }

     }
     }

+    else { // otherwise use the one that's been given to us
+        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);
+            modified = true;
+        }
+    }
+

 
 

-    sbMax    = wMain.GetID()->GetScrollRange(wxHORIZONTAL);
-    sbThumb  = wMain.GetID()->GetScrollThumb(wxHORIZONTAL);
-    if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) {
-        wMain.GetID()->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX);
-        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;
+            }
+        }
+        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;
+            }
+        }

     }
     return modified;
 }
     }
     return modified;
 }


@@ -217,9 +293,10 @@ void ScintillaWX::NotifyParent(SCNotification scn) {
 
 void ScintillaWX::Copy() {
     if (currentPos != anchor) {
 
 void ScintillaWX::Copy() {
     if (currentPos != anchor) {

-        char* text = CopySelectionRange();
+        SelectionText st;
+        CopySelectionRange(&st);

         wxTheClipboard->Open();
         wxTheClipboard->Open();

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

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


@@ -230,12 +307,12 @@ void ScintillaWX::Paste() {
     ClearSelection();
 
     wxTextDataObject data;
     ClearSelection();
 
     wxTextDataObject data;

-    bool canPaste;
+    bool gotData;

 
     wxTheClipboard->Open();
 
     wxTheClipboard->Open();

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

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

-    if (canPaste) {
+    if (gotData) {

         wxString str = data.GetText();
         int      len = str.Length();
         pdoc->InsertString(currentPos, str.c_str(), len);
         wxString str = data.GetText();
         int      len = str.Length();
         pdoc->InsertString(currentPos, str.c_str(), len);


@@ -249,18 +326,17 @@ void ScintillaWX::Paste() {
 
 
 bool ScintillaWX::CanPaste() {
 
 
 bool ScintillaWX::CanPaste() {

-    wxTextDataObject data;

     bool canPaste;
 
     wxTheClipboard->Open();
     bool canPaste;
 
     wxTheClipboard->Open();

-    canPaste = wxTheClipboard->GetData(data);
+    canPaste = wxTheClipboard->IsSupported( wxDF_TEXT );

     wxTheClipboard->Close();
 
     return canPaste;
 }
 
 void ScintillaWX::CreateCallTipWindow(PRectangle) {
     wxTheClipboard->Close();
 
     return canPaste;
 }
 
 void ScintillaWX::CreateCallTipWindow(PRectangle) {

-    ct.wCallTip = new wxSTCCallTip(wMain.GetID(), -1, &ct);
+    ct.wCallTip = new wxSTCCallTip(stc, &ct);

     ct.wDraw = ct.wCallTip;
 }
 
     ct.wDraw = ct.wCallTip;
 }
 


@@ -325,19 +401,19 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
 
 void ScintillaWX::DoHScroll(int type, int pos) {
     int xPos = xOffset;
 
 void ScintillaWX::DoHScroll(int type, int pos) {
     int xPos = xOffset;

-    if (type == wxEVT_SCROLLWIN_LINEUP)
+    if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)

         xPos -= H_SCROLL_STEP;
         xPos -= H_SCROLL_STEP;

-    else if (type == wxEVT_SCROLLWIN_LINEDOWN)
+    else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)

         xPos += H_SCROLL_STEP;
         xPos += H_SCROLL_STEP;

-    else if (type == wxEVT_SCROLLWIN_PAGEUP)
+    else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)

         xPos -= H_SCROLL_PAGE;
         xPos -= H_SCROLL_PAGE;

-    else if (type == wxEVT_SCROLLWIN_PAGEDOWN)
+    else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN)

         xPos += H_SCROLL_PAGE;
         xPos += H_SCROLL_PAGE;

-    else if (type == wxEVT_SCROLLWIN_TOP)
+    else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)

         xPos = 0;
         xPos = 0;

-    else if (type == wxEVT_SCROLLWIN_BOTTOM)
+    else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)

         xPos = H_SCROLL_MAX;
         xPos = H_SCROLL_MAX;

-    else if (type == wxEVT_SCROLLWIN_THUMBTRACK)
+    else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)

         xPos = pos;
 
     HorizontalScrollTo(xPos);
         xPos = pos;
 
     HorizontalScrollTo(xPos);


@@ -345,19 +421,19 @@ void ScintillaWX::DoHScroll(int type, int pos) {
 
 void ScintillaWX::DoVScroll(int type, int pos) {
     int topLineNew = topLine;
 
 void ScintillaWX::DoVScroll(int type, int pos) {
     int topLineNew = topLine;

-    if (type == wxEVT_SCROLLWIN_LINEUP)
+    if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)

         topLineNew -= 1;
         topLineNew -= 1;

-    else if (type == wxEVT_SCROLLWIN_LINEDOWN)
+    else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)

         topLineNew += 1;
         topLineNew += 1;

-    else if (type ==  wxEVT_SCROLLWIN_PAGEUP)
+    else if (type ==  wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)

         topLineNew -= LinesToScroll();
         topLineNew -= LinesToScroll();

-    else if (type ==  wxEVT_SCROLLWIN_PAGEDOWN)
+    else if (type ==  wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN)

         topLineNew += LinesToScroll();
         topLineNew += LinesToScroll();

-    else if (type ==  wxEVT_SCROLLWIN_TOP)
+    else if (type ==  wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)

         topLineNew = 0;
         topLineNew = 0;

-    else if (type ==  wxEVT_SCROLLWIN_BOTTOM)
+    else if (type ==  wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)

         topLineNew = MaxScrollPos();
         topLineNew = MaxScrollPos();

-    else if (type ==   wxEVT_SCROLLWIN_THUMBTRACK)
+    else if (type ==   wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)

         topLineNew = pos;
 
     ScrollTo(topLineNew);
         topLineNew = pos;
 
     ScrollTo(topLineNew);


@@ -485,30 +561,59 @@ void ScintillaWX::DoOnListBox() {
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+#if wxUSE_DRAG_AND_DROP

 bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
     SetDragPosition(invalidPosition);
 bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
     SetDragPosition(invalidPosition);

-    int movePos = PositionFromLocation(Point(x,y));
-    DropAt(movePos, data, dragResult == wxDragMove, FALSE); // TODO: rectangular?
-    return TRUE;
+
+    // Send an event to allow the drag details to be changed
+    wxStyledTextEvent evt(wxEVT_STC_DO_DROP, stc->GetId());
+    evt.SetEventObject(stc);
+    evt.SetDragResult(dragResult);
+    evt.SetX(x);
+    evt.SetY(y);
+    evt.SetPosition(PositionFromLocation(Point(x,y)));
+    evt.SetDragText(data);
+    stc->GetEventHandler()->ProcessEvent(evt);
+
+    dragResult = evt.GetDragResult();
+    if (dragResult == wxDragMove || dragResult == wxDragCopy) {
+        DropAt(evt.GetPosition(),
+               evt.GetDragText(),
+               dragResult == wxDragMove,
+               FALSE); // TODO: rectangular?
+        return TRUE;
+    }
+    return FALSE;

 }
 
 
 wxDragResult ScintillaWX::DoDragEnter(wxCoord x, wxCoord y, wxDragResult def) {
 }
 
 
 wxDragResult ScintillaWX::DoDragEnter(wxCoord x, wxCoord y, wxDragResult def) {

-    return def;
+    dragResult = def;
+    return dragResult;

 }
 
 
 wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
     SetDragPosition(PositionFromLocation(Point(x, y)));
 }
 
 
 wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
     SetDragPosition(PositionFromLocation(Point(x, y)));

-    dragResult = def;
-    return def;
+
+    // Send an event to allow the drag result to be changed
+    wxStyledTextEvent evt(wxEVT_STC_DRAG_OVER, stc->GetId());
+    evt.SetEventObject(stc);
+    evt.SetDragResult(def);
+    evt.SetX(x);
+    evt.SetY(y);
+    evt.SetPosition(PositionFromLocation(Point(x,y)));
+    stc->GetEventHandler()->ProcessEvent(evt);
+
+    dragResult = evt.GetDragResult();
+    return dragResult;

 }
 
 
 void ScintillaWX::DoDragLeave() {
     SetDragPosition(invalidPosition);
 }
 }
 
 
 void ScintillaWX::DoDragLeave() {
     SetDragPosition(invalidPosition);
 }

-
+#endif

 //----------------------------------------------------------------------
 
 // Redraw all of text area. This paint will not be abandoned.
 //----------------------------------------------------------------------
 
 // Redraw all of text area. This paint will not be abandoned.


@@ -516,13 +621,13 @@ void ScintillaWX::FullPaint() {
     paintState = painting;
     rcPaint = GetTextRectangle();
     paintingAllText = true;
     paintState = painting;
     rcPaint = GetTextRectangle();
     paintingAllText = true;

-    wxClientDC dc(wMain.GetID());
+    wxClientDC dc(stc);

     Surface surfaceWindow;
     surfaceWindow.Init(&dc);
     Paint(&surfaceWindow, rcPaint);
     surfaceWindow.Release();
 
     Surface surfaceWindow;
     surfaceWindow.Init(&dc);
     Paint(&surfaceWindow, rcPaint);
     surfaceWindow.Release();
 

-//     wMain.GetID()->Refresh(FALSE);
+//     stc->Refresh(FALSE);

 
     paintState = notPainting;
 }
 
     paintState = notPainting;
 }