// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
+#include <ctype.h>
+
#include "ScintillaWX.h"
#include "wx/stc/stc.h"
}
+class wxSTCCallTip : public wxWindow {
+public:
+ wxSTCCallTip(wxWindow* parent, int ID, CallTip* ct)
+ : wxWindow(parent, ID)
+ {
+ m_ct = ct;
+ }
+
+ void OnPaint(wxPaintEvent& evt) {
+ wxPaintDC dc(this);
+ Surface surfaceWindow;
+ surfaceWindow.Init(&dc);
+ m_ct->PaintCT(&surfaceWindow);
+ surfaceWindow.Release();
+ }
+
+ CallTip* m_ct;
+ DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxSTCCallTip, wxWindow)
+ EVT_PAINT(wxSTCCallTip::OnPaint)
+END_EVENT_TABLE()
//----------------------------------------------------------------------
// Constructor/Destructor
ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
capturedMouse = false;
wMain = win;
- wDraw = win;
stc = win;
+ wheelRotation = 0;
Initialise();
}
void ScintillaWX::StartDrag() {
- wxDropSource source;
+ wxDropSource source(wMain.GetID());
wxTextDataObject data(dragChars);
wxDragResult result;
void ScintillaWX::SetMouseCapture(bool on) {
- if (on)
+ if (on && !capturedMouse)
wMain.GetID()->CaptureMouse();
- else
+ else if (!on && capturedMouse)
wMain.GetID()->ReleaseMouse();
capturedMouse = on;
}
void ScintillaWX::ScrollText(int linesToMove) {
int dy = vs.lineHeight * (linesToMove);
- // TODO: calculate the rectangle to refreshed...
wMain.GetID()->ScrollWindow(0, dy);
+ wMain.GetID()->Update();
}
void ScintillaWX::SetVerticalScrollPos() {
void ScintillaWX::Copy() {
if (currentPos != anchor) {
char* text = CopySelectionRange();
- textDO.SetText(text);
wxTheClipboard->Open();
- wxTheClipboard->SetData(&textDO);
+ wxTheClipboard->SetData(new wxTextDataObject(text));
wxTheClipboard->Close();
}
}
}
void ScintillaWX::CreateCallTipWindow(PRectangle) {
- ct.wCallTip = new wxWindow(wDraw.GetID(), -1);
+ ct.wCallTip = new wxSTCCallTip(wMain.GetID(), -1, &ct);
ct.wDraw = ct.wCallTip;
}
if (!enabled)
popup.GetID()->Enable(cmd, enabled);
-
- // TODO: need to create event handler mappings for the cmd ID
}
}
-LRESULT ScintillaWX::DefWndProc(UINT /*iMessage*/, WPARAM /*wParam*/, LPARAM /*lParam*/) {
+long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) {
return 0;
}
-LRESULT ScintillaWX::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
- switch (iMessage) {
- case EM_CANPASTE:
- return CanPaste();
- default:
+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;
+// }
+// return 0;
}
FullPaint();
}
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;
- switch (type) {
- case wxEVT_SCROLLWIN_LINEUP:
+ if (type == wxEVT_SCROLLWIN_LINEUP)
xPos -= H_SCROLL_STEP;
- break;
- case wxEVT_SCROLLWIN_LINEDOWN:
+ else if (type == wxEVT_SCROLLWIN_LINEDOWN)
xPos += H_SCROLL_STEP;
- break;
- case wxEVT_SCROLLWIN_PAGEUP:
+ else if (type == wxEVT_SCROLLWIN_PAGEUP)
xPos -= H_SCROLL_PAGE;
- break;
- case wxEVT_SCROLLWIN_PAGEDOWN:
+ else if (type == wxEVT_SCROLLWIN_PAGEDOWN)
xPos += H_SCROLL_PAGE;
- break;
- case wxEVT_SCROLLWIN_TOP:
+ else if (type == wxEVT_SCROLLWIN_TOP)
xPos = 0;
- break;
- case wxEVT_SCROLLWIN_BOTTOM:
+ else if (type == wxEVT_SCROLLWIN_BOTTOM)
xPos = H_SCROLL_MAX;
- break;
- case wxEVT_SCROLLWIN_THUMBTRACK:
+ else if (type == wxEVT_SCROLLWIN_THUMBTRACK)
xPos = pos;
- break;
- }
+
HorizontalScrollTo(xPos);
}
void ScintillaWX::DoVScroll(int type, int pos) {
int topLineNew = topLine;
- switch (type) {
- case wxEVT_SCROLLWIN_LINEUP:
+ if (type == wxEVT_SCROLLWIN_LINEUP)
topLineNew -= 1;
- break;
- case wxEVT_SCROLLWIN_LINEDOWN:
+ else if (type == wxEVT_SCROLLWIN_LINEDOWN)
topLineNew += 1;
- break;
- case wxEVT_SCROLLWIN_PAGEUP:
+ else if (type == wxEVT_SCROLLWIN_PAGEUP)
topLineNew -= LinesToScroll();
- break;
- case wxEVT_SCROLLWIN_PAGEDOWN:
+ else if (type == wxEVT_SCROLLWIN_PAGEDOWN)
topLineNew += LinesToScroll();
- break;
- case wxEVT_SCROLLWIN_TOP:
+ else if (type == wxEVT_SCROLLWIN_TOP)
topLineNew = 0;
- break;
- case wxEVT_SCROLLWIN_BOTTOM:
+ else if (type == wxEVT_SCROLLWIN_BOTTOM)
topLineNew = MaxScrollPos();
- break;
- case wxEVT_SCROLLWIN_THUMBTRACK:
+ else if (type == wxEVT_SCROLLWIN_THUMBTRACK)
topLineNew = pos;
- break;
- }
+
ScrollTo(topLineNew);
}
+
+void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown) {
+ int topLineNew = topLine;
+ int lines;
+
+ if (ctrlDown) { // Zoom the fonts if Ctrl key down
+ if (rotation < 0) {
+ KeyCommand(SCI_ZOOMIN);
+ }
+ else {
+ KeyCommand(SCI_ZOOMOUT);
+ }
+ }
+ else { // otherwise just scroll the window
+ wheelRotation += rotation;
+ lines = wheelRotation / delta;
+ wheelRotation -= lines * delta;
+ if (lines != 0) {
+ lines *= linesPerAction;
+ topLineNew -= lines;
+ ScrollTo(topLineNew);
+ }
+ }
+}
+
+
void ScintillaWX::DoSize(int width, int height) {
PRectangle rcClient(0,0,width,height);
SetScrollBarsTo(rcClient);
}
void ScintillaWX::DoLoseFocus(){
- DropCaret();
+ SetFocusState(false);
}
void ScintillaWX::DoGainFocus(){
- ShowCaretAtCurrentPosition();
+ SetFocusState(true);
}
void ScintillaWX::DoSysColourChange() {
void ScintillaWX::DoAddChar(char ch) {
+ //bool acActiveBeforeCharAdded = ac.Active();
AddChar(ch);
-}
+ //if (acActiveBeforeCharAdded)
+ // AutoCompleteChanged(ch);
+}
+
+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...
+ 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;
+ }
-int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt) {
- return KeyDown(key, shift, ctrl, alt);
+ int rv = KeyDown(key, shift, ctrl, alt, consumed);
+ if (key)
+ return rv;
+ else
+ return 1;
}
ContextMenu(pt);
}
+void ScintillaWX::DoOnListBox() {
+ AutoCompleteCompleted();
+}
//----------------------------------------------------------------------
void ScintillaWX::FullPaint() {
paintState = painting;
rcPaint = GetTextRectangle();
+ paintingAllText = true;
wxClientDC dc(wMain.GetID());
Surface surfaceWindow;
surfaceWindow.Init(&dc);
Paint(&surfaceWindow, rcPaint);
surfaceWindow.Release();
+
+// wMain.GetID()->Refresh(FALSE);
+
paintState = notPainting;
}
projects / wxWidgets.git / blobdiff