#include <wx/tokenzr.h>
-// The following code forces a reference to all of the Scintilla lexers.
-// If we don't do something like this, then the linker tends to "optimize"
-// them away. (eric@sourcegear.com)
-int wxForceScintillaLexers(void)
-{
- extern LexerModule lmAda;
- extern LexerModule lmAVE;
- extern LexerModule lmConf;
- extern LexerModule lmCPP;
- extern LexerModule lmNncrontab;
- extern LexerModule lmEiffel;
- extern LexerModule lmHTML;
- extern LexerModule lmLISP;
- extern LexerModule lmLua;
- extern LexerModule lmBatch; // In LexOthers.cxx
- extern LexerModule lmPascal;
- extern LexerModule lmPerl;
- extern LexerModule lmPython;
- extern LexerModule lmRuby;
- extern LexerModule lmSQL;
- extern LexerModule lmVB;
-
- if ( &lmAda
- && &lmAVE
- && &lmConf
- && &lmCPP
- && &lmNncrontab
- && &lmEiffel
- && &lmHTML
- && &lmLISP
- && &lmLua
- && &lmBatch
- && &lmPascal
- && &lmPerl
- && &lmPython
- && &lmRuby
- && &lmSQL
- && &lmVB )
- {
- return 1;
- }
- else
- {
- return 0;
- }
+//----------------------------------------------------------------------
+
+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);
+}
-const wxChar* wxSTCNameStr = "stcwindow";
+//----------------------------------------------------------------------
DEFINE_EVENT_TYPE( wxEVT_STC_CHANGE )
DEFINE_EVENT_TYPE( wxEVT_STC_STYLENEEDED )
DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED )
DEFINE_EVENT_TYPE( wxEVT_STC_DWELLSTART )
DEFINE_EVENT_TYPE( wxEVT_STC_DWELLEND )
-#if wxUSE_DRAG_AND_DROP
DEFINE_EVENT_TYPE( wxEVT_STC_START_DRAG )
DEFINE_EVENT_TYPE( wxEVT_STC_DRAG_OVER )
DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
-#endif
BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
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)
+#if defined(__WXGTK__) || defined(__WXMAC__)
+ EVT_RIGHT_UP (wxStyledTextCtrl::OnMouseRightUp)
+#else
EVT_CONTEXT_MENU (wxStyledTextCtrl::OnContextMenu)
+#endif
EVT_MOUSEWHEEL (wxStyledTextCtrl::OnMouseWheel)
EVT_CHAR (wxStyledTextCtrl::OnChar)
EVT_KEY_DOWN (wxStyledTextCtrl::OnKeyDown)
IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent)
+// forces the linking of the lexer modules
+int Scintilla_LinkLexers();
+
//----------------------------------------------------------------------
// Constructor and Destructor
style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name)
{
+ Scintilla_LinkLexers();
m_swx = new ScintillaWX(this);
m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE;
m_vScrollBar = NULL;
m_hScrollBar = NULL;
+#if wxUSE_UNICODE
+ // Put Scintilla into unicode (UTF-8) mode
+ SetCodePage(wxSTC_CP_UTF8);
+#endif
}
}
-#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
- char* junk;
- int red = strtol(spec.Mid(1,2), &junk, 16);
- int green = strtol(spec.Mid(3,2), &junk, 16);
- int blue = strtol(spec.Mid(5,2), &junk, 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::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());
}
+void wxStyledTextCtrl::OnMouseRightUp(wxMouseEvent& evt) {
+ wxPoint pt = evt.GetPosition();
+ m_swx->DoContextMenu(Point(pt.x, pt.y));
+}
+
+
void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
wxPoint pt = evt.GetPosition();
ScreenToClient(&pt.x, &pt.y);
void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
- long key = evt.KeyCode();
-
-// printf("OnChar key:%%d consumed:%%d ctrl:%%d alt:%%d\n",
-// key, m_lastKeyDownConsumed, evt.ControlDown(), evt.AltDown());
-
- // AltGr keys???
- // \|@#¬[]{}?£$~ ã,õ,Ã,Õ, ñ, Ñ
+ int key = evt.GetKeyCode();
// 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
bool alt = evt.AltDown();
bool skip = ((ctrl || alt) && ! (ctrl && alt));
- if (key <= 0xff && !iscntrl(key) && !m_lastKeyDownConsumed && !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);
return;
}
void wxStyledTextCtrl::OnKeyDown(wxKeyEvent& evt) {
- long key = evt.KeyCode();
+ int key = evt.GetKeyCode();
bool shift = evt.ShiftDown(),
- ctrl = evt.ControlDown(),
- alt = evt.AltDown();
+ ctrl = evt.ControlDown(),
+ alt = evt.AltDown();
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();
case SCN_MODIFIED:
evt.SetEventType(wxEVT_STC_MODIFIED);
evt.SetModificationType(scn.modificationType);
- if (scn.text)
- evt.SetText(wxString(scn.text, scn.length));
+ if (scn.text) {
+ // The unicode conversion MUST have a null byte to terminate the
+ // string so move it into a buffer first and give it one.
+ wxMemoryBuffer buf(scn.length+1);
+ buf.AppendData((void*)scn.text, scn.length);
+ buf.AppendByte(0);
+ evt.SetText(stc2wx(buf));
+ }
evt.SetLength(scn.length);
evt.SetLinesAdded(scn.linesAdded);
evt.SetLine(scn.line);
evt.SetLength(scn.length);
break;
- case SCN_POSCHANGED:
- evt.SetEventType(wxEVT_STC_POSCHANGED);
- break;
-
case SCN_PAINTED:
evt.SetEventType(wxEVT_STC_PAINTED);
break;
m_listType = 0;
m_x = 0;
m_y = 0;
-#if wxUSE_DRAG_AND_DROP
m_dragAllowMove = FALSE;
+#if wxUSE_DRAG_AND_DROP
m_dragResult = wxDragNone;
#endif
}
m_x = event.m_x;
m_y = event.m_y;
-#if wxUSE_DRAG_AND_DROP
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