////////////////////////////////////////////////////////////////////////////
// Name: ScintillaWX.cxx
-// Purpose: A wxWindows implementation of Scintilla. A class derived
+// 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
// the wx world and the Scintilla world. It needs a peer
#endif
-#ifdef __WXGTK__
-#undef wxSTC_USE_POPUP
-#define wxSTC_USE_POPUP 0
-#endif
-
#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
#include <wx/popupwin.h>
#define wxSTCCallTipBase wxPopupWindow
#define param2 -1 // wxWindow's 2nd param is ID
#endif
+#include <wx/dcbuffer.h>
+
class wxSTCCallTip : public wxSTCCallTipBase {
public:
wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx)
: wxSTCCallTipBase(parent, param2),
- m_ct(ct), m_swx(swx)
+ m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)
{
}
~wxSTCCallTip() {
+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP && defined(__WXGTK__)
+ wxRect rect = GetRect();
+ rect.x = m_cx;
+ rect.y = m_cy;
+ GetParent()->Refresh(false, &rect);
+#endif
}
- bool AcceptsFocus() const { return FALSE; }
+ bool AcceptsFocus() const { return false; }
- void OnPaint(wxPaintEvent& evt) {
- wxPaintDC dc(this);
+ void OnPaint(wxPaintEvent& WXUNUSED(evt)) {
+ wxBufferedPaintDC dc(this);
Surface* surfaceWindow = Surface::Allocate();
surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
m_ct->PaintCT(surfaceWindow);
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO) {
- if (x != -1)
+ if (x != wxDefaultCoord) {
+ m_cx = x;
GetParent()->ClientToScreen(&x, NULL);
- if (y != -1)
+ }
+ if (y != wxDefaultCoord) {
+ m_cy = y;
GetParent()->ClientToScreen(NULL, &y);
+ }
wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
}
#endif
+ wxPoint GetMyPosition() {
+ return wxPoint(m_cx, m_cy);
+ }
+
private:
CallTip* m_ct;
ScintillaWX* m_swx;
+ int m_cx, m_cy;
DECLARE_EVENT_TABLE()
};
END_EVENT_TABLE()
+//----------------------------------------------------------------------
+
+static wxTextFileType wxConvertEOLMode(int scintillaMode)
+{
+ wxTextFileType type;
+
+ switch (scintillaMode) {
+ case wxSTC_EOL_CRLF:
+ type = wxTextFileType_Dos;
+ break;
+
+ case wxSTC_EOL_CR:
+ type = wxTextFileType_Mac;
+ break;
+
+ case wxSTC_EOL_LF:
+ type = wxTextFileType_Unix;
+ break;
+
+ default:
+ type = wxTextBuffer::typeDefault;
+ break;
+ }
+ return type;
+}
+
+
//----------------------------------------------------------------------
// Constructor/Destructor
ScintillaWX::~ScintillaWX() {
+ Finalise();
}
//----------------------------------------------------------------------
dropTarget->SetScintilla(this);
stc->SetDropTarget(dropTarget);
#endif
+#ifdef __WXMAC__
+ vs.extraFontFlag = false; // UseAntiAliasing
+#else
+ vs.extraFontFlag = true; // UseAntiAliasing
+#endif
}
wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId());
evt.SetEventObject(stc);
evt.SetDragText(dragText);
- evt.SetDragAllowMove(TRUE);
+ evt.SetDragAllowMove(true);
evt.SetPosition(wxMin(stc->GetSelectionStart(),
stc->GetSelectionEnd()));
stc->GetEventHandler()->ProcessEvent(evt);
wxDragResult result;
source.SetData(data);
- dropWentOutside = TRUE;
+ dropWentOutside = true;
result = source.DoDragDrop(evt.GetDragAllowMove());
if (result == wxDragMove && dropWentOutside)
ClearSelection();
- inDragDrop = FALSE;
+ inDragDrop = false;
SetDragPosition(invalidPosition);
}
#endif
bool ScintillaWX::SetIdle(bool on) {
if (idler.state != on) {
// connect or disconnect the EVT_IDLE handler
- if (on)
- stc->Connect(-1, wxEVT_IDLE, (wxObjectEventFunction)&wxStyledTextCtrl::OnIdle);
+ if (on)
+ stc->Connect(wxID_ANY, wxEVT_IDLE,
+ (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
else
- stc->Disconnect(-1, wxEVT_IDLE, (wxObjectEventFunction)&wxStyledTextCtrl::OnIdle);
+ stc->Disconnect(wxID_ANY, wxEVT_IDLE,
+ (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
idler.state = on;
}
return idler.state;
}
-
+
void ScintillaWX::SetTicking(bool on) {
wxSTCTimer* steTimer;
if (timer.ticking != on) {
ClearSelection();
wxTextDataObject data;
- bool gotData = FALSE;
+ bool gotData = false;
if (wxTheClipboard->Open()) {
- wxTheClipboard->UsePrimarySelection(FALSE);
+ wxTheClipboard->UsePrimarySelection(false);
gotData = wxTheClipboard->GetData(data);
wxTheClipboard->Close();
}
if (gotData) {
- wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
+ wxString text = wxTextBuffer::Translate(data.GetText(),
+ wxConvertEOLMode(pdoc->eolMode));
+ wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
int len = strlen(buf);
pdoc->InsertString(currentPos, buf, len);
SetEmptySelection(currentPos + len);
void ScintillaWX::CopyToClipboard(const SelectionText& st) {
if (wxTheClipboard->Open()) {
- wxTheClipboard->UsePrimarySelection(FALSE);
+ 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 canPaste = false;
bool didOpen;
if (Editor::CanPaste()) {
wxTheClipboard->Open();
if (wxTheClipboard->IsOpened()) {
- wxTheClipboard->UsePrimarySelection(FALSE);
+ wxTheClipboard->UsePrimarySelection(false);
canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
if (didOpen)
wxTheClipboard->Close();
SelectionText st;
CopySelectionRange(&st);
if (wxTheClipboard->Open()) {
- wxTheClipboard->UsePrimarySelection(TRUE);
+ wxTheClipboard->UsePrimarySelection(true);
wxString text = stc2wx(st.s, st.len);
wxTheClipboard->SetData(new wxTextDataObject(text));
- wxTheClipboard->UsePrimarySelection(FALSE);
+ wxTheClipboard->UsePrimarySelection(false);
wxTheClipboard->Close();
}
}
}
#ifdef SCI_LEXER
- case SCI_LOADLEXERLIBRARY:
+ case SCI_LOADLEXERLIBRARY:
LexerManager::GetInstance()->Load((const char*)lParam);
break;
#endif
dc->BeginDrawing();
ClipChildren(*dc, rcPaint);
Paint(surfaceWindow, rcPaint);
- dc->EndDrawing();
delete surfaceWindow;
if (paintState == paintAbandoned) {
- // Painting area was insufficient to cover new styling or brace highlight positions
- FullPaint(dc);
+ // Painting area was insufficient to cover new styling or brace
+ // highlight positions
+ FullPaint();
}
paintState = notPainting;
+ dc->EndDrawing();
}
void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(height)) {
-// PRectangle rcClient(0,0,width,height);
-// SetScrollBarsTo(rcClient);
-// DropGraphics();
ChangeSize();
}
pdoc->BeginUndoAction();
wxTextDataObject data;
- bool gotData = FALSE;
+ bool gotData = false;
if (wxTheClipboard->Open()) {
- wxTheClipboard->UsePrimarySelection(TRUE);
+ wxTheClipboard->UsePrimarySelection(true);
gotData = wxTheClipboard->GetData(data);
- wxTheClipboard->UsePrimarySelection(FALSE);
+ wxTheClipboard->UsePrimarySelection(false);
wxTheClipboard->Close();
}
if (gotData) {
- wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
+ wxString text = wxTextBuffer::Translate(data.GetText(),
+ wxConvertEOLMode(pdoc->eolMode));
+ wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
int len = strlen(buf);
pdoc->InsertString(currentPos, buf, len);
SetEmptySelection(currentPos + len);
}
}
#endif
-
+
int rv = KeyDown(key, shift, ctrl, alt, consumed);
if (key)
AutoCompleteCompleted();
}
-
+
void ScintillaWX::DoOnIdle(wxIdleEvent& evt) {
if ( Idle() )
else
SetIdle(false);
}
-
+
//----------------------------------------------------------------------
#if wxUSE_DRAG_AND_DROP
bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
SetDragPosition(invalidPosition);
+ wxString text = wxTextBuffer::Translate(data,
+ wxConvertEOLMode(pdoc->eolMode));
+
// Send an event to allow the drag details to be changed
wxStyledTextEvent evt(wxEVT_STC_DO_DROP, stc->GetId());
evt.SetEventObject(stc);
evt.SetX(x);
evt.SetY(y);
evt.SetPosition(PositionFromLocation(Point(x,y)));
- evt.SetDragText(data);
+ evt.SetDragText(text);
stc->GetEventHandler()->ProcessEvent(evt);
dragResult = evt.GetDragResult();
DropAt(evt.GetPosition(),
wx2stc(evt.GetDragText()),
dragResult == wxDragMove,
- FALSE); // TODO: rectangular?
- return TRUE;
+ false); // TODO: rectangular?
+ return true;
}
- return FALSE;
+ return false;
}
#endif
//----------------------------------------------------------------------
-// Redraw all of text area. This paint will not be abandoned.
-void ScintillaWX::FullPaint(wxDC *dc) {
- wxCHECK_RET(dc != NULL, wxT("Invalid wxDC in ScintillaWX::FillPaint"));
- paintState = painting;
- rcPaint = GetClientRectangle();
- paintingAllText = true;
- Surface* surfaceWindow = Surface::Allocate();
- surfaceWindow->Init(dc, wMain.GetID());
-
- dc->BeginDrawing();
- ClipChildren(*dc, rcPaint);
- Paint(surfaceWindow, rcPaint);
- dc->EndDrawing();
-
- delete surfaceWindow;
- paintState = notPainting;
+// Force the whole window to be repainted
+void ScintillaWX::FullPaint() {
+ stc->Refresh(false);
+ stc->Update();
}
rgn.Subtract(childRect);
}
if (ct.inCallTipMode) {
- wxRect childRect = ((wxWindow*)ct.wCallTip.GetID())->GetRect();
+ wxSTCCallTip* tip = (wxSTCCallTip*)ct.wCallTip.GetID();
+ wxRect childRect = tip->GetRect();
+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+ childRect.SetPosition(tip->GetMyPosition());
+#endif
rgn.Subtract(childRect);
}
}
#endif
+
+void ScintillaWX::SetUseAntiAliasing(bool useAA) {
+ vs.extraFontFlag = useAA;
+ InvalidateStyleRedraw();
+}
+
+bool ScintillaWX::GetUseAntiAliasing() {
+ return vs.extraFontFlag;
+}
+
//----------------------------------------------------------------------
//----------------------------------------------------------------------
projects / wxWidgets.git / blobdiff