#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 = "stcwindow";
+const wxChar* wxSTCNameStr = wxT("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_PAINT (wxStyledTextCtrl::OnPaint)
EVT_SCROLLWIN (wxStyledTextCtrl::OnScrollWin)
+ EVT_SCROLL (wxStyledTextCtrl::OnScroll)
EVT_SIZE (wxStyledTextCtrl::OnSize)
EVT_LEFT_DOWN (wxStyledTextCtrl::OnMouseLeftDown)
#ifdef __WXMSW__
#endif
EVT_MOTION (wxStyledTextCtrl::OnMouseMove)
EVT_LEFT_UP (wxStyledTextCtrl::OnMouseLeftUp)
+#ifdef __WXGTK__
+ 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
}
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);
+ // 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);
}
// Add text to the document
void wxStyledTextCtrl::AddText(const wxString& text) {
- SendMsg(2001, text.Len(), (long)text.c_str());
+ wxWX2MBbuf buf = (wxWX2MBbuf)text.mb_str(wxConvUTF8);
+ SendMsg(2001, strlen(buf), (long)(const char*)buf);
}
// Add array of cells to document
-void wxStyledTextCtrl::AddStyledText(const wxString& text) {
- SendMsg(2002, text.Len(), (long)text.c_str());
+void wxStyledTextCtrl::AddStyledText(const wxMemoryBuffer& data) {
+ SendMsg(2002, data.GetDataLen(), (long)data.GetData());
}
// Insert string at a position
void wxStyledTextCtrl::InsertText(int pos, const wxString& text) {
- SendMsg(2003, pos, (long)text.c_str());
+ SendMsg(2003, pos, (long)(const char*)text.mb_str(wxConvUTF8));
}
// Delete all text in the document
}
// Retrieve a buffer of cells.
-wxString wxStyledTextCtrl::GetStyledText(int startPos, int endPos) {
- wxString text;
+wxMemoryBuffer wxStyledTextCtrl::GetStyledText(int startPos, int endPos) {
+ wxMemoryBuffer buf;
+ if (endPos < startPos) {
+ int temp = startPos;
+ startPos = endPos;
+ endPos = temp;
+ }
int len = endPos - startPos;
- if (!len) return "";
+ if (!len) return buf;
TextRange tr;
- tr.lpstrText = text.GetWriteBuf(len*2);
+ tr.lpstrText = (char*)buf.GetWriteBuf(len*2+1);
tr.chrg.cpMin = startPos;
tr.chrg.cpMax = endPos;
- SendMsg(2015, 0, (long)&tr);
- text.UngetWriteBuf(len*2);
- return text;
+ len = SendMsg(2015, 0, (long)&tr);
+ buf.UngetWriteBuf(len);
+ return buf;
}
// Are there any redoable actions in the undo history.
// Retrieve the text of the line containing the caret.
// Returns the index of the caret on the line.
wxString wxStyledTextCtrl::GetCurLine(int* linePos) {
- wxString text;
int len = LineLength(GetCurrentLine());
if (!len) {
if (linePos) *linePos = 0;
- return "";
+ return wxEmptyString;
}
- // Need an extra byte because SCI_GETCURLINE writes a null to the string
- char* buf = text.GetWriteBuf(len+1);
+
+ wxMemoryBuffer mbuf(len+1);
+ char* buf = (char*)mbuf.GetWriteBuf(len+1);
int pos = SendMsg(2027, len+1, (long)buf);
- text.UngetWriteBuf(len);
+ mbuf.UngetWriteBuf(len);
+ mbuf.AppendByte(0);
if (linePos) *linePos = pos;
-
- return text;
+ return wxString(buf, wxConvUTF8);
}
// Retrieve the position of the last correctly styled character.
}
// Set the code page used to interpret the bytes of the document as characters.
-// The SC_CP_UTF8 value can be used to enter Unicode mode.
void wxStyledTextCtrl::SetCodePage(int codePage) {
- SendMsg(2037, codePage, 0);
+#if wxUSE_UNICODE
+ wxASSERT_MSG(codePage == wxSTC_CP_UTF8,
+ wxT("Only wxSTC_CP_UTF8 may be used when wxUSE_UNICODE is on."));
+#else
+ wxASSERT_MSG(codePage != wxSTC_CP_UTF8,
+ wxT("wxSTC_CP_UTF8 may not be used when wxUSE_UNICODE is off."));
+#endif
+ SendMsg(2037, codePage);
}
// Set the symbol used for a particular marker number,
-// and optionally the for and background colours.
+// and optionally the fore and background colours.
void wxStyledTextCtrl::MarkerDefine(int markerNumber, int markerSymbol,
const wxColour& foreground,
const wxColour& background) {
SendMsg(2042, markerNumber, wxColourAsLong(back));
}
-// Add a marker to a line.
-void wxStyledTextCtrl::MarkerAdd(int line, int markerNumber) {
- SendMsg(2043, line, markerNumber);
+// Add a marker to a line, returning an ID which can be used to find or delete the marker.
+int wxStyledTextCtrl::MarkerAdd(int line, int markerNumber) {
+ return SendMsg(2043, line, markerNumber);
}
// Delete a marker from a line
// Set the font of a style.
void wxStyledTextCtrl::StyleSetFaceName(int style, const wxString& fontName) {
- SendMsg(2056, style, (long)fontName.c_str());
+ SendMsg(2056, style, (long)(const char*)fontName.mb_str(wxConvUTF8));
}
// Set a style to have its end of line filled or not.
SendMsg(2060, style, caseForce);
}
+// Set the character set of the font in a style.
+void wxStyledTextCtrl::StyleSetCharacterSet(int style, int characterSet) {
+ SendMsg(2066, style, characterSet);
+}
+
// Set the foreground colour of the selection and whether to use this setting.
void wxStyledTextCtrl::SetSelForeground(bool useSetting, const wxColour& fore) {
SendMsg(2067, useSetting, wxColourAsLong(fore));
// Set the set of characters making up words for when moving or selecting
// by word.
void wxStyledTextCtrl::SetWordChars(const wxString& characters) {
- SendMsg(2077, 0, (long)characters.c_str());
+ SendMsg(2077, 0, (long)(const char*)characters.mb_str(wxConvUTF8));
}
// Start a sequence of actions that is undone and redone as a unit.
return SendMsg(2095, 0, 0) != 0;
}
-// Display the background of the line containing the caret in a different colour.
+// Dsplay the background of the line containing the caret in a different colour.
void wxStyledTextCtrl::SetCaretLineVisible(bool show) {
SendMsg(2096, show, 0);
}
SendMsg(2098, wxColourAsLong(back), 0);
}
+// Set a style to be changeable or not (read only).
+// Experimental feature, currently buggy.
+void wxStyledTextCtrl::StyleSetChangeable(int style, bool changeable) {
+ SendMsg(2099, style, changeable);
+}
+
// Display a auto-completion list.
// The lenEntered parameter indicates how many characters before
// the caret should be used to provide context.
void wxStyledTextCtrl::AutoCompShow(int lenEntered, const wxString& itemList) {
- SendMsg(2100, lenEntered, (long)itemList.c_str());
+ SendMsg(2100, lenEntered, (long)(const char*)itemList.mb_str(wxConvUTF8));
}
// Remove the auto-completion list from the screen.
// Define a set of character that when typed cancel the auto-completion list.
void wxStyledTextCtrl::AutoCompStops(const wxString& characterSet) {
- SendMsg(2105, 0, (long)characterSet.c_str());
+ SendMsg(2105, 0, (long)(const char*)characterSet.mb_str(wxConvUTF8));
}
// Change the separator character in the string setting up an auto-completion
// Select the item in the auto-completion list that starts with a string.
void wxStyledTextCtrl::AutoCompSelect(const wxString& text) {
- SendMsg(2108, 0, (long)text.c_str());
+ SendMsg(2108, 0, (long)(const char*)text.mb_str(wxConvUTF8));
}
// Should the auto-completion list be cancelled if the user backspaces to a
return SendMsg(2111, 0, 0) != 0;
}
-// Define a set of character that when typed fills up the selected word.
+// Define a set of characters that when typed will cause the autocompletion to
+// choose the selected item.
void wxStyledTextCtrl::AutoCompSetFillUps(const wxString& characterSet) {
- SendMsg(2112, 0, (long)characterSet.c_str());
+ SendMsg(2112, 0, (long)(const char*)characterSet.mb_str(wxConvUTF8));
}
// Should a single item auto-completion list automatically choose the item.
// Display a list of strings and send notification when user chooses one.
void wxStyledTextCtrl::UserListShow(int listType, const wxString& itemList) {
- SendMsg(2117, listType, (long)itemList.c_str());
+ SendMsg(2117, listType, (long)(const char*)itemList.mb_str(wxConvUTF8));
}
// Set whether or not autocompletion is hidden automatically when nothing matches
return SendMsg(2119, 0, 0) != 0;
}
+// Set whether or not autocompletion deletes any word characters after the inserted text upon completion
+void wxStyledTextCtrl::AutoCompSetDropRestOfWord(bool dropRestOfWord) {
+ SendMsg(2270, dropRestOfWord, 0);
+}
+
+// Retrieve whether or not autocompletion deletes any word characters after the inserted text upon completion
+bool wxStyledTextCtrl::AutoCompGetDropRestOfWord() {
+ return SendMsg(2271, 0, 0) != 0;
+}
+
// Set the number of spaces used for one level of indentation.
void wxStyledTextCtrl::SetIndent(int indentSize) {
SendMsg(2122, indentSize, 0);
flags |= wholeWord ? SCFIND_WHOLEWORD : 0;
ft.chrg.cpMin = minPos;
ft.chrg.cpMax = maxPos;
- ft.lpstrText = (char*)text.c_str();
+ ft.lpstrText = (char*)(const char*)text.mb_str(wxConvUTF8);
return SendMsg(2150, flags, (long)&ft);
}
wxRect pageRect) {
RangeToFormat fr;
+ if (endPos < startPos) {
+ int temp = startPos;
+ startPos = endPos;
+ endPos = temp;
+ }
fr.hdc = draw;
fr.hdcTarget = target;
fr.rc.top = renderRect.GetTop();
// Retrieve the contents of a line.
wxString wxStyledTextCtrl::GetLine(int line) {
- wxString text;
int len = LineLength(line);
- if (!len) return "";
- char* buf = text.GetWriteBuf(len);
+ if (!len) return wxEmptyString;
- int pos = SendMsg(2153, line, (long)buf);
- text.UngetWriteBuf(len);
-
- return text;
+ wxMemoryBuffer mbuf(len+1);
+ char* buf = (char*)mbuf.GetWriteBuf(len+1);
+ SendMsg(2153, line, (long)buf);
+ mbuf.UngetWriteBuf(len);
+ mbuf.AppendByte(0);
+ return wxString(buf, wxConvUTF8);
}
// Returns the number of lines in the document. There is always at least one.
// Retrieve the selected text.
wxString wxStyledTextCtrl::GetSelectedText() {
- wxString text;
int start;
int end;
GetSelection(&start, &end);
int len = end - start;
- if (!len) return "";
- char* buff = text.GetWriteBuf(len);
+ if (!len) return wxEmptyString;
- SendMsg(2161, 0, (long)buff);
- text.UngetWriteBuf(len);
- return text;
+ wxMemoryBuffer mbuf(len+1);
+ char* buf = (char*)mbuf.GetWriteBuf(len+1);
+ SendMsg(2161, 0, (long)buf);
+ mbuf.UngetWriteBuf(len);
+ mbuf.AppendByte(0);
+ return wxString(buf, wxConvUTF8);
}
// Retrieve a range of text.
wxString wxStyledTextCtrl::GetTextRange(int startPos, int endPos) {
- wxString text;
+ if (endPos < startPos) {
+ int temp = startPos;
+ startPos = endPos;
+ endPos = temp;
+ }
int len = endPos - startPos;
- if (!len) return "";
- char* buff = text.GetWriteBuf(len);
+ if (!len) return wxEmptyString;
+ wxMemoryBuffer mbuf(len+1);
+ char* buf = (char*)mbuf.GetWriteBuf(len);
TextRange tr;
- tr.lpstrText = buff;
+ tr.lpstrText = buf;
tr.chrg.cpMin = startPos;
tr.chrg.cpMax = endPos;
-
SendMsg(2162, 0, (long)&tr);
- text.UngetWriteBuf(len);
- return text;
+ mbuf.UngetWriteBuf(len);
+ mbuf.AppendByte(0);
+ return wxString(buf, wxConvUTF8);
}
// Draw the selection in normal style or with selection highlighted.
// Replace the selected text with the argument text.
void wxStyledTextCtrl::ReplaceSelection(const wxString& text) {
- SendMsg(2170, 0, (long)text.c_str());
+ SendMsg(2170, 0, (long)(const char*)text.mb_str(wxConvUTF8));
}
// Set to read only or read write.
// Replace the contents of the document with the argument text.
void wxStyledTextCtrl::SetText(const wxString& text) {
- SendMsg(2181, 0, (long)text.c_str());
+ SendMsg(2181, 0, (long)(const char*)text.mb_str(wxConvUTF8));
}
// Retrieve all the text in the document.
wxString wxStyledTextCtrl::GetText() {
- wxString text;
- int len = GetTextLength();
- char* buff = text.GetWriteBuf(len+1); // leave room for the null...
-
- SendMsg(2182, len+1, (long)buff);
- text.UngetWriteBuf(len);
- return text;
+ int len = GetTextLength();
+ wxMemoryBuffer mbuf(len+1); // leave room for the null...
+ char* buf = (char*)mbuf.GetWriteBuf(len+1);
+ SendMsg(2182, len+1, (long)buf);
+ mbuf.UngetWriteBuf(len);
+ mbuf.AppendByte(0);
+ return wxString(buf, wxConvUTF8);
}
// Retrieve the number of characters in the document.
// Returns the length of the replacement text.
int wxStyledTextCtrl::ReplaceTarget(const wxString& text) {
- return SendMsg(2194, text.Len(), (long)text.c_str());
-
+ wxWX2MBbuf buf = (wxWX2MBbuf)text.mb_str(wxConvUTF8);
+ return SendMsg(2194, strlen(buf), (long)(const char*)buf);
}
// Replace the target text with the argument text after \d processing.
// caused by processing the \d patterns.
int wxStyledTextCtrl::ReplaceTargetRE(const wxString& text) {
- return SendMsg(2195, text.Len(), (long)text.c_str());
-
+ wxWX2MBbuf buf = (wxWX2MBbuf)text.mb_str(wxConvUTF8);
+ return SendMsg(2195, strlen(buf), (long)(const char*)buf);
}
// Search for a counted string in the target and set the target to the found
// Returns length of range or -1 for failure in which case target is not moved.
int wxStyledTextCtrl::SearchInTarget(const wxString& text) {
- return SendMsg(2197, text.Len(), (long)text.c_str());
-
+ wxWX2MBbuf buf = (wxWX2MBbuf)text.mb_str(wxConvUTF8);
+ return SendMsg(2197, strlen(buf), (long)(const char*)buf);
}
// Set the search flags used by SearchInTarget
// Show a call tip containing a definition near position pos.
void wxStyledTextCtrl::CallTipShow(int pos, const wxString& definition) {
- SendMsg(2200, pos, (long)definition.c_str());
+ SendMsg(2200, pos, (long)(const char*)definition.mb_str(wxConvUTF8));
}
// Remove the call tip from the screen.
return SendMsg(2265, 0, 0);
}
+// Get position of start of word
+int wxStyledTextCtrl::WordStartPosition(int pos, bool onlyWordCharacters) {
+ return SendMsg(2266, pos, onlyWordCharacters);
+}
+
+// Get position of end of word
+int wxStyledTextCtrl::WordEndPosition(int pos, bool onlyWordCharacters) {
+ return SendMsg(2267, pos, onlyWordCharacters);
+}
+
+// Sets whether text is word wrapped
+void wxStyledTextCtrl::SetWrapMode(int mode) {
+ SendMsg(2268, mode, 0);
+}
+
+// Retrieve whether text is word wrapped
+int wxStyledTextCtrl::GetWrapMode() {
+ return SendMsg(2269, 0, 0);
+}
+
+// Sets the degree of caching of layout information
+void wxStyledTextCtrl::SetLayoutCache(int mode) {
+ SendMsg(2272, mode, 0);
+}
+
+// Retrieve the degree of caching of layout information
+int wxStyledTextCtrl::GetLayoutCache() {
+ return SendMsg(2273, 0, 0);
+}
+
// Move the caret inside current view if it's not there already
void wxStyledTextCtrl::MoveCaretInsideView() {
SendMsg(2401, 0, 0);
// Find some text starting at the search anchor.
// Does not ensure the selection is visible.
int wxStyledTextCtrl::SearchNext(int flags, const wxString& text) {
- return SendMsg(2367, flags, (long)text.c_str());
+ return SendMsg(2367, flags, (long)(const char*)text.mb_str(wxConvUTF8));
}
// Find some text starting at the search anchor and moving backwards.
// Does not ensure the selection is visible.
int wxStyledTextCtrl::SearchPrev(int flags, const wxString& text) {
- return SendMsg(2368, flags, (long)text.c_str());
+ return SendMsg(2368, flags, (long)(const char*)text.mb_str(wxConvUTF8));
}
// Set the way the line the caret is on is kept visible.
return SendMsg(2387, 0, 0);
}
+// Change the way control characters are displayed:
+// If symbol is < 32, keep the drawn way, else, use the given character
+void wxStyledTextCtrl::SetControlCharSymbol(int symbol) {
+ SendMsg(2388, symbol, 0);
+}
+
+// Get the way control characters are displayed
+int wxStyledTextCtrl::GetControlCharSymbol() {
+ return SendMsg(2389, 0, 0);
+}
+
// Move to the previous change in capitalistion
void wxStyledTextCtrl::WordPartLeft() {
SendMsg(2390, 0, 0);
SendMsg(2396, 0, 0);
}
+// Get and Set the xOffset (ie, horizonal scroll position)
+void wxStyledTextCtrl::SetXOffset(int newOffset) {
+ SendMsg(2397, newOffset, 0);
+}
+int wxStyledTextCtrl::GetXOffset() {
+ return SendMsg(2398, 0, 0);
+}
+
// Start notifying the container of all key presses and commands.
void wxStyledTextCtrl::StartRecord() {
SendMsg(3001, 0, 0);
// Set up a value that may be used by a lexer for some optional feature.
void wxStyledTextCtrl::SetProperty(const wxString& key, const wxString& value) {
- SendMsg(4004, (long)key.c_str(), (long)value.c_str());
+ SendMsg(4004, (long)(const char*)key.mb_str(wxConvUTF8), (long)(const char*)value.mb_str(wxConvUTF8));
}
// Set up the key words used by the lexer.
void wxStyledTextCtrl::SetKeyWords(int keywordSet, const wxString& keyWords) {
- SendMsg(4005, keywordSet, (long)keyWords.c_str());
+ SendMsg(4005, keywordSet, (long)(const char*)keyWords.mb_str(wxConvUTF8));
}
// Set the lexing language of the document based on string name.
void wxStyledTextCtrl::SetLexerLanguage(const wxString& language) {
- SendMsg(4006, 0, (long)language.c_str());
+ SendMsg(4006, 0, (long)(const char*)language.mb_str(wxConvUTF8));
}
// END of generated section
m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
}
+void wxStyledTextCtrl::OnScroll(wxScrollEvent& evt) {
+ wxScrollBar* sb = wxDynamicCast(evt.GetEventObject(), wxScrollBar);
+ if (sb) {
+ if (sb->IsVertical())
+ m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
+ else
+ m_swx->DoHScroll(evt.GetEventType(), evt.GetPosition());
+ }
+}
+
void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
wxSize sz = GetClientSize();
m_swx->DoSize(sz.x, sz.y);
+ Refresh(FALSE);
}
void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) {
}
+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());
+ int key = evt.GetKeyCode();
// AltGr keys???
// \|@#¬[]{}?£$~ ã,õ,Ã,Õ, ñ, Ñ
// alt let's skip it.
bool ctrl = evt.ControlDown();
bool alt = evt.AltDown();
- bool skip = (ctrl || alt && ! (ctrl && alt));
+ 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);
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(wxString(buf, wxConvUTF8));
+ }
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;
m_dragResult = wxDragNone;
-#endif
}
bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0; }
bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; }
bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; }
-void wxStyledTextEvent::CopyObject(wxObject& obj) const {
- wxCommandEvent::CopyObject(obj);
-
- wxStyledTextEvent* o = (wxStyledTextEvent*)&obj;
- o->m_position = m_position;
- o->m_key = m_key;
- o->m_modifiers = m_modifiers;
- o->m_modificationType = m_modificationType;
- o->m_text = m_text;
- o->m_length = m_length;
- o->m_linesAdded = m_linesAdded;
- o->m_line = m_line;
- o->m_foldLevelNow = m_foldLevelNow;
- o->m_foldLevelPrev = m_foldLevelPrev;
-
- o->m_margin = m_margin;
-
- o->m_message = m_message;
- o->m_wParam = m_wParam;
- o->m_lParam = m_lParam;
-
- o->m_listType = m_listType;
- o->m_x = m_x;
- o->m_y = m_y;
-
-#if wxUSE_DRAG_AND_DROP
- o->m_dragText = m_dragText;
- o->m_dragAllowMove =m_dragAllowMove;
- o->m_dragResult = m_dragResult;
-#endif
+
+wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
+ wxCommandEvent(event)
+{
+ m_position = event.m_position;
+ m_key = event.m_key;
+ m_modifiers = event.m_modifiers;
+ m_modificationType = event.m_modificationType;
+ m_text = event.m_text;
+ m_length = event.m_length;
+ m_linesAdded = event.m_linesAdded;
+ m_line = event.m_line;
+ m_foldLevelNow = event.m_foldLevelNow;
+ m_foldLevelPrev = event.m_foldLevelPrev;
+
+ m_margin = event.m_margin;
+
+ m_message = event.m_message;
+ m_wParam = event.m_wParam;
+ m_lParam = event.m_lParam;
+
+ m_listType = event.m_listType;
+ m_x = event.m_x;
+ m_y = event.m_y;
+
+ m_dragText = event.m_dragText;
+ m_dragAllowMove =event.m_dragAllowMove;
+ m_dragResult = event.m_dragResult;
}
//----------------------------------------------------------------------
+
+
+
+
+
projects / wxWidgets.git / blobdiff