Fixed wxRichTextCtrl caret test case

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

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 0f9a5281ab967649f50a8625af41d8da0a4451f7..7e1afb39cd91f4ba2aab7dd6fd30f281dbed4151 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////

-// Name:        ScintillaWX.cxx
+// Name:        src/stc/ScintillaWX.cpp

 // 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
 // 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


@@ -11,7 +11,7 @@
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -34,6 +34,12 @@
 #include "wx/clipbrd.h"
 #include "wx/dnd.h"
 
 #include "wx/clipbrd.h"
 #include "wx/dnd.h"
 

+#if !wxUSE_STD_CONTAINERS && !wxUSE_STD_IOSTREAM && !wxUSE_STD_STRING
+    #include "wx/beforestd.h"
+    #include <string>
+    #include "wx/afterstd.h"
+#endif
+

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


@@ -283,13 +289,13 @@ 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.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.empty() ) {

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


@@ -297,11 +303,11 @@ void ScintillaWX::StartDrag() {
         source.SetData(data);
         dropWentOutside = true;
         inDragDrop = ddDragging;
         source.SetData(data);
         dropWentOutside = true;
         inDragDrop = ddDragging;

-        result = source.DoDragDrop(evt.GetDragAllowMove());
+        result = source.DoDragDrop(evt.GetDragFlags());

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

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

     }
 #endif // wxUSE_DRAG_AND_DROP
 }
     }
 #endif // wxUSE_DRAG_AND_DROP
 }


@@ -472,7 +478,7 @@ void ScintillaWX::CancelModes() {
 
 
 void ScintillaWX::Copy() {
 
 
 void ScintillaWX::Copy() {

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

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


@@ -504,8 +510,9 @@ void ScintillaWX::Paste() {
         text = wxEmptyString;
 #endif
         int len = strlen(buf);
         text = wxEmptyString;
 #endif
         int len = strlen(buf);

-        pdoc->InsertString(currentPos, buf, len);
-        SetEmptySelection(currentPos + len);
+        int caretMain = sel.MainCaret();
+        pdoc->InsertString(caretMain, buf, len);
+        SetEmptySelection(caretMain + len);

     }
 #endif // wxUSE_DATAOBJ
 
     }
 #endif // wxUSE_DATAOBJ
 


@@ -580,7 +587,7 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
 void ScintillaWX::ClaimSelection() {
 #ifdef __WXGTK__
     // Put the selected text in the PRIMARY selection
 void ScintillaWX::ClaimSelection() {
 #ifdef __WXGTK__
     // Put the selected text in the PRIMARY selection

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

         SelectionText st;
         CopySelectionRange(&st);
         wxTheClipboard->UsePrimarySelection(true);
         SelectionText st;
         CopySelectionRange(&st);
         wxTheClipboard->UsePrimarySelection(true);


@@ -602,7 +609,7 @@ void ScintillaWX::UpdateSystemCaret() {
             DestroySystemCaret();
             CreateSystemCaret();
         }
             DestroySystemCaret();
             CreateSystemCaret();
         }

-        Point pos = LocationFromPosition(currentPos);
+        Point pos = PointMainCaret();

         ::SetCaretPos(pos.x, pos.y);
     }
 #endif
         ::SetCaretPos(pos.x, pos.y);
     }
 #endif


@@ -679,7 +686,8 @@ sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam)
           {
               ct.SetForeBack(vs.styles[STYLE_CALLTIP].fore, vs.styles[STYLE_CALLTIP].back);
           }
           {
               ct.SetForeBack(vs.styles[STYLE_CALLTIP].fore, vs.styles[STYLE_CALLTIP].back);
           }

-          PRectangle rc = ct.CallTipStart(currentPos, pt,
+          int caretMain = sel.MainCaret();
+          PRectangle rc = ct.CallTipStart(caretMain, pt,

                                           defn,
                                           vs.styles[ctStyle].fontName,
                                           vs.styles[ctStyle].sizeZoomed,
                                           defn,
                                           vs.styles[ctStyle].fontName,
                                           vs.styles[ctStyle].sizeZoomed,


@@ -725,25 +733,47 @@ sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam)
 void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
 
     paintState = painting;
 void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
 
     paintState = painting;

-    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);
+    AutoSurface surfaceWindow(dc, this);
+    if (surfaceWindow) {
+        rcPaint = PRectangleFromwxRect(rect);
+        PRectangle rcClient = GetClientRectangle();
+        paintingAllText = rcPaint.Contains(rcClient);
+
+        ClipChildren(*dc, rcPaint);
+        Paint(surfaceWindow, rcPaint);
+        surfaceWindow->Release();
+    }

 
 

-    delete surfaceWindow;

     if (paintState == paintAbandoned) {
         // Painting area was insufficient to cover new styling or brace
         // highlight positions
     if (paintState == paintAbandoned) {
         // Painting area was insufficient to cover new styling or brace
         // highlight positions

-        FullPaint();
+        FullPaintDC(dc);

     }
     paintState = notPainting;
 }
 
 
     }
     paintState = notPainting;
 }
 
 

+// Force the whole window to be repainted
+void ScintillaWX::FullPaint() {
+    wxClientDC dc(stc);
+    FullPaintDC(&dc);
+}
+
+
+void ScintillaWX::FullPaintDC(wxDC* dc) {
+    paintState = painting;
+    rcPaint = GetClientRectangle();
+    paintingAllText = true;
+    AutoSurface surfaceWindow(dc, this);
+    if (surfaceWindow) {
+        Paint(surfaceWindow, rcPaint);
+        surfaceWindow->Release();
+    }
+    paintState = notPainting;
+}
+
+
+

 void ScintillaWX::DoHScroll(int type, int pos) {
     int xPos = xOffset;
     PRectangle rcText = GetTextRectangle();
 void ScintillaWX::DoHScroll(int type, int pos) {
     int xPos = xOffset;
     PRectangle rcText = GetTextRectangle();


@@ -797,7 +827,7 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta,
     int lines;
 
     if (ctrlDown) {  // Zoom the fonts if Ctrl key down
     int lines;
 
     if (ctrlDown) {  // Zoom the fonts if Ctrl key down

-        if (rotation < 0) {
+        if (rotation > 0) {

             KeyCommand(SCI_ZOOMIN);
         }
         else {
             KeyCommand(SCI_ZOOMIN);
         }
         else {


@@ -862,7 +892,7 @@ 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);
     // 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, noSel, true);
+    MovePositionTo(newPos, Selection::noSel, true);

 
     pdoc->BeginUndoAction();
     wxTextDataObject data;
 
     pdoc->BeginUndoAction();
     wxTextDataObject data;


@@ -878,8 +908,9 @@ void ScintillaWX::DoMiddleButtonUp(Point pt) {
                                                   wxConvertEOLMode(pdoc->eolMode));
         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
         int        len = strlen(buf);
                                                   wxConvertEOLMode(pdoc->eolMode));
         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
         int        len = strlen(buf);

-        pdoc->InsertString(currentPos, buf, len);
-        SetEmptySelection(currentPos + len);
+        int caretMain = sel.MainCaret();
+        pdoc->InsertString(caretMain, buf, len);
+        SetEmptySelection(caretMain + len);

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


@@ -910,6 +941,14 @@ void ScintillaWX::DoAddChar(int key) {
 int  ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
 {
     int key = evt.GetKeyCode();
 int  ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
 {
     int key = evt.GetKeyCode();

+    if (key == WXK_NONE) {
+        // This is a Unicode character not representable in Latin-1 or some key
+        // without key code at all (e.g. dead key or VK_PROCESSKEY under MSW).
+        if ( consumed )
+            *consumed = false;
+        return 0;
+    }
+

     bool shift = evt.ShiftDown(),
          ctrl  = evt.ControlDown(),
          alt   = evt.AltDown();
     bool shift = evt.ShiftDown(),
          ctrl  = evt.ControlDown(),
          alt   = evt.AltDown();


@@ -952,7 +991,7 @@ int  ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
     case WXK_CONTROL:           key = 0; break;
     case WXK_ALT:               key = 0; break;
     case WXK_SHIFT:             key = 0; 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_MENU:              key = SCK_MENU; break;

     }
 
 #ifdef __WXMAC__
     }
 
 #ifdef __WXMAC__


@@ -1007,7 +1046,7 @@ void ScintillaWX::DoOnIdle(wxIdleEvent& evt) {
 
 #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));
 
     wxString text = wxTextBuffer::Translate(data,
                                             wxConvertEOLMode(pdoc->eolMode));


@@ -1024,7 +1063,7 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
 
     dragResult = evt.GetDragResult();
     if (dragResult == wxDragMove || dragResult == wxDragCopy) {
 
     dragResult = evt.GetDragResult();
     if (dragResult == wxDragMove || dragResult == wxDragCopy) {

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

                wx2stc(evt.GetDragText()),
                dragResult == wxDragMove,
                false); // TODO: rectangular?
                wx2stc(evt.GetDragText()),
                dragResult == wxDragMove,
                false); // TODO: rectangular?


@@ -1041,7 +1080,7 @@ wxDragResult ScintillaWX::DoDragEnter(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
 
 
 wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
 
 
 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());


@@ -1058,20 +1097,11 @@ wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
 
 
 void ScintillaWX::DoDragLeave() {
 
 
 void ScintillaWX::DoDragLeave() {

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

 }
 #endif // wxUSE_DRAG_AND_DROP
 //----------------------------------------------------------------------
 
 }
 #endif // wxUSE_DRAG_AND_DROP
 //----------------------------------------------------------------------
 

-// Force the whole window to be repainted
-void ScintillaWX::FullPaint() {
-#ifndef __WXMAC__
-    stc->Refresh(false);
-#endif
-    stc->Update();
-}
-
-

 void ScintillaWX::DoScrollToLine(int line) {
     ScrollTo(line);
 }
 void ScintillaWX::DoScrollToLine(int line) {
     ScrollTo(line);
 }


@@ -1108,7 +1138,7 @@ void ScintillaWX::SetUseAntiAliasing(bool useAA) {
 }
 
 bool ScintillaWX::GetUseAntiAliasing() {
 }
 
 bool ScintillaWX::GetUseAntiAliasing() {

-    return vs.extraFontFlag;
+    return vs.extraFontFlag != 0;

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