Typos fixed and further clarification of the Python situation on Panther

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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 9aeda729c7301fea568d4bb2df53453ad273090a..26e966cf36e90d6ba10fc83cdec3268daef8f740 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -16,8 +16,10 @@
 
 
 #include "ScintillaWX.h"
 
 
 #include "ScintillaWX.h"

+#include "ExternalLexer.h"

 #include "wx/stc/stc.h"
 #include "PlatWX.h"
 #include "wx/stc/stc.h"
 #include "PlatWX.h"

+#include <wx/textbuf.h>

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


@@ -135,6 +137,7 @@ END_EVENT_TABLE()
 
 ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
     capturedMouse = false;
 
 ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
     capturedMouse = false;

+    focusEvent = false;

     wMain = win;
     stc   = win;
     wheelRotation = 0;
     wMain = win;
     stc   = win;
     wheelRotation = 0;


@@ -253,18 +256,23 @@ void ScintillaWX::SetHorizontalScrollPos() {
     }
 }
 
     }
 }
 

+

 const int H_SCROLL_STEP = 20;
 
 bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
     bool modified = false;
 
 const int H_SCROLL_STEP = 20;
 
 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);
     // 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 (sbMax != nMax || sbThumb != nPage) {
-            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax+1);
+        if (sbMax != vertEnd || sbThumb != nPage) {
+            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, vertEnd+1);

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


@@ -272,8 +280,8 @@ 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+1, nPage);
+        if (sbMax != vertEnd || sbPage != nPage) {
+            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, vertEnd+1, nPage);

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


@@ -293,7 +301,7 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
         int sbThumb  = stc->GetScrollThumb(wxHORIZONTAL);
         int sbPos    = stc->GetScrollPos(wxHORIZONTAL);
         if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
         int sbThumb  = stc->GetScrollThumb(wxHORIZONTAL);
         int sbPos    = stc->GetScrollPos(wxHORIZONTAL);
         if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {

-            stc->SetScrollbar(wxHORIZONTAL, 0, pageWidth, horizEnd);
+            stc->SetScrollbar(wxHORIZONTAL, sbPos, pageWidth, horizEnd);

             modified = true;
             if (scrollWidth < pageWidth) {
                 HorizontalScrollTo(0);
             modified = true;
             if (scrollWidth < pageWidth) {
                 HorizontalScrollTo(0);


@@ -305,7 +313,7 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
         int sbThumb  = stc->m_hScrollBar->GetPageSize();
         int sbPos    = stc->m_hScrollBar->GetThumbPosition();
         if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
         int sbThumb  = stc->m_hScrollBar->GetPageSize();
         int sbPos    = stc->m_hScrollBar->GetThumbPosition();
         if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {

-            stc->m_hScrollBar->SetScrollbar(0, pageWidth, horizEnd, pageWidth);
+            stc->m_hScrollBar->SetScrollbar(sbPos, pageWidth, horizEnd, pageWidth);

             modified = true;
             if (scrollWidth < pageWidth) {
                 HorizontalScrollTo(0);
             modified = true;
             if (scrollWidth < pageWidth) {
                 HorizontalScrollTo(0);


@@ -327,17 +335,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() {
     if (currentPos != anchor) {
         SelectionText st;
         CopySelectionRange(&st);
 
 void ScintillaWX::Copy() {
     if (currentPos != anchor) {
         SelectionText st;
         CopySelectionRange(&st);

-        if (wxTheClipboard->Open()) {
-            wxTheClipboard->UsePrimarySelection(FALSE);
-            wxString text = stc2wx(st.s, st.len);
-            wxTheClipboard->SetData(new wxTextDataObject(text));
-            wxTheClipboard->Close();
-        }
+        CopyToClipboard(st);

     }
 }
 
     }
 }
 


@@ -367,18 +382,31 @@ void ScintillaWX::Paste() {
 }
 
 
 }
 
 

+void ScintillaWX::CopyToClipboard(const SelectionText& st) {
+    if (wxTheClipboard->Open()) {
+        wxTheClipboard->UsePrimarySelection(FALSE);
+        wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len));
+        wxTheClipboard->SetData(new wxTextDataObject(text));
+        wxTheClipboard->Close();
+    }
+}
+
+

 bool ScintillaWX::CanPaste() {
     bool canPaste = FALSE;
     bool didOpen;
 
 bool ScintillaWX::CanPaste() {
     bool canPaste = FALSE;
     bool didOpen;
 

-    if ( (didOpen = !wxTheClipboard->IsOpened()) )
-        wxTheClipboard->Open();
+    if (Editor::CanPaste()) {
+        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();
+        if (wxTheClipboard->IsOpened()) {
+            wxTheClipboard->UsePrimarySelection(FALSE);
+            canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
+            if (didOpen)
+                wxTheClipboard->Close();
+        }

     }
     return canPaste;
 }
     }
     return canPaste;
 }


@@ -395,7 +423,7 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
     if (!label[0])
         ((wxMenu*)popup.GetID())->AppendSeparator();
     else
     if (!label[0])
         ((wxMenu*)popup.GetID())->AppendSeparator();
     else

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

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


@@ -467,6 +495,11 @@ long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lPar
           break;
       }
 
           break;
       }
 

+#ifdef SCI_LEXER
+       case SCI_LOADLEXERLIBRARY:
+            LexerManager::GetInstance()->Load((const char*)lParam);
+            break;
+#endif

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


@@ -495,7 +528,7 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
     delete surfaceWindow;
     if (paintState == paintAbandoned) {
         // Painting area was insufficient to cover new styling or brace highlight positions
     delete surfaceWindow;
     if (paintState == paintAbandoned) {
         // Painting area was insufficient to cover new styling or brace highlight positions

-        FullPaint();
+        FullPaint(dc);

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


@@ -579,7 +612,7 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta,
 }
 
 
 }
 
 

-void ScintillaWX::DoSize(int width, int height) {
+void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(height)) {

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


@@ -587,11 +620,15 @@ void ScintillaWX::DoSize(int width, int height) {
 }
 
 void ScintillaWX::DoLoseFocus(){
 }
 
 void ScintillaWX::DoLoseFocus(){

+    focusEvent = true;

     SetFocusState(false);
     SetFocusState(false);

+    focusEvent = false;

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

+    focusEvent = true;

     SetFocusState(true);
     SetFocusState(true);

+    focusEvent = false;

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


@@ -610,8 +647,8 @@ void ScintillaWX::DoLeftButtonMove(Point pt) {
     ButtonMove(pt);
 }
 
     ButtonMove(pt);
 }
 

-void ScintillaWX::DoMiddleButtonUp(Point pt) {

 #ifdef __WXGTK__
 #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);
     // Set the current position to the mouse click point and
     // then paste in the PRIMARY selection, if any.  wxGTK only.
     int newPos = PositionFromLocation(pt);


@@ -638,8 +675,11 @@ void ScintillaWX::DoMiddleButtonUp(Point pt) {
 
     ShowCaretAtCurrentPosition();
     EnsureCaretVisible();
 
     ShowCaretAtCurrentPosition();
     EnsureCaretVisible();

-#endif

 }
 }

+#else
+void ScintillaWX::DoMiddleButtonUp(Point WXUNUSED(pt)) {
+}
+#endif

 
 
 void ScintillaWX::DoAddChar(int key) {
 
 
 void ScintillaWX::DoAddChar(int key) {


@@ -655,9 +695,14 @@ void ScintillaWX::DoAddChar(int key) {
 }
 
 
 }
 
 

-int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed) {
+#ifdef __WXMAC__
+int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool meta, bool* consumed) {
+#else
+int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNUSED(meta), bool* consumed) {
+#endif

 #if defined(__WXGTK__) || defined(__WXMAC__)
 #if defined(__WXGTK__) || defined(__WXMAC__)

-    // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK...
+    // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK
+    // TODO:  Check this, it shouldn't be true any longer.

     if (ctrl && key >= 1 && key <= 26)
         key += 'A' - 1;
 #endif
     if (ctrl && key >= 1 && key <= 26)
         key += 'A' - 1;
 #endif


@@ -691,6 +736,22 @@ int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* cons
     case WXK_MENU:              key = 0; break;
     }
 
     case WXK_MENU:              key = 0; break;
     }
 

+#ifdef __WXMAC__
+    if ( meta ) {
+        // 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);
 
     if (key)
     int rv = KeyDown(key, shift, ctrl, alt, consumed);
 
     if (key)


@@ -742,7 +803,7 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
 }
 
 
 }
 
 

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

     dragResult = def;
     return dragResult;
 }
     dragResult = def;
     return dragResult;
 }


@@ -772,18 +833,18 @@ void ScintillaWX::DoDragLeave() {
 //----------------------------------------------------------------------
 
 // Redraw all of text area. This paint will not be abandoned.
 //----------------------------------------------------------------------
 
 // Redraw all of text area. This paint will not be abandoned.

-void ScintillaWX::FullPaint() {
+void ScintillaWX::FullPaint(wxDC *dc) {
+    wxCHECK_RET(dc != NULL, wxT("Invalid wxDC in ScintillaWX::FillPaint"));

     paintState = painting;
     rcPaint = GetClientRectangle();
     paintingAllText = true;
     paintState = painting;
     rcPaint = GetClientRectangle();
     paintingAllText = true;

-    wxClientDC dc(stc);

     Surface* surfaceWindow = Surface::Allocate();
     Surface* surfaceWindow = Surface::Allocate();

-    surfaceWindow->Init(&dc, wMain.GetID());
+    surfaceWindow->Init(dc, wMain.GetID());

 
 

-    dc.BeginDrawing();
-    ClipChildren(dc, rcPaint);
+    dc->BeginDrawing();
+    ClipChildren(*dc, rcPaint);

     Paint(surfaceWindow, rcPaint);
     Paint(surfaceWindow, rcPaint);

-    dc.EndDrawing();
+    dc->EndDrawing();

 
     delete surfaceWindow;
     paintState = notPainting;
 
     delete surfaceWindow;
     paintState = notPainting;


@@ -799,8 +860,8 @@ void ScintillaWX::DoScrollToColumn(int column) {
     HorizontalScrollTo(column * vs.spaceWidth);
 }
 
     HorizontalScrollTo(column * vs.spaceWidth);
 }
 

-void ScintillaWX::ClipChildren(wxDC& dc, PRectangle rect) {

 #ifdef __WXGTK__
 #ifdef __WXGTK__

+void ScintillaWX::ClipChildren(wxDC& dc, PRectangle rect) {

     wxRegion rgn(wxRectFromPRectangle(rect));
     if (ac.Active()) {
         wxRect childRect = ((wxWindow*)ac.lb->GetID())->GetRect();
     wxRegion rgn(wxRectFromPRectangle(rect));
     if (ac.Active()) {
         wxRect childRect = ((wxWindow*)ac.lb->GetID())->GetRect();


@@ -812,9 +873,11 @@ void ScintillaWX::ClipChildren(wxDC& dc, PRectangle rect) {
     }
 
     dc.SetClippingRegion(rgn);
     }
 
     dc.SetClippingRegion(rgn);

-#endif

 }
 }

-
+#else
+void ScintillaWX::ClipChildren(wxDC& WXUNUSED(dc), PRectangle WXUNUSED(rect)) {
+}
+#endif

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