// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#include "wx/wx.h"
+// 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 "ScintillaWX.h"
#include "ExternalLexer.h"
#include "wx/stc/stc.h"
+#include "wx/stc/private.h"
#include "PlatWX.h"
#ifdef __WXMSW__
class wxSTCTimer : public wxTimer {
public:
wxSTCTimer(ScintillaWX* swx) {
- this->swx = swx;
+ m_swx = swx;
}
void Notify() {
- swx->DoTick();
+ m_swx->DoTick();
}
private:
- ScintillaWX* swx;
+ ScintillaWX* m_swx;
};
#if wxUSE_DRAG_AND_DROP
-class wxStartDragTimer : public wxTimer {
-public:
- wxStartDragTimer(ScintillaWX* swx) {
- this->swx = swx;
- }
-
- void Notify() {
- swx->DoStartDrag();
- }
-
-private:
- ScintillaWX* swx;
-};
-
-
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) {
- return swx->DoDragEnter(x, y, def);
+ return m_swx->DoDragEnter(x, y, 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() {
- swx->DoDragLeave();
+ m_swx->DoDragLeave();
}
-#endif
+#endif // wxUSE_DRAG_AND_DROP
-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
-#include <wx/popupwin.h>
+#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 // wxWindow's 2nd param is ID
+#include "wx/frame.h"
+#define wxSTCCallTipBase wxFrame
#endif
-#include <wx/dcbuffer.h>
+#include "wx/dcbuffer.h"
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
+ 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)
{
+ SetBackgroundStyle(wxBG_STYLE_CUSTOM);
}
~wxSTCCallTip() {
-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP && defined(__WXGTK__)
+#if wxUSE_POPUPWIN && defined(__WXGTK__)
wxRect rect = GetRect();
rect.x = m_cx;
rect.y = m_cy;
bool AcceptsFocus() const { return false; }
- void OnPaint(wxPaintEvent& WXUNUSED(evt)) {
- wxBufferedPaintDC dc(this);
+ void OnPaint(wxPaintEvent& WXUNUSED(evt))
+ {
+ wxAutoBufferedPaintDC dc(this);
Surface* surfaceWindow = Surface::Allocate();
surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
m_ct->PaintCT(surfaceWindow);
delete surfaceWindow;
}
- void OnFocus(wxFocusEvent& event) {
+ void OnFocus(wxFocusEvent& event)
+ {
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();
}
-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
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);
}
wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
}
+
+#if wxUSE_POPUPWIN
+#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() {
+ wxPoint GetMyPosition()
+ {
return wxPoint(m_cx, m_cy);
}
sysCaretWidth = 0;
sysCaretHeight = 0;
#endif
-#if wxUSE_DRAG_AND_DROP
- startDragTimer = new wxStartDragTimer(this);
-#endif
}
ScintillaWX::~ScintillaWX() {
- delete startDragTimer;
- Finalise();
+ Finalise();
}
//----------------------------------------------------------------------
dropTarget = new wxSTCDropTarget;
dropTarget->SetScintilla(this);
stc->SetDropTarget(dropTarget);
-#endif
-#ifdef __WXMAC__
- vs.extraFontFlag = false; // UseAntiAliasing
-#else
+#endif // wxUSE_DRAG_AND_DROP
vs.extraFontFlag = true; // UseAntiAliasing
-#endif
}
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(100, true);
-#endif
-}
-
-void ScintillaWX::DoStartDrag() {
wxString dragText = stc2wx(drag.s, drag.len);
// Send an event to allow the drag text to be changed
stc->GetEventHandler()->ProcessEvent(evt);
dragText = evt.GetDragText();
- if (dragText.Length()) {
+ if (dragText.length()) {
wxDropSource source(stc);
wxTextDataObject data(dragText);
wxDragResult result;
source.SetData(data);
dropWentOutside = true;
+ inDragDrop = ddDragging;
result = source.DoDragDrop(evt.GetDragAllowMove());
if (result == wxDragMove && dropWentOutside)
ClearSelection();
- inDragDrop = false;
+ inDragDrop = ddNone;
SetDragPosition(invalidPosition);
}
+#endif // wxUSE_DRAG_AND_DROP
}
if (idler.state != on) {
// connect or disconnect the EVT_IDLE handler
if (on)
- stc->Connect(wxID_ANY, wxEVT_IDLE,
- (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
+ stc->Connect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(wxStyledTextCtrl::OnIdle));
else
- stc->Disconnect(wxID_ANY, wxEVT_IDLE,
- (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
+ stc->Disconnect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(wxStyledTextCtrl::OnIdle));
idler.state = on;
}
return idler.state;
wxTextDataObject data;
bool gotData = false;
+ wxTheClipboard->UsePrimarySelection(false);
if (wxTheClipboard->Open()) {
- wxTheClipboard->UsePrimarySelection(false);
gotData = wxTheClipboard->GetData(data);
wxTheClipboard->Close();
}
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);
}
void ScintillaWX::CopyToClipboard(const SelectionText& st) {
#if wxUSE_CLIPBOARD
+ if ( !st.len )
+ return;
+
+ wxTheClipboard->UsePrimarySelection(false);
if (wxTheClipboard->Open()) {
- wxTheClipboard->UsePrimarySelection(false);
wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len-1));
wxTheClipboard->SetData(new wxTextDataObject(text));
wxTheClipboard->Close();
bool didOpen;
if (Editor::CanPaste()) {
+ wxTheClipboard->UsePrimarySelection(false);
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();
}
-// 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() {
-#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);
+ wxTheClipboard->UsePrimarySelection(true);
if (wxTheClipboard->Open()) {
- wxTheClipboard->UsePrimarySelection(true);
wxString text = stc2wx(st.s, st.len);
wxTheClipboard->SetData(new wxTextDataObject(text));
- wxTheClipboard->UsePrimarySelection(false);
wxTheClipboard->Close();
}
+ wxTheClipboard->UsePrimarySelection(false);
}
#endif
-#endif
}
bool ScintillaWX::HasCaretSizeChanged() {
#ifdef __WXMSW__
- if (( (0 != vs.caretWidth) && (sysCaretWidth != vs.caretWidth) )
- || (0 != vs.lineHeight) && (sysCaretHeight != vs.lineHeight)) {
+ if ( (vs.caretWidth && (sysCaretWidth != vs.caretWidth))
+ || (vs.lineHeight && (sysCaretHeight != vs.lineHeight)) ) {
return true;
}
#endif
//----------------------------------------------------------------------
-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;
}
-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
char* defn = reinterpret_cast<char *>(lParam);
AutoCompleteCancel();
pt.y += vs.lineHeight;
+ int ctStyle = ct.UseStyleCallTip() ? STYLE_CALLTIP : STYLE_DEFAULT;
+ if (ct.UseStyleCallTip())
+ {
+ ct.SetForeBack(vs.styles[STYLE_CALLTIP].fore, vs.styles[STYLE_CALLTIP].back);
+ }
PRectangle rc = ct.CallTipStart(currentPos, pt,
defn,
- vs.styles[STYLE_DEFAULT].fontName,
- vs.styles[STYLE_DEFAULT].sizeZoomed,
+ vs.styles[ctStyle].fontName,
+ vs.styles[ctStyle].sizeZoomed,
CodePage(),
- vs.styles[STYLE_DEFAULT].characterSet,
+ vs.styles[ctStyle].characterSet,
wMain);
// If the call-tip window would be out of the client
// space, adjust so it displays above the text.
}
void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) {
-#if wxUSE_DRAG_AND_DROP
- if (startDragTimer->IsRunning()) {
- startDragTimer->Stop();
- SetEmptySelection(PositionFromLocation(pt));
- }
-#endif
ButtonUp(pt, curTime, ctrl);
}
pdoc->BeginUndoAction();
wxTextDataObject data;
bool gotData = false;
+ wxTheClipboard->UsePrimarySelection(true);
if (wxTheClipboard->Open()) {
- wxTheClipboard->UsePrimarySelection(true);
gotData = wxTheClipboard->GetData(data);
- wxTheClipboard->UsePrimarySelection(false);
wxTheClipboard->Close();
}
+ wxTheClipboard->UsePrimarySelection(false);
if (gotData) {
wxString text = wxTextBuffer::Translate(data.GetText(),
wxConvertEOLMode(pdoc->eolMode));
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;
void ScintillaWX::DoDragLeave() {
SetDragPosition(invalidPosition);
}
-#endif
+#endif // wxUSE_DRAG_AND_DROP
//----------------------------------------------------------------------
// Force the whole window to be repainted
// if (ct.inCallTipMode) {
// wxSTCCallTip* tip = (wxSTCCallTip*)ct.wCallTip.GetID();
// wxRect childRect = tip->GetRect();
-// #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+// #if wxUSE_POPUPWIN
// childRect.SetPosition(tip->GetMyPosition());
// #endif
// rgn.Subtract(childRect);
//----------------------------------------------------------------------
//----------------------------------------------------------------------
+
+#endif // wxUSE_STC
projects / wxWidgets.git / blobdiff