showing a bevel button for a multiline label (is not multline on the OS level, but...

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

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 6cf99b341221b55d47308b66bfc274084c94abb6..9b9addb843e4baad3dd583d6e6dd1a9153fca1bb 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -16,15 +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"

-
-
-//----------------------------------------------------------------------
-
-const int H_SCROLL_MAX  = 4000;
-const int H_SCROLL_STEP = 20;
-const int H_SCROLL_PAGE = 200;
+#include <wx/textbuf.h>

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


@@ -63,32 +58,50 @@ void  wxSTCDropTarget::OnLeave() {
 #endif
 
 
 #endif
 
 

-#if wxUSE_POPUPWIN
+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP

 #include <wx/popupwin.h>
 #define wxSTCCallTipBase wxPopupWindow
 #define param2  wxBORDER_NONE  // popup's 2nd param is flags
 #else
 #define wxSTCCallTipBase wxWindow
 #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
+#define param2 -1 // wxWindow's 2nd param is ID

 #endif
 
 class wxSTCCallTip : public wxSTCCallTipBase {
 public:
 #endif
 
 class wxSTCCallTip : public wxSTCCallTipBase {
 public:

-    wxSTCCallTip(wxWindow* parent, CallTip* ct)
-        : wxSTCCallTipBase(parent, param2)
+    wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx)
+        : wxSTCCallTipBase(parent, param2),
+          m_ct(ct), m_swx(swx)

         {
         {

-            m_ct = ct;

         }
 
         }
 

-    void OnPaint(wxPaintEvent& evt) {
+    ~wxSTCCallTip() {
+    }
+
+    bool AcceptsFocus() const { return FALSE; }
+
+    void OnPaint(wxPaintEvent& WXUNUSED(evt)) {

         wxPaintDC dc(this);
         Surface* surfaceWindow = Surface::Allocate();
         wxPaintDC dc(this);
         Surface* surfaceWindow = Surface::Allocate();

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

         m_ct->PaintCT(surfaceWindow);
         m_ct->PaintCT(surfaceWindow);

+        surfaceWindow->Release();

         delete surfaceWindow;
     }
 
         delete surfaceWindow;
     }
 

-#if wxUSE_POPUPWIN
+    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 && wxSTC_USE_POPUP

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO) {
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO) {


@@ -101,12 +114,15 @@ public:
 #endif
 
 private:
 #endif
 
 private:

-    CallTip*    m_ct;
+    CallTip*      m_ct;
+    ScintillaWX*  m_swx;

     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()
 
 


@@ -116,6 +132,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;


@@ -124,7 +141,7 @@ ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
 
 
 ScintillaWX::~ScintillaWX() {
 
 
 ScintillaWX::~ScintillaWX() {

-    SetTicking(false);
+    Finalise();

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


@@ -138,17 +155,24 @@ void ScintillaWX::Initialise() {
     dropTarget->SetScintilla(this);
     stc->SetDropTarget(dropTarget);
 #endif
     dropTarget->SetScintilla(this);
     stc->SetDropTarget(dropTarget);
 #endif

+#ifdef __WXMAC__
+    vs.extraFontFlag = false;  // UseAntiAliasing
+#else
+    vs.extraFontFlag = true;   // UseAntiAliasing
+#endif

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

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

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

-    wxString dragText(drag.s, wxConvUTF8, 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());
 
     // Send an event to allow the drag text to be changed
     wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId());


@@ -177,6 +201,21 @@ void ScintillaWX::StartDrag() {
 }
 
 
 }
 
 

+bool ScintillaWX::SetIdle(bool on) {
+    if (idler.state != on) {
+        // connect or disconnect the EVT_IDLE handler
+        if (on) 
+            stc->Connect(-1, wxEVT_IDLE,
+                         (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
+        else
+            stc->Disconnect(-1, wxEVT_IDLE,
+                            (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
+        idler.state = on;
+    }
+    return idler.state;
+}
+
+    

 void ScintillaWX::SetTicking(bool on) {
     wxSTCTimer* steTimer;
     if (timer.ticking != on) {
 void ScintillaWX::SetTicking(bool on) {
     wxSTCTimer* steTimer;
     if (timer.ticking != on) {


@@ -197,11 +236,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 +276,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 +299,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,15 +354,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);

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

     }
 }
 
     }
 }
 


@@ -308,13 +381,15 @@ void ScintillaWX::Paste() {
     ClearSelection();
 
     wxTextDataObject data;
     ClearSelection();
 
     wxTextDataObject data;

-    bool gotData;
+    bool gotData = FALSE;

 
 

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

     if (gotData) {
     if (gotData) {

-        wxWX2MBbuf buf = (wxWX2MBbuf)data.GetText().mb_str(wxConvUTF8);
+        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());

         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);


@@ -326,19 +401,40 @@ void ScintillaWX::Paste() {
 }
 
 
 }
 
 

-bool ScintillaWX::CanPaste() {
-    bool canPaste;
+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();
+    }
+}

 
 

-    wxTheClipboard->Open();
-    canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
-    wxTheClipboard->Close();

 
 

+bool ScintillaWX::CanPaste() {
+    bool canPaste = FALSE;
+    bool didOpen;
+
+    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();
+        }
+    }

     return canPaste;
 }
 
 void ScintillaWX::CreateCallTipWindow(PRectangle) {
     return canPaste;
 }
 
 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;
+    }

 }
 
 
 }
 
 


@@ -346,15 +442,35 @@ 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, wxString(label, *wxConvCurrent));
+        ((wxMenu*)popup.GetID())->Append(cmd, wxGetTranslation(stc2wx(label)));

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

+// This is called by the Editor base class whenever something is selected

 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);
+        if (wxTheClipboard->Open()) {
+            wxTheClipboard->UsePrimarySelection(TRUE);
+            wxString text = stc2wx(st.s, st.len);
+            wxTheClipboard->SetData(new wxTextDataObject(text));
+            wxTheClipboard->UsePrimarySelection(FALSE);
+            wxTheClipboard->Close();
+        }
+    }
+#endif
+#endif

 }
 
 
 }
 
 


@@ -363,13 +479,50 @@ long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/
 }
 
 long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) {
 }
 
 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;
+      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;
+          PRectangle rc = ct.CallTipStart(currentPos, pt,
+                                          defn,
+                                          vs.styles[STYLE_DEFAULT].fontName,
+                                          vs.styles[STYLE_DEFAULT].sizeZoomed,
+                                          IsUnicodeMode(),
+                                          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;

 }
 
 
 }
 
 


@@ -381,39 +534,45 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
 
     paintState = painting;
     Surface* surfaceWindow = Surface::Allocate();
 
     paintState = painting;
     Surface* surfaceWindow = Surface::Allocate();

-    surfaceWindow->Init(dc);
-    PRectangle rcPaint = PRectangleFromwxRect(rect);
+    surfaceWindow->Init(dc, wMain.GetID());
+    rcPaint = PRectangleFromwxRect(rect);
+    PRectangle rcClient = GetClientRectangle();
+    paintingAllText = rcPaint.Contains(rcClient);
+

     dc->BeginDrawing();
     dc->BeginDrawing();

+    ClipChildren(*dc, rcPaint);

     Paint(surfaceWindow, rcPaint);
     dc->EndDrawing();
     Paint(surfaceWindow, rcPaint);
     dc->EndDrawing();

+

     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;

-#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;
 


@@ -440,8 +599,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;
 


@@ -454,11 +614,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);
         }


@@ -466,7 +631,7 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int
 }
 
 
 }
 
 

-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();


@@ -474,71 +639,138 @@ 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() {
     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, noSel, true);
+
+    pdoc->BeginUndoAction();
+    wxTextDataObject data;
+    bool gotData = FALSE;
+    if (wxTheClipboard->Open()) {
+        wxTheClipboard->UsePrimarySelection(TRUE);
+        gotData = wxTheClipboard->GetData(data);
+        wxTheClipboard->UsePrimarySelection(FALSE);
+        wxTheClipboard->Close();
+    }
+    if (gotData) {
+        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
+        int        len = strlen(buf);
+        pdoc->InsertString(currentPos, buf, len);
+        SetEmptySelection(currentPos + len);
+    }
+    pdoc->EndUndoAction();
+    NotifyChange();
+    Redraw();
+
+    ShowCaretAtCurrentPosition();
+    EnsureCaretVisible();
+}
+#else
+void ScintillaWX::DoMiddleButtonUp(Point WXUNUSED(pt)) {
+}
+#endif
+

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

+#if wxUSE_UNICODE
+    wxChar wszChars[2];
+    wszChars[0] = key;
+    wszChars[1] = 0;
+    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(wszChars);
+    AddCharUTF((char*)buf.data(), strlen(buf));
+#else

     AddChar(key);
     AddChar(key);

+#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...
+
+#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__)
+    // 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
 
     switch (key) {
     if (ctrl && key >= 1 && key <= 26)
         key += 'A' - 1;
 #endif
 
     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:            // fall through
+    case WXK_PRIOR:             key = SCK_PRIOR;    break;
+    case WXK_PAGEDOWN:          // fall through
+    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:               // 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 ( 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)


@@ -554,13 +786,23 @@ 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
 //----------------------------------------------------------------------
 
 #if wxUSE_DRAG_AND_DROP


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

-               evt.GetDragText().mb_str(wxConvUTF8),
+               wx2stc(evt.GetDragText()),

                dragResult == wxDragMove,
                FALSE); // TODO: rectangular?
         return TRUE;
                dragResult == wxDragMove,
                FALSE); // TODO: rectangular?
         return TRUE;


@@ -589,7 +831,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;
 }


@@ -619,18 +861,20 @@ 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;
     paintState = painting;

-    rcPaint = GetTextRectangle();
+    rcPaint = GetClientRectangle();

     paintingAllText = true;
     paintingAllText = true;

-    wxClientDC dc(stc);

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

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

 
 

-//     stc->Refresh(FALSE);
+    dc->BeginDrawing();
+    ClipChildren(*dc, rcPaint);
+    Paint(surfaceWindow, rcPaint);
+    dc->EndDrawing();

 
 

+    delete surfaceWindow;

     paintState = notPainting;
 }
 
     paintState = notPainting;
 }
 


@@ -644,7 +888,34 @@ 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) {
+        wxRect childRect = ((wxWindow*)ct.wCallTip.GetID())->GetRect();
+        rgn.Subtract(childRect);
+    }
+
+    dc.SetClippingRegion(rgn);
+}
+#else
+void ScintillaWX::ClipChildren(wxDC& WXUNUSED(dc), PRectangle WXUNUSED(rect)) {
+}
+#endif
+

 
 

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

 
 

+bool ScintillaWX::GetUseAntiAliasing() {
+    return vs.extraFontFlag;
+}
+ 

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