// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#include <ctype.h>
#include "ScintillaWX.h"
#include "wx/stc/stc.h"
+#include "PlatWX.h"
//----------------------------------------------------------------------
#endif
-class wxSTCCallTip : public wxWindow {
+#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
+#define param2 -1 // wxWindows 2nd param is ID
+#endif
+
+class wxSTCCallTip : public wxSTCCallTipBase {
public:
- wxSTCCallTip(wxWindow* parent, int ID, CallTip* ct)
- : wxWindow(parent, ID)
+ wxSTCCallTip(wxWindow* parent, CallTip* ct)
+ : wxSTCCallTipBase(parent, param2)
{
m_ct = ct;
}
void OnPaint(wxPaintEvent& evt) {
wxPaintDC dc(this);
- Surface surfaceWindow;
- surfaceWindow.Init(&dc);
- m_ct->PaintCT(&surfaceWindow);
- surfaceWindow.Release();
+ Surface* surfaceWindow = Surface::Allocate();
+ surfaceWindow->Init(&dc);
+ m_ct->PaintCT(surfaceWindow);
+ delete surfaceWindow;
+ }
+
+ void OnFocus(wxFocusEvent& event) {
+ GetParent()->SetFocus();
+ event.Skip();
+ }
+
+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+ virtual void DoSetSize(int x, int y,
+ int width, int height,
+ int sizeFlags = wxSIZE_AUTO) {
+ if (x != -1)
+ GetParent()->ClientToScreen(&x, NULL);
+ if (y != -1)
+ GetParent()->ClientToScreen(NULL, &y);
+ wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
+ }
+
+ virtual bool Show( bool show = TRUE ) {
+ bool retval = wxSTCCallTipBase::Show(show);
+ if (show) {
+ CaptureMouse();
+ }
+ else {
+ if (HasCapture()) ReleaseMouse();
+ }
+ return retval;
}
+ void OnLeftDown(wxMouseEvent& ) {
+ Show(FALSE);
+ }
+#endif
+
+private:
CallTip* m_ct;
DECLARE_EVENT_TABLE()
};
-BEGIN_EVENT_TABLE(wxSTCCallTip, wxWindow)
+BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase)
EVT_PAINT(wxSTCCallTip::OnPaint)
+ EVT_SET_FOCUS(wxSTCCallTip::OnFocus)
+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+ EVT_LEFT_DOWN(wxSTCCallTip::OnLeftDown)
+#endif
END_EVENT_TABLE()
+
//----------------------------------------------------------------------
// Constructor/Destructor
void ScintillaWX::StartDrag() {
#if wxUSE_DRAG_AND_DROP
- wxString dragText(drag.s, 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());
if (timer.ticking) {
steTimer = new wxSTCTimer(this);
steTimer->Start(timer.tickSize);
- timer.tickerID = (int)steTimer;
+ timer.tickerID = steTimer;
} else {
steTimer = (wxSTCTimer*)timer.tickerID;
steTimer->Stop();
SelectionText st;
CopySelectionRange(&st);
wxTheClipboard->Open();
- wxTheClipboard->SetData(new wxTextDataObject(wxString(st.s, st.len)));
+ wxTheClipboard->UsePrimarySelection();
+ wxString text = stc2wx(st.s, st.len);
+ wxTheClipboard->SetData(new wxTextDataObject(text));
wxTheClipboard->Close();
}
}
bool gotData;
wxTheClipboard->Open();
+ wxTheClipboard->UsePrimarySelection();
gotData = wxTheClipboard->GetData(data);
wxTheClipboard->Close();
if (gotData) {
- wxString str = data.GetText();
- int len = str.Length();
- pdoc->InsertString(currentPos, str.c_str(), len);
+ wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
+ int len = strlen(buf);
+ pdoc->InsertString(currentPos, buf, len);
SetEmptySelection(currentPos + len);
}
bool canPaste;
wxTheClipboard->Open();
- canPaste = wxTheClipboard->IsSupported( wxDF_TEXT );
+ wxTheClipboard->UsePrimarySelection();
+ canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
wxTheClipboard->Close();
return canPaste;
}
void ScintillaWX::CreateCallTipWindow(PRectangle) {
- ct.wCallTip = new wxSTCCallTip(stc, -1, &ct);
+ ct.wCallTip = new wxSTCCallTip(stc, &ct);
ct.wDraw = ct.wCallTip;
}
void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
if (!label[0])
- popup.GetID()->AppendSeparator();
+ ((wxMenu*)popup.GetID())->AppendSeparator();
else
- popup.GetID()->Append(cmd, label);
+ ((wxMenu*)popup.GetID())->Append(cmd, stc2wx(label));
if (!enabled)
- popup.GetID()->Enable(cmd, enabled);
+ ((wxMenu*)popup.GetID())->Enable(cmd, enabled);
}
void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
paintState = painting;
- Surface surfaceWindow;
- surfaceWindow.Init(dc);
+ Surface* surfaceWindow = Surface::Allocate();
+ surfaceWindow->Init(dc);
PRectangle rcPaint = PRectangleFromwxRect(rect);
dc->BeginDrawing();
- Paint(&surfaceWindow, rcPaint);
+ Paint(surfaceWindow, rcPaint);
dc->EndDrawing();
- surfaceWindow.Release();
+ delete surfaceWindow;
if (paintState == paintAbandoned) {
// Painting area was insufficient to cover new styling or brace highlight positions
FullPaint();
void ScintillaWX::DoSize(int width, int height) {
- PRectangle rcClient(0,0,width,height);
- SetScrollBarsTo(rcClient);
- DropGraphics();
+// PRectangle rcClient(0,0,width,height);
+// SetScrollBarsTo(rcClient);
+// DropGraphics();
+ ChangeSize();
}
void ScintillaWX::DoLoseFocus(){
}
-void ScintillaWX::DoAddChar(char ch) {
- AddChar(ch);
+void ScintillaWX::DoAddChar(int key) {
+ AddChar(key);
}
int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed) {
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMAC__)
// 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;
+ 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: // 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;
}
int rv = KeyDown(key, shift, ctrl, alt, consumed);
dragResult = evt.GetDragResult();
if (dragResult == wxDragMove || dragResult == wxDragCopy) {
DropAt(evt.GetPosition(),
- evt.GetDragText(),
+ wx2stc(evt.GetDragText()),
dragResult == wxDragMove,
FALSE); // TODO: rectangular?
return TRUE;
rcPaint = GetTextRectangle();
paintingAllText = true;
wxClientDC dc(stc);
- Surface surfaceWindow;
- surfaceWindow.Init(&dc);
- Paint(&surfaceWindow, rcPaint);
- surfaceWindow.Release();
+ Surface* surfaceWindow = Surface::Allocate();
+ surfaceWindow->Init(&dc);
+ Paint(surfaceWindow, rcPaint);
+ delete surfaceWindow;
// stc->Refresh(FALSE);
projects / wxWidgets.git / blobdiff