const wxChar* wxSTCNameStr = wxT("stcwindow");
+#ifdef MAKELONG
+#undef MAKELONG
+#endif
+
+#define MAKELONG(a, b) ((a) | ((b) << 16))
+
+
+static long wxColourAsLong(const wxColour& co) {
+ return (((long)co.Blue() << 16) |
+ ((long)co.Green() << 8) |
+ ((long)co.Red()));
+}
+
+static wxColour wxColourFromLong(long c) {
+ wxColour clr;
+ clr.Set(c & 0xff, (c >> 8) & 0xff, (c >> 16) & 0xff);
+ return clr;
+}
+
+
+static wxColour wxColourFromSpec(const wxString& spec) {
+ // spec should be "#RRGGBB"
+ long red, green, blue;
+ red = green = blue = 0;
+ spec.Mid(1,2).ToLong(&red, 16);
+ spec.Mid(3,2).ToLong(&green, 16);
+ spec.Mid(5,2).ToLong(&blue, 16);
+ return wxColour(red, green, blue);
+}
+
+//----------------------------------------------------------------------
+
DEFINE_EVENT_TYPE( wxEVT_STC_CHANGE )
DEFINE_EVENT_TYPE( wxEVT_STC_STYLENEEDED )
DEFINE_EVENT_TYPE( wxEVT_STC_CHARADDED )
EVT_SCROLL (wxStyledTextCtrl::OnScroll)
EVT_SIZE (wxStyledTextCtrl::OnSize)
EVT_LEFT_DOWN (wxStyledTextCtrl::OnMouseLeftDown)
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)
// Let Scintilla see the double click as a second click
EVT_LEFT_DCLICK (wxStyledTextCtrl::OnMouseLeftDown)
#endif
EVT_MOTION (wxStyledTextCtrl::OnMouseMove)
EVT_LEFT_UP (wxStyledTextCtrl::OnMouseLeftUp)
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMAC__)
EVT_RIGHT_UP (wxStyledTextCtrl::OnMouseRightUp)
#else
EVT_CONTEXT_MENU (wxStyledTextCtrl::OnContextMenu)
EVT_SET_FOCUS (wxStyledTextCtrl::OnGainFocus)
EVT_SYS_COLOUR_CHANGED (wxStyledTextCtrl::OnSysColourChanged)
EVT_ERASE_BACKGROUND (wxStyledTextCtrl::OnEraseBackground)
- EVT_MENU_RANGE (-1, -1, wxStyledTextCtrl::OnMenu)
+ EVT_MENU_RANGE (10, 16, wxStyledTextCtrl::OnMenu)
EVT_LISTBOX_DCLICK (-1, wxStyledTextCtrl::OnListBox)
END_EVENT_TABLE()
}
-#ifdef MAKELONG
-#undef MAKELONG
-#endif
-
-#define MAKELONG(a, b) ((a) | ((b) << 16))
-
-
-static long wxColourAsLong(const wxColour& co) {
- return (((long)co.Blue() << 16) |
- ((long)co.Green() << 8) |
- ((long)co.Red()));
-}
-
-static wxColour wxColourFromLong(long c) {
- wxColour clr;
- clr.Set(c & 0xff, (c >> 8) & 0xff, (c >> 16) & 0xff);
- return clr;
-}
-
-
-static wxColour wxColourFromSpec(const wxString& spec) {
- // spec should be "#RRGGBB"
- long red, green, blue;
- red = green = blue = 0;
- spec.Mid(1,2).ToLong(&red, 16);
- spec.Mid(3,2).ToLong(&green, 16);
- spec.Mid(5,2).ToLong(&blue, 16);
- return wxColour(red, green, blue);
-}
-
//----------------------------------------------------------------------
// BEGIN generated section. The following code is automatically generated
//
void wxStyledTextCtrl::StyleSetSpec(int styleNum, const wxString& spec) {
- wxStringTokenizer tkz(spec, ",");
+ wxStringTokenizer tkz(spec, wxT(","));
while (tkz.HasMoreTokens()) {
wxString token = tkz.GetNextToken();
wxString option = token.BeforeFirst(':');
wxString val = token.AfterFirst(':');
- if (option == "bold")
+ if (option == wxT("bold"))
StyleSetBold(styleNum, true);
- else if (option == "italic")
+ else if (option == wxT("italic"))
StyleSetItalic(styleNum, true);
- else if (option == "underline")
+ else if (option == wxT("underline"))
StyleSetUnderline(styleNum, true);
- else if (option == "eol")
+ else if (option == wxT("eol"))
StyleSetEOLFilled(styleNum, true);
- else if (option == "size") {
+ else if (option == wxT("size")) {
long points;
if (val.ToLong(&points))
StyleSetSize(styleNum, points);
}
- else if (option == "face")
+ else if (option == wxT("face"))
StyleSetFaceName(styleNum, val);
- else if (option == "fore")
+ else if (option == wxT("fore"))
StyleSetForeground(styleNum, wxColourFromSpec(val));
- else if (option == "back")
+ else if (option == wxT("back"))
StyleSetBackground(styleNum, wxColourFromSpec(val));
}
}
void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
wxSize sz = GetClientSize();
m_swx->DoSize(sz.x, sz.y);
- Refresh(FALSE);
}
void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) {
+ SetFocus();
wxPoint pt = evt.GetPosition();
m_swx->DoButtonDown(Point(pt.x, pt.y), m_stopWatch.Time(),
evt.ShiftDown(), evt.ControlDown(), evt.AltDown());
m_swx->DoMouseWheel(evt.GetWheelRotation(),
evt.GetWheelDelta(),
evt.GetLinesPerAction(),
- evt.ControlDown());
+ evt.ControlDown(),
+ evt.IsPageScroll());
}
void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
int key = evt.GetKeyCode();
- // AltGr keys???
- // \|@#¬[]{}?£$~ ã,õ,Ã,Õ, ñ, Ñ
-
// On (some?) non-US keyboards the AltGr key is required to enter some
// common characters. It comes to us as both Alt and Ctrl down so we need
// to let the char through in that case, otherwise if only ctrl or only
bool alt = evt.AltDown();
bool skip = ((ctrl || alt) && ! (ctrl && alt));
- //printf("OnChar key:%%d consumed:%%d ctrl:%%d alt:%%d skip:%%d\n",
- // key, m_lastKeyDownConsumed, ctrl, alt, skip);
+// printf("OnChar key:%%d consumed:%%d ctrl:%%d alt:%%d skip:%%d\n",
+// key, m_lastKeyDownConsumed, ctrl, alt, skip);
if (key <= WXK_START && /*key >= 32 &&*/ !m_lastKeyDownConsumed && !skip) {
m_swx->DoAddChar(key);
int processed = m_swx->DoKeyDown(key, shift, ctrl, alt, &m_lastKeyDownConsumed);
-// printf("key: %%d shift: %%d ctrl: %%d alt: %%d processed: %%d consumed: %%d\n",
-// key, shift, ctrl, alt, processed, m_lastKeyDownConsumed);
+// printf("KeyDn key:%%d shift:%%d ctrl:%%d alt:%%d processed:%%d consumed:%%d\n",
+// key, shift, ctrl, alt, processed, m_lastKeyDownConsumed);
if (!processed && !m_lastKeyDownConsumed)
evt.Skip();
wxMemoryBuffer buf(scn.length+1);
buf.AppendData((void*)scn.text, scn.length);
buf.AppendByte(0);
- evt.SetText(wxString(buf, wxConvUTF8));
+ evt.SetText(stc2wx(buf));
}
evt.SetLength(scn.length);
evt.SetLinesAdded(scn.linesAdded);
m_x = 0;
m_y = 0;
m_dragAllowMove = FALSE;
+#if wxUSE_DRAG_AND_DROP
m_dragResult = wxDragNone;
+#endif
}
bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0; }
m_dragText = event.m_dragText;
m_dragAllowMove =event.m_dragAllowMove;
+#if wxUSE_DRAG_AND_DROP
m_dragResult = event.m_dragResult;
+#endif
}
//----------------------------------------------------------------------
projects / wxWidgets.git / blobdiff