X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00c64037fb763781c64036f6e165fc0555a07d4e..645b5bd6c0bc43c1029bcaeed32f34db063a3739:/src/stc/stc.cpp diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp index f56024c0ca..8ab07a92ab 100644 --- a/src/stc/stc.cpp +++ b/src/stc/stc.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////// // Name: stc.cpp -// Purpose: A wxWindows implementation of Scintilla. This class is the +// Purpose: A wxWidgets implementation of Scintilla. This class is the // one meant to be used directly by wx applications. It does not // derive directly from the Scintilla classes, but instead // delegates most things to the real Scintilla class. @@ -20,59 +20,48 @@ #include "wx/stc/stc.h" #include "ScintillaWX.h" +#include #include +#include +#include +#include -// 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; +} -const wxChar* wxSTCNameStr = "stcwindow"; + +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 ) @@ -87,39 +76,45 @@ DEFINE_EVENT_TYPE( wxEVT_STC_MODIFIED ) DEFINE_EVENT_TYPE( wxEVT_STC_MACRORECORD ) DEFINE_EVENT_TYPE( wxEVT_STC_MARGINCLICK ) DEFINE_EVENT_TYPE( wxEVT_STC_NEEDSHOWN ) -DEFINE_EVENT_TYPE( wxEVT_STC_POSCHANGED ) DEFINE_EVENT_TYPE( wxEVT_STC_PAINTED ) DEFINE_EVENT_TYPE( wxEVT_STC_USERLISTSELECTION ) 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 +DEFINE_EVENT_TYPE( wxEVT_STC_ZOOM ) +DEFINE_EVENT_TYPE( wxEVT_STC_HOTSPOT_CLICK ) +DEFINE_EVENT_TYPE( wxEVT_STC_HOTSPOT_DCLICK ) +DEFINE_EVENT_TYPE( wxEVT_STC_CALLTIP_CLICK ) + 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__ // 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_MIDDLE_UP (wxStyledTextCtrl::OnMouseMiddleUp) EVT_CHAR (wxStyledTextCtrl::OnChar) EVT_KEY_DOWN (wxStyledTextCtrl::OnKeyDown) EVT_KILL_FOCUS (wxStyledTextCtrl::OnLoseFocus) 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() @@ -127,6 +122,11 @@ END_EVENT_TABLE() IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent) +#ifdef LINK_LEXERS +// forces the linking of the lexer modules +int Scintilla_LinkLexers(); +#endif + //---------------------------------------------------------------------- // Constructor and Destructor @@ -135,14 +135,41 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent, const wxPoint& pos, const wxSize& size, long style, - const wxString& name) : - wxControl(parent, id, pos, size, - style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, - wxDefaultValidator, name) + const wxString& name) { + m_swx = NULL; + Create(parent, id, pos, size, style, name); +} + + +void wxStyledTextCtrl::Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) +{ +#ifdef __WXMAC__ + style |= wxVSCROLL | wxHSCROLL; +#endif + wxControl::Create(parent, id, pos, size, + style | wxWANTS_CHARS | wxCLIP_CHILDREN, + wxDefaultValidator, name); + +#ifdef LINK_LEXERS + Scintilla_LinkLexers(); +#endif 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 + + SetBestFittingSize(size); } @@ -159,35 +186,6 @@ long wxStyledTextCtrl::SendMsg(int msg, long wp, long lp) { } -#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 @@ -195,57 +193,58 @@ static wxColour wxColourFromSpec(const wxString& spec) { // this file. Edit stc.cpp.in or gen_iface.py instead and regenerate. -// Add text to the document +// Add text to the document. void wxStyledTextCtrl::AddText(const wxString& text) { - SendMsg(2001, text.Len(), (long)text.c_str()); + wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); + 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()); +// Add array of cells to document. +void wxStyledTextCtrl::AddStyledText(const wxMemoryBuffer& data) { + SendMsg(2002, data.GetDataLen(), (long)data.GetData()); } -// Insert string at a position +// 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*)wx2stc(text)); } -// Delete all text in the document +// Delete all text in the document. void wxStyledTextCtrl::ClearAll() { SendMsg(2004, 0, 0); } -// Set all style bytes to 0, remove all folding information +// Set all style bytes to 0, remove all folding information. void wxStyledTextCtrl::ClearDocumentStyle() { SendMsg(2005, 0, 0); } -// The number of characters in the document +// The number of characters in the document. int wxStyledTextCtrl::GetLength() { return SendMsg(2006, 0, 0); } -// Returns the character byte at the position +// Returns the character byte at the position. int wxStyledTextCtrl::GetCharAt(int pos) { - return SendMsg(2007, pos, 0); + return (unsigned char)SendMsg(2007, pos, 0); } -// Returns the position of the caret +// Returns the position of the caret. int wxStyledTextCtrl::GetCurrentPos() { return SendMsg(2008, 0, 0); } -// Returns the position of the opposite end of the selection to the caret +// Returns the position of the opposite end of the selection to the caret. int wxStyledTextCtrl::GetAnchor() { return SendMsg(2009, 0, 0); } -// Returns the style byte at the position +// Returns the style byte at the position. int wxStyledTextCtrl::GetStyleAt(int pos) { - return SendMsg(2010, pos, 0); + return (unsigned char)SendMsg(2010, pos, 0); } -// Redoes the next action on the undo history +// Redoes the next action on the undo history. void wxStyledTextCtrl::Redo() { SendMsg(2011, 0, 0); } @@ -268,25 +267,30 @@ void wxStyledTextCtrl::SetSavePoint() { } // Retrieve a buffer of cells. -wxString wxStyledTextCtrl::GetStyledText(int startPos, int endPos) { - wxString text; - int len = endPos - startPos; - if (!len) return ""; - TextRange tr; - tr.lpstrText = text.GetWriteBuf(len*2); - tr.chrg.cpMin = startPos; - tr.chrg.cpMax = endPos; - SendMsg(2015, 0, (long)&tr); - text.UngetWriteBuf(len*2); - return text; -} - -// Are there any redoable actions in the undo history. +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 buf; + TextRange tr; + tr.lpstrText = (char*)buf.GetWriteBuf(len*2+1); + tr.chrg.cpMin = startPos; + tr.chrg.cpMax = endPos; + len = SendMsg(2015, 0, (long)&tr); + buf.UngetWriteBuf(len); + return buf; +} + +// Are there any redoable actions in the undo history? bool wxStyledTextCtrl::CanRedo() { return SendMsg(2016, 0, 0) != 0; } -// Retrieve the line number at which a particular marker is located +// Retrieve the line number at which a particular marker is located. int wxStyledTextCtrl::MarkerLineFromHandle(int handle) { return SendMsg(2017, handle, 0); } @@ -314,7 +318,7 @@ void wxStyledTextCtrl::SetViewWhiteSpace(int viewWS) { // Find the position from a point within the window. int wxStyledTextCtrl::PositionFromPoint(wxPoint pt) { - return SendMsg(2022, pt.x, pt.y); + return SendMsg(2022, pt.x, pt.y); } // Find the position from a point within the window but return @@ -342,20 +346,20 @@ void wxStyledTextCtrl::SetAnchor(int posAnchor) { // 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 ""; - } - // Need an extra byte because SCI_GETCURLINE writes a null to the string - char* buf = text.GetWriteBuf(len+1); + int len = LineLength(GetCurrentLine()); + if (!len) { + if (linePos) *linePos = 0; + return wxEmptyString; + } - int pos = SendMsg(2027, len+1, (long)buf); - text.UngetWriteBuf(len); - if (linePos) *linePos = pos; + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len+1); - return text; + int pos = SendMsg(2027, len+1, (long)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + if (linePos) *linePos = pos; + return stc2wx(buf); } // Retrieve the position of the last correctly styled character. @@ -379,8 +383,7 @@ void wxStyledTextCtrl::SetEOLMode(int eolMode) { } // Set the current styling position to pos and the styling mask to mask. -// The styling mask can be used to protect some bits in each styling byte from -// modification. +// The styling mask can be used to protect some bits in each styling byte from modification. void wxStyledTextCtrl::StartStyling(int pos, int mask) { SendMsg(2032, pos, mask); } @@ -391,7 +394,7 @@ void wxStyledTextCtrl::SetStyling(int length, int style) { SendMsg(2033, length, style); } -// Is drawing done first into a buffer or direct to the screen. +// Is drawing done first into a buffer or direct to the screen? bool wxStyledTextCtrl::GetBufferedDraw() { return SendMsg(2034, 0, 0) != 0; } @@ -402,8 +405,7 @@ void wxStyledTextCtrl::SetBufferedDraw(bool buffered) { SendMsg(2035, buffered, 0); } -// Change the visible size of a tab to be a multiple of the width of a space -// character. +// Change the visible size of a tab to be a multiple of the width of a space character. void wxStyledTextCtrl::SetTabWidth(int tabWidth) { SendMsg(2036, tabWidth, 0); } @@ -414,22 +416,28 @@ int wxStyledTextCtrl::GetTabWidth() { } // 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) { + const wxColour& foreground, + const wxColour& background) { - SendMsg(2040, markerNumber, markerSymbol); - if (foreground.Ok()) - MarkerSetForeground(markerNumber, foreground); - if (background.Ok()) - MarkerSetBackground(markerNumber, background); + SendMsg(2040, markerNumber, markerSymbol); + if (foreground.Ok()) + MarkerSetForeground(markerNumber, foreground); + if (background.Ok()) + MarkerSetBackground(markerNumber, background); } // Set the foreground colour used for a particular marker number. @@ -442,17 +450,17 @@ void wxStyledTextCtrl::MarkerSetBackground(int markerNumber, const wxColour& bac 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 +// Delete a marker from a line. void wxStyledTextCtrl::MarkerDelete(int line, int markerNumber) { SendMsg(2044, line, markerNumber); } -// Delete all markers with a particular number from all lines +// Delete all markers with a particular number from all lines. void wxStyledTextCtrl::MarkerDeleteAll(int markerNumber) { SendMsg(2045, markerNumber, 0); } @@ -472,6 +480,21 @@ int wxStyledTextCtrl::MarkerPrevious(int lineStart, int markerMask) { return SendMsg(2048, lineStart, markerMask); } +// Define a marker from a bitmap +void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp) { + // convert bmp to a xpm in a string + wxMemoryOutputStream strm; + wxImage img = bmp.ConvertToImage(); + img.SaveFile(strm, wxBITMAP_TYPE_XPM); + size_t len = strm.GetSize(); + char* buff = new char[len+1]; + strm.CopyTo(buff, len); + buff[len] = 0; + SendMsg(2049, markerNumber, (long)buff); + delete [] buff; + +} + // Set a margin to be either numeric or symbolic. void wxStyledTextCtrl::SetMarginType(int margin, int marginType) { SendMsg(2240, margin, marginType); @@ -544,7 +567,7 @@ void wxStyledTextCtrl::StyleSetSize(int style, int sizePoints) { // 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*)wx2stc(fontName)); } // Set a style to have its end of line filled or not. @@ -567,6 +590,16 @@ void wxStyledTextCtrl::StyleSetCase(int style, int caseForce) { 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 a style to be a hotspot or not. +void wxStyledTextCtrl::StyleSetHotSpot(int style, bool hotspot) { + SendMsg(2409, style, hotspot); +} + // 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)); @@ -584,12 +617,12 @@ void wxStyledTextCtrl::SetCaretForeground(const wxColour& fore) { // When key+modifier combination km is pressed perform msg. void wxStyledTextCtrl::CmdKeyAssign(int key, int modifiers, int cmd) { - SendMsg(2070, MAKELONG(key, modifiers), cmd); + SendMsg(2070, MAKELONG(key, modifiers), cmd); } -// When key+modifier combination km do nothing. +// When key+modifier combination km is pressed do nothing. void wxStyledTextCtrl::CmdKeyClear(int key, int modifiers) { - SendMsg(2071, MAKELONG(key, modifiers)); + SendMsg(2071, MAKELONG(key, modifiers)); } // Drop all key mappings. @@ -599,7 +632,7 @@ void wxStyledTextCtrl::CmdKeyClearAll() { // Set the styles for a segment of the document. void wxStyledTextCtrl::SetStyleBytes(int length, char* styleBytes) { - SendMsg(2073, length, (long)styleBytes); + SendMsg(2073, length, (long)styleBytes); } // Set a style to be visible or not. @@ -617,10 +650,10 @@ void wxStyledTextCtrl::SetCaretPeriod(int periodMilliseconds) { SendMsg(2076, periodMilliseconds, 0); } -// Set the set of characters making up words for when moving or selecting -// by word. +// Set the set of characters making up words for when moving or selecting by word. +// First sets deaults like SetCharsDefault. void wxStyledTextCtrl::SetWordChars(const wxString& characters) { - SendMsg(2077, 0, (long)characters.c_str()); + SendMsg(2077, 0, (long)(const char*)wx2stc(characters)); } // Start a sequence of actions that is undone and redone as a unit. @@ -655,8 +688,18 @@ wxColour wxStyledTextCtrl::IndicatorGetForeground(int indic) { return wxColourFromLong(c); } -// Divide each styling byte into lexical class bits (default:5) and indicator -// bits (default:3). If a lexer requires more than 32 lexical states, then this +// Set the foreground colour of all whitespace and whether to use this setting. +void wxStyledTextCtrl::SetWhitespaceForeground(bool useSetting, const wxColour& fore) { + SendMsg(2084, useSetting, wxColourAsLong(fore)); +} + +// Set the background colour of all whitespace and whether to use this setting. +void wxStyledTextCtrl::SetWhitespaceBackground(bool useSetting, const wxColour& back) { + SendMsg(2085, useSetting, wxColourAsLong(back)); +} + +// Divide each styling byte into lexical class bits (default: 5) and indicator +// bits (default: 3). If a lexer requires more than 32 lexical states, then this // is used to expand the possible states. void wxStyledTextCtrl::SetStyleBits(int bits) { SendMsg(2090, bits, 0); @@ -703,11 +746,17 @@ void wxStyledTextCtrl::SetCaretLineBack(const wxColour& back) { 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*)wx2stc(itemList)); } // Remove the auto-completion list from the screen. @@ -720,8 +769,7 @@ bool wxStyledTextCtrl::AutoCompActive() { return SendMsg(2102, 0, 0) != 0; } -// Retrieve the position of the caret when the auto-completion list was -// displayed. +// Retrieve the position of the caret when the auto-completion list was displayed. int wxStyledTextCtrl::AutoCompPosStart() { return SendMsg(2103, 0, 0); } @@ -733,11 +781,11 @@ void wxStyledTextCtrl::AutoCompComplete() { // 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*)wx2stc(characterSet)); } -// Change the separator character in the string setting up an auto-completion -// list. Default is space but can be changed if items contain space. +// Change the separator character in the string setting up an auto-completion list. +// Default is space but can be changed if items contain space. void wxStyledTextCtrl::AutoCompSetSeparator(int separatorCharacter) { SendMsg(2106, separatorCharacter, 0); } @@ -749,7 +797,7 @@ int wxStyledTextCtrl::AutoCompGetSeparator() { // 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*)wx2stc(text)); } // Should the auto-completion list be cancelled if the user backspaces to a @@ -763,9 +811,10 @@ bool wxStyledTextCtrl::AutoCompGetCancelAtStart() { 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*)wx2stc(characterSet)); } // Should a single item auto-completion list automatically choose the item. @@ -790,19 +839,62 @@ bool wxStyledTextCtrl::AutoCompGetIgnoreCase() { // 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*)wx2stc(itemList)); } -// Set whether or not autocompletion is hidden automatically when nothing matches +// Set whether or not autocompletion is hidden automatically when nothing matches. void wxStyledTextCtrl::AutoCompSetAutoHide(bool autoHide) { SendMsg(2118, autoHide, 0); } -// Retrieve whether or not autocompletion is hidden automatically when nothing matches +// Retrieve whether or not autocompletion is hidden automatically when nothing matches. bool wxStyledTextCtrl::AutoCompGetAutoHide() { 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; +} + +// Register an image for use in autocompletion lists. +void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) { + // convert bmp to a xpm in a string + wxMemoryOutputStream strm; + wxImage img = bmp.ConvertToImage(); + img.SaveFile(strm, wxBITMAP_TYPE_XPM); + size_t len = strm.GetSize(); + char* buff = new char[len+1]; + strm.CopyTo(buff, len); + buff[len] = 0; + SendMsg(2405, type, (long)buff); + delete [] buff; + +} + +// Clear all the registered images. +void wxStyledTextCtrl::ClearRegisteredImages() { + SendMsg(2408, 0, 0); +} + +// Retrieve the auto-completion list type-separator character. +int wxStyledTextCtrl::AutoCompGetTypeSeparator() { + return SendMsg(2285, 0, 0); +} + +// Change the type-separator character in the string setting up an auto-completion list. +// Default is '?' but can be changed if items contain '?'. +void wxStyledTextCtrl::AutoCompSetTypeSeparator(int separatorCharacter) { + SendMsg(2286, separatorCharacter, 0); +} + // Set the number of spaces used for one level of indentation. void wxStyledTextCtrl::SetIndent(int indentSize) { SendMsg(2122, indentSize, 0); @@ -943,62 +1035,64 @@ int wxStyledTextCtrl::GetPrintColourMode() { // Find some text in the document. int wxStyledTextCtrl::FindText(int minPos, int maxPos, - const wxString& text, - bool caseSensitive, bool wholeWord) { - TextToFind ft; - int flags = 0; - - flags |= caseSensitive ? SCFIND_MATCHCASE : 0; - flags |= wholeWord ? SCFIND_WHOLEWORD : 0; - ft.chrg.cpMin = minPos; - ft.chrg.cpMax = maxPos; - ft.lpstrText = (char*)text.c_str(); + const wxString& text, + int flags) { + TextToFind ft; + ft.chrg.cpMin = minPos; + ft.chrg.cpMax = maxPos; + wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); + ft.lpstrText = (char*)(const char*)buf; - return SendMsg(2150, flags, (long)&ft); + return SendMsg(2150, flags, (long)&ft); } -// On Windows will draw the document into a display context such as a printer. +// On Windows, will draw the document into a display context such as a printer. int wxStyledTextCtrl::FormatRange(bool doDraw, - int startPos, - int endPos, - wxDC* draw, - wxDC* target, // Why does it use two? Can they be the same? - wxRect renderRect, - wxRect pageRect) { - RangeToFormat fr; - - fr.hdc = draw; - fr.hdcTarget = target; - fr.rc.top = renderRect.GetTop(); - fr.rc.left = renderRect.GetLeft(); - fr.rc.right = renderRect.GetRight(); - fr.rc.bottom = renderRect.GetBottom(); - fr.rcPage.top = pageRect.GetTop(); - fr.rcPage.left = pageRect.GetLeft(); - fr.rcPage.right = pageRect.GetRight(); - fr.rcPage.bottom = pageRect.GetBottom(); - fr.chrg.cpMin = startPos; - fr.chrg.cpMax = endPos; - - return SendMsg(2151, doDraw, (long)&fr); -} - -// Retrieve the line at the top of the display. + int startPos, + int endPos, + wxDC* draw, + wxDC* target, + wxRect renderRect, + 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(); + fr.rc.left = renderRect.GetLeft(); + fr.rc.right = renderRect.GetRight(); + fr.rc.bottom = renderRect.GetBottom(); + fr.rcPage.top = pageRect.GetTop(); + fr.rcPage.left = pageRect.GetLeft(); + fr.rcPage.right = pageRect.GetRight(); + fr.rcPage.bottom = pageRect.GetBottom(); + fr.chrg.cpMin = startPos; + fr.chrg.cpMax = endPos; + + return SendMsg(2151, doDraw, (long)&fr); +} + +// Retrieve the display line at the top of the display. int wxStyledTextCtrl::GetFirstVisibleLine() { return SendMsg(2152, 0, 0); } // 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); + int len = LineLength(line); + 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 stc2wx(buf); } // Returns the number of lines in the document. There is always at least one. @@ -1038,34 +1132,40 @@ void wxStyledTextCtrl::SetSelection(int start, int end) { // Retrieve the selected text. wxString wxStyledTextCtrl::GetSelectedText() { - wxString text; - int start; - int end; + int start; + int end; - GetSelection(&start, &end); - int len = end - start; - if (!len) return ""; - char* buff = text.GetWriteBuf(len); + GetSelection(&start, &end); + int len = end - start; + if (!len) return wxEmptyString; - SendMsg(2161, 0, (long)buff); - text.UngetWriteBuf(len); - return text; + wxMemoryBuffer mbuf(len+2); + char* buf = (char*)mbuf.GetWriteBuf(len+1); + SendMsg(2161, 0, (long)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf); } // Retrieve a range of text. wxString wxStyledTextCtrl::GetTextRange(int startPos, int endPos) { - wxString text; - int len = endPos - startPos; - if (!len) return ""; - char* buff = text.GetWriteBuf(len); - TextRange tr; - tr.lpstrText = buff; - tr.chrg.cpMin = startPos; - tr.chrg.cpMax = endPos; - - SendMsg(2162, 0, (long)&tr); - text.UngetWriteBuf(len); - return text; + if (endPos < startPos) { + int temp = startPos; + startPos = endPos; + endPos = temp; + } + int len = endPos - startPos; + if (!len) return wxEmptyString; + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len); + TextRange tr; + tr.lpstrText = buf; + tr.chrg.cpMin = startPos; + tr.chrg.cpMax = endPos; + SendMsg(2162, 0, (long)&tr); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf); } // Draw the selection in normal style or with selection highlighted. @@ -1095,7 +1195,7 @@ void wxStyledTextCtrl::EnsureCaretVisible() { // 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*)wx2stc(text)); } // Set to read only or read write. @@ -1108,7 +1208,7 @@ bool wxStyledTextCtrl::CanPaste() { return SendMsg(2173, 0, 0) != 0; } -// Are there any undoable actions in the undo history. +// Are there any undoable actions in the undo history? bool wxStyledTextCtrl::CanUndo() { return SendMsg(2174, 0, 0) != 0; } @@ -1145,18 +1245,18 @@ void wxStyledTextCtrl::Clear() { // 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*)wx2stc(text)); } // 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 stc2wx(buf); } // Retrieve the number of characters in the document. @@ -1164,7 +1264,7 @@ int wxStyledTextCtrl::GetTextLength() { return SendMsg(2183, 0, 0); } -// Set to overtype (true) or insert mode +// Set to overtype (true) or insert mode. void wxStyledTextCtrl::SetOvertype(bool overtype) { SendMsg(2186, overtype, 0); } @@ -1174,12 +1274,12 @@ bool wxStyledTextCtrl::GetOvertype() { return SendMsg(2187, 0, 0) != 0; } -// Set the width of the insert mode caret +// Set the width of the insert mode caret. void wxStyledTextCtrl::SetCaretWidth(int pixelWidth) { SendMsg(2188, pixelWidth, 0); } -// Returns the width of the insert mode caret +// Returns the width of the insert mode caret. int wxStyledTextCtrl::GetCaretWidth() { return SendMsg(2189, 0, 0); } @@ -1207,48 +1307,48 @@ int wxStyledTextCtrl::GetTargetEnd() { } // Replace the target text with the argument text. -// Text is counted so it can contain nulls. +// Text is counted so it can contain NULs. // Returns the length of the replacement text. - int wxStyledTextCtrl::ReplaceTarget(const wxString& text) { - return SendMsg(2194, text.Len(), (long)text.c_str()); - + int wxStyledTextCtrl::ReplaceTarget(const wxString& text) { + wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); + return SendMsg(2194, strlen(buf), (long)(const char*)buf); } // Replace the target text with the argument text after \d processing. -// Text is counted so it can contain nulls. +// Text is counted so it can contain NULs. // Looks for \d where d is between 1 and 9 and replaces these with the strings // matched in the last search operation which were surrounded by \( and \). // Returns the length of the replacement text including any change // caused by processing the \d patterns. - int wxStyledTextCtrl::ReplaceTargetRE(const wxString& text) { - return SendMsg(2195, text.Len(), (long)text.c_str()); - + int wxStyledTextCtrl::ReplaceTargetRE(const wxString& text) { + wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); + return SendMsg(2195, strlen(buf), (long)(const char*)buf); } // Search for a counted string in the target and set the target to the found -// range. Text is counted so it can contain nulls. +// range. Text is counted so it can contain NULs. // 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()); - + int wxStyledTextCtrl::SearchInTarget(const wxString& text) { + wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); + return SendMsg(2197, strlen(buf), (long)(const char*)buf); } -// Set the search flags used by SearchInTarget +// Set the search flags used by SearchInTarget. void wxStyledTextCtrl::SetSearchFlags(int flags) { SendMsg(2198, flags, 0); } -// Get the search flags used by SearchInTarget +// Get the search flags used by SearchInTarget. int wxStyledTextCtrl::GetSearchFlags() { return SendMsg(2199, 0, 0); } // 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*)wx2stc(definition)); } // Remove the call tip from the screen. @@ -1276,6 +1376,16 @@ void wxStyledTextCtrl::CallTipSetBackground(const wxColour& back) { SendMsg(2205, wxColourAsLong(back), 0); } +// Set the foreground colour for the call tip. +void wxStyledTextCtrl::CallTipSetForeground(const wxColour& fore) { + SendMsg(2206, wxColourAsLong(fore), 0); +} + +// Set the foreground colour for the highlighted part of the call tip. +void wxStyledTextCtrl::CallTipSetForegroundHighlight(const wxColour& fore) { + SendMsg(2207, wxColourAsLong(fore), 0); +} + // Find the display line of a document line taking hidden lines into account. int wxStyledTextCtrl::VisibleFromDocLine(int line) { return SendMsg(2220, line, 0); @@ -1343,7 +1453,7 @@ void wxStyledTextCtrl::EnsureVisible(int line) { SendMsg(2232, line, 0); } -// Set some debugging options for folding +// Set some style options for folding. void wxStyledTextCtrl::SetFoldFlags(int flags) { SendMsg(2233, flags, 0); } @@ -1354,7 +1464,7 @@ void wxStyledTextCtrl::EnsureVisibleEnforcePolicy(int line) { SendMsg(2234, line, 0); } -// Sets whether a tab pressed when caret is within indentation indents +// Sets whether a tab pressed when caret is within indentation indents. void wxStyledTextCtrl::SetTabIndents(bool tabIndents) { SendMsg(2260, tabIndents, 0); } @@ -1364,7 +1474,7 @@ bool wxStyledTextCtrl::GetTabIndents() { return SendMsg(2261, 0, 0) != 0; } -// Sets whether a backspace pressed when caret is within indentation unindents +// Sets whether a backspace pressed when caret is within indentation unindents. void wxStyledTextCtrl::SetBackSpaceUnIndents(bool bsUnIndents) { SendMsg(2262, bsUnIndents, 0); } @@ -1374,22 +1484,421 @@ bool wxStyledTextCtrl::GetBackSpaceUnIndents() { return SendMsg(2263, 0, 0) != 0; } -// Sets the time the mouse must sit still to generate a mouse dwell event +// Sets the time the mouse must sit still to generate a mouse dwell event. void wxStyledTextCtrl::SetMouseDwellTime(int periodMilliseconds) { SendMsg(2264, periodMilliseconds, 0); } -// Retrieve the time the mouse must sit still to generate a mouse dwell event +// Retrieve the time the mouse must sit still to generate a mouse dwell event. int wxStyledTextCtrl::GetMouseDwellTime() { return SendMsg(2265, 0, 0); } -// Move the caret inside current view if it's not there already +// 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); +} + +// Sets the document width assumed for scrolling. +void wxStyledTextCtrl::SetScrollWidth(int pixelWidth) { + SendMsg(2274, pixelWidth, 0); +} + +// Retrieve the document width assumed for scrolling. +int wxStyledTextCtrl::GetScrollWidth() { + return SendMsg(2275, 0, 0); +} + +// Measure the pixel width of some text in a particular style. +// NUL terminated text argument. +// Does not handle tab or control characters. +int wxStyledTextCtrl::TextWidth(int style, const wxString& text) { + return SendMsg(2276, style, (long)(const char*)wx2stc(text)); +} + +// Sets the scroll range so that maximum scroll position has +// the last line at the bottom of the view (default). +// Setting this to false allows scrolling one page below the last line. +void wxStyledTextCtrl::SetEndAtLastLine(bool endAtLastLine) { + SendMsg(2277, endAtLastLine, 0); +} + +// Retrieve whether the maximum scroll position has the last +// line at the bottom of the view. +int wxStyledTextCtrl::GetEndAtLastLine() { + return SendMsg(2278, 0, 0); +} + +// Retrieve the height of a particular line of text in pixels. +int wxStyledTextCtrl::TextHeight(int line) { + return SendMsg(2279, line, 0); +} + +// Show or hide the vertical scroll bar. +void wxStyledTextCtrl::SetUseVerticalScrollBar(bool show) { + SendMsg(2280, show, 0); +} + +// Is the vertical scroll bar visible? +bool wxStyledTextCtrl::GetUseVerticalScrollBar() { + return SendMsg(2281, 0, 0) != 0; +} + +// Append a string to the end of the document without changing the selection. +void wxStyledTextCtrl::AppendText(int length, const wxString& text) { + SendMsg(2282, length, (long)(const char*)wx2stc(text)); +} + +// Is drawing done in two phases with backgrounds drawn before foregrounds? +bool wxStyledTextCtrl::GetTwoPhaseDraw() { + return SendMsg(2283, 0, 0) != 0; +} + +// In twoPhaseDraw mode, drawing is performed in two phases, first the background +// and then the foreground. This avoids chopping off characters that overlap the next run. +void wxStyledTextCtrl::SetTwoPhaseDraw(bool twoPhase) { + SendMsg(2284, twoPhase, 0); +} + +// Make the target range start and end be the same as the selection range start and end. +void wxStyledTextCtrl::TargetFromSelection() { + SendMsg(2287, 0, 0); +} + +// Join the lines in the target. +void wxStyledTextCtrl::LinesJoin() { + SendMsg(2288, 0, 0); +} + +// Split the lines in the target into lines that are less wide than pixelWidth +// where possible. +void wxStyledTextCtrl::LinesSplit(int pixelWidth) { + SendMsg(2289, pixelWidth, 0); +} + +// Set the colours used as a chequerboard pattern in the fold margin +void wxStyledTextCtrl::SetFoldMarginColour(bool useSetting, const wxColour& back) { + SendMsg(2290, useSetting, wxColourAsLong(back)); +} +void wxStyledTextCtrl::SetFoldMarginHiColour(bool useSetting, const wxColour& fore) { + SendMsg(2291, useSetting, wxColourAsLong(fore)); +} + +// Move caret down one line. +void wxStyledTextCtrl::LineDown() { + SendMsg(2300, 0, 0); +} + +// Move caret down one line extending selection to new caret position. +void wxStyledTextCtrl::LineDownExtend() { + SendMsg(2301, 0, 0); +} + +// Move caret up one line. +void wxStyledTextCtrl::LineUp() { + SendMsg(2302, 0, 0); +} + +// Move caret up one line extending selection to new caret position. +void wxStyledTextCtrl::LineUpExtend() { + SendMsg(2303, 0, 0); +} + +// Move caret left one character. +void wxStyledTextCtrl::CharLeft() { + SendMsg(2304, 0, 0); +} + +// Move caret left one character extending selection to new caret position. +void wxStyledTextCtrl::CharLeftExtend() { + SendMsg(2305, 0, 0); +} + +// Move caret right one character. +void wxStyledTextCtrl::CharRight() { + SendMsg(2306, 0, 0); +} + +// Move caret right one character extending selection to new caret position. +void wxStyledTextCtrl::CharRightExtend() { + SendMsg(2307, 0, 0); +} + +// Move caret left one word. +void wxStyledTextCtrl::WordLeft() { + SendMsg(2308, 0, 0); +} + +// Move caret left one word extending selection to new caret position. +void wxStyledTextCtrl::WordLeftExtend() { + SendMsg(2309, 0, 0); +} + +// Move caret right one word. +void wxStyledTextCtrl::WordRight() { + SendMsg(2310, 0, 0); +} + +// Move caret right one word extending selection to new caret position. +void wxStyledTextCtrl::WordRightExtend() { + SendMsg(2311, 0, 0); +} + +// Move caret to first position on line. +void wxStyledTextCtrl::Home() { + SendMsg(2312, 0, 0); +} + +// Move caret to first position on line extending selection to new caret position. +void wxStyledTextCtrl::HomeExtend() { + SendMsg(2313, 0, 0); +} + +// Move caret to last position on line. +void wxStyledTextCtrl::LineEnd() { + SendMsg(2314, 0, 0); +} + +// Move caret to last position on line extending selection to new caret position. +void wxStyledTextCtrl::LineEndExtend() { + SendMsg(2315, 0, 0); +} + +// Move caret to first position in document. +void wxStyledTextCtrl::DocumentStart() { + SendMsg(2316, 0, 0); +} + +// Move caret to first position in document extending selection to new caret position. +void wxStyledTextCtrl::DocumentStartExtend() { + SendMsg(2317, 0, 0); +} + +// Move caret to last position in document. +void wxStyledTextCtrl::DocumentEnd() { + SendMsg(2318, 0, 0); +} + +// Move caret to last position in document extending selection to new caret position. +void wxStyledTextCtrl::DocumentEndExtend() { + SendMsg(2319, 0, 0); +} + +// Move caret one page up. +void wxStyledTextCtrl::PageUp() { + SendMsg(2320, 0, 0); +} + +// Move caret one page up extending selection to new caret position. +void wxStyledTextCtrl::PageUpExtend() { + SendMsg(2321, 0, 0); +} + +// Move caret one page down. +void wxStyledTextCtrl::PageDown() { + SendMsg(2322, 0, 0); +} + +// Move caret one page down extending selection to new caret position. +void wxStyledTextCtrl::PageDownExtend() { + SendMsg(2323, 0, 0); +} + +// Switch from insert to overtype mode or the reverse. +void wxStyledTextCtrl::EditToggleOvertype() { + SendMsg(2324, 0, 0); +} + +// Cancel any modes such as call tip or auto-completion list display. +void wxStyledTextCtrl::Cancel() { + SendMsg(2325, 0, 0); +} + +// Delete the selection or if no selection, the character before the caret. +void wxStyledTextCtrl::DeleteBack() { + SendMsg(2326, 0, 0); +} + +// If selection is empty or all on one line replace the selection with a tab character. +// If more than one line selected, indent the lines. +void wxStyledTextCtrl::Tab() { + SendMsg(2327, 0, 0); +} + +// Dedent the selected lines. +void wxStyledTextCtrl::BackTab() { + SendMsg(2328, 0, 0); +} + +// Insert a new line, may use a CRLF, CR or LF depending on EOL mode. +void wxStyledTextCtrl::NewLine() { + SendMsg(2329, 0, 0); +} + +// Insert a Form Feed character. +void wxStyledTextCtrl::FormFeed() { + SendMsg(2330, 0, 0); +} + +// Move caret to before first visible character on line. +// If already there move to first character on line. +void wxStyledTextCtrl::VCHome() { + SendMsg(2331, 0, 0); +} + +// Like VCHome but extending selection to new caret position. +void wxStyledTextCtrl::VCHomeExtend() { + SendMsg(2332, 0, 0); +} + +// Magnify the displayed text by increasing the sizes by 1 point. +void wxStyledTextCtrl::ZoomIn() { + SendMsg(2333, 0, 0); +} + +// Make the displayed text smaller by decreasing the sizes by 1 point. +void wxStyledTextCtrl::ZoomOut() { + SendMsg(2334, 0, 0); +} + +// Delete the word to the left of the caret. +void wxStyledTextCtrl::DelWordLeft() { + SendMsg(2335, 0, 0); +} + +// Delete the word to the right of the caret. +void wxStyledTextCtrl::DelWordRight() { + SendMsg(2336, 0, 0); +} + +// Cut the line containing the caret. +void wxStyledTextCtrl::LineCut() { + SendMsg(2337, 0, 0); +} + +// Delete the line containing the caret. +void wxStyledTextCtrl::LineDelete() { + SendMsg(2338, 0, 0); +} + +// Switch the current line with the previous. +void wxStyledTextCtrl::LineTranspose() { + SendMsg(2339, 0, 0); +} + +// Duplicate the current line. +void wxStyledTextCtrl::LineDuplicate() { + SendMsg(2404, 0, 0); +} + +// Transform the selection to lower case. +void wxStyledTextCtrl::LowerCase() { + SendMsg(2340, 0, 0); +} + +// Transform the selection to upper case. +void wxStyledTextCtrl::UpperCase() { + SendMsg(2341, 0, 0); +} + +// Scroll the document down, keeping the caret visible. +void wxStyledTextCtrl::LineScrollDown() { + SendMsg(2342, 0, 0); +} + +// Scroll the document up, keeping the caret visible. +void wxStyledTextCtrl::LineScrollUp() { + SendMsg(2343, 0, 0); +} + +// Delete the selection or if no selection, the character before the caret. +// Will not delete the character before at the start of a line. +void wxStyledTextCtrl::DeleteBackNotLine() { + SendMsg(2344, 0, 0); +} + +// Move caret to first position on display line. +void wxStyledTextCtrl::HomeDisplay() { + SendMsg(2345, 0, 0); +} + +// Move caret to first position on display line extending selection to +// new caret position. +void wxStyledTextCtrl::HomeDisplayExtend() { + SendMsg(2346, 0, 0); +} + +// Move caret to last position on display line. +void wxStyledTextCtrl::LineEndDisplay() { + SendMsg(2347, 0, 0); +} + +// Move caret to last position on display line extending selection to new +// caret position. +void wxStyledTextCtrl::LineEndDisplayExtend() { + SendMsg(2348, 0, 0); +} + +// These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)? +// except they behave differently when word-wrap is enabled: +// They go first to the start / end of the display line, like (Home|LineEnd)Display +// The difference is that, the cursor is already at the point, it goes on to the start +// or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?. +void wxStyledTextCtrl::HomeWrap() { + SendMsg(2349, 0, 0); +} +void wxStyledTextCtrl::HomeWrapExtend() { + SendMsg(2450, 0, 0); +} +void wxStyledTextCtrl::LineEndWrap() { + SendMsg(2451, 0, 0); +} +void wxStyledTextCtrl::LineEndWrapExtend() { + SendMsg(2452, 0, 0); +} +void wxStyledTextCtrl::VCHomeWrap() { + SendMsg(2453, 0, 0); +} +void wxStyledTextCtrl::VCHomeWrapExtend() { + SendMsg(2454, 0, 0); +} + +// Copy the line containing the caret. +void wxStyledTextCtrl::LineCopy() { + SendMsg(2455, 0, 0); +} + +// Move the caret inside current view if it's not there already. void wxStyledTextCtrl::MoveCaretInsideView() { SendMsg(2401, 0, 0); } -// How many characters are on a line, not including end of line characters. +// How many characters are on a line, not including end of line characters? int wxStyledTextCtrl::LineLength(int line) { return SendMsg(2350, line, 0); } @@ -1409,24 +1918,24 @@ int wxStyledTextCtrl::BraceMatch(int pos) { return SendMsg(2353, pos, 0); } -// Are the end of line characters visible. +// Are the end of line characters visible? bool wxStyledTextCtrl::GetViewEOL() { return SendMsg(2355, 0, 0) != 0; } -// Make the end of line characters visible or invisible +// Make the end of line characters visible or invisible. void wxStyledTextCtrl::SetViewEOL(bool visible) { SendMsg(2356, visible, 0); } // Retrieve a pointer to the document object. void* wxStyledTextCtrl::GetDocPointer() { - return (void*)SendMsg(2357); + return (void*)SendMsg(2357); } // Change the document object used. void wxStyledTextCtrl::SetDocPointer(void* docPointer) { - SendMsg(2358, 0, (long)docPointer); + SendMsg(2358, 0, (long)docPointer); } // Set which document modification events are sent to the container. @@ -1475,18 +1984,13 @@ void wxStyledTextCtrl::SearchAnchor() { // 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*)wx2stc(text)); } // 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()); -} - -// Set the way the line the caret is on is kept visible. -void wxStyledTextCtrl::SetCaretPolicy(int caretPolicy, int caretSlop) { - SendMsg(2369, caretPolicy, caretSlop); + return SendMsg(2368, flags, (long)(const char*)wx2stc(text)); } // Retrieves the number of lines completely visible. @@ -1500,7 +2004,7 @@ void wxStyledTextCtrl::UsePopUp(bool allowPopUp) { SendMsg(2371, allowPopUp, 0); } -// Is the selection a rectangular. The alternative is the more common stream selection. +// Is the selection rectangular? The alternative is the more common stream selection. bool wxStyledTextCtrl::SelectionIsRectangle() { return SendMsg(2372, 0, 0) != 0; } @@ -1519,17 +2023,17 @@ int wxStyledTextCtrl::GetZoom() { // Create a new document object. // Starts with reference count of 1 and not selected into editor. void* wxStyledTextCtrl::CreateDocument() { - return (void*)SendMsg(2375); + return (void*)SendMsg(2375); } // Extend life of document. void wxStyledTextCtrl::AddRefDocument(void* docPointer) { - SendMsg(2376, (long)docPointer); + SendMsg(2376, 0, (long)docPointer); } // Release a reference to the document, deleting document if it fades to black. void wxStyledTextCtrl::ReleaseDocument(void* docPointer) { - SendMsg(2377, (long)docPointer); + SendMsg(2377, 0, (long)docPointer); } // Get which document modification events are sent to the container. @@ -1537,81 +2041,310 @@ int wxStyledTextCtrl::GetModEventMask() { return SendMsg(2378, 0, 0); } -// Change internal focus flag +// Change internal focus flag. void wxStyledTextCtrl::SetSTCFocus(bool focus) { SendMsg(2380, focus, 0); } -// Get internal focus flag +// Get internal focus flag. bool wxStyledTextCtrl::GetSTCFocus() { return SendMsg(2381, 0, 0) != 0; } -// Change error status - 0 = OK +// Change error status - 0 = OK. void wxStyledTextCtrl::SetStatus(int statusCode) { SendMsg(2382, statusCode, 0); } -// Get error status +// Get error status. int wxStyledTextCtrl::GetStatus() { return SendMsg(2383, 0, 0); } -// Set whether the mouse is captured when its button is pressed +// Set whether the mouse is captured when its button is pressed. void wxStyledTextCtrl::SetMouseDownCaptures(bool captures) { SendMsg(2384, captures, 0); } -// Get whether mouse gets captured +// Get whether mouse gets captured. bool wxStyledTextCtrl::GetMouseDownCaptures() { return SendMsg(2385, 0, 0) != 0; } -// Sets the cursor to one of the SC_CURSOR* values -void wxStyledTextCtrl::SetCursor(int cursorType) { +// Sets the cursor to one of the SC_CURSOR* values. +void wxStyledTextCtrl::SetSTCCursor(int cursorType) { SendMsg(2386, cursorType, 0); } -// Get cursor type -int wxStyledTextCtrl::GetCursor() { +// Get cursor type. +int wxStyledTextCtrl::GetSTCCursor() { return SendMsg(2387, 0, 0); } -// Move to the previous change in capitalistion +// 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 capitalisation. void wxStyledTextCtrl::WordPartLeft() { SendMsg(2390, 0, 0); } -// Move to the previous change in capitalistion extending selection to new caret position. +// Move to the previous change in capitalisation extending selection +// to new caret position. void wxStyledTextCtrl::WordPartLeftExtend() { SendMsg(2391, 0, 0); } -// Move to the change next in capitalistion +// Move to the change next in capitalisation. void wxStyledTextCtrl::WordPartRight() { SendMsg(2392, 0, 0); } -// Move to the next change in capitalistion extending selection to new caret position. +// Move to the next change in capitalisation extending selection +// to new caret position. void wxStyledTextCtrl::WordPartRightExtend() { SendMsg(2393, 0, 0); } -// Set the way the display area is determined when a particular line is to be moved to. +// Set the way the display area is determined when a particular line +// is to be moved to by Find, FindNext, GotoLine, etc. void wxStyledTextCtrl::SetVisiblePolicy(int visiblePolicy, int visibleSlop) { SendMsg(2394, visiblePolicy, visibleSlop); } -// Delete back from the current position to the start of the line +// Delete back from the current position to the start of the line. void wxStyledTextCtrl::DelLineLeft() { SendMsg(2395, 0, 0); } -// Delete forwards from the current position to the end of the line +// Delete forwards from the current position to the end of the line. void wxStyledTextCtrl::DelLineRight() { 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); +} + +// Set the last x chosen value to be the caret x position. +void wxStyledTextCtrl::ChooseCaretX() { + SendMsg(2399, 0, 0); +} + +// Set the way the caret is kept visible when going sideway. +// The exclusion zone is given in pixels. +void wxStyledTextCtrl::SetXCaretPolicy(int caretPolicy, int caretSlop) { + SendMsg(2402, caretPolicy, caretSlop); +} + +// Set the way the line the caret is on is kept visible. +// The exclusion zone is given in lines. +void wxStyledTextCtrl::SetYCaretPolicy(int caretPolicy, int caretSlop) { + SendMsg(2403, caretPolicy, caretSlop); +} + +// Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE). +void wxStyledTextCtrl::SetPrintWrapMode(int mode) { + SendMsg(2406, mode, 0); +} + +// Is printing line wrapped? +int wxStyledTextCtrl::GetPrintWrapMode() { + return SendMsg(2407, 0, 0); +} + +// Set a fore colour for active hotspots. +void wxStyledTextCtrl::SetHotspotActiveForeground(bool useSetting, const wxColour& fore) { + SendMsg(2410, useSetting, wxColourAsLong(fore)); +} + +// Set a back colour for active hotspots. +void wxStyledTextCtrl::SetHotspotActiveBackground(bool useSetting, const wxColour& back) { + SendMsg(2411, useSetting, wxColourAsLong(back)); +} + +// Enable / Disable underlining active hotspots. +void wxStyledTextCtrl::SetHotspotActiveUnderline(bool underline) { + SendMsg(2412, underline, 0); +} + +// Limit hotspots to single line so hotspots on two lines don't merge. +void wxStyledTextCtrl::SetHotspotSingleLine(bool singleLine) { + SendMsg(2421, singleLine, 0); +} + +// Move caret between paragraphs (delimited by empty lines). +void wxStyledTextCtrl::ParaDown() { + SendMsg(2413, 0, 0); +} +void wxStyledTextCtrl::ParaDownExtend() { + SendMsg(2414, 0, 0); +} +void wxStyledTextCtrl::ParaUp() { + SendMsg(2415, 0, 0); +} +void wxStyledTextCtrl::ParaUpExtend() { + SendMsg(2416, 0, 0); +} + +// Given a valid document position, return the previous position taking code +// page into account. Returns 0 if passed 0. +int wxStyledTextCtrl::PositionBefore(int pos) { + return SendMsg(2417, pos, 0); +} + +// Given a valid document position, return the next position taking code +// page into account. Maximum value returned is the last position in the document. +int wxStyledTextCtrl::PositionAfter(int pos) { + return SendMsg(2418, pos, 0); +} + +// Copy a range of text to the clipboard. Positions are clipped into the document. +void wxStyledTextCtrl::CopyRange(int start, int end) { + SendMsg(2419, start, end); +} + +// Copy argument text to the clipboard. +void wxStyledTextCtrl::CopyText(int length, const wxString& text) { + SendMsg(2420, length, (long)(const char*)wx2stc(text)); +} + +// Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE) or +// by lines (SC_SEL_LINES). +void wxStyledTextCtrl::SetSelectionMode(int mode) { + SendMsg(2422, mode, 0); +} + +// Get the mode of the current selection. +int wxStyledTextCtrl::GetSelectionMode() { + return SendMsg(2423, 0, 0); +} + +// Retrieve the position of the start of the selection at the given line (INVALID_POSITION if no selection on this line). +int wxStyledTextCtrl::GetLineSelStartPosition(int line) { + return SendMsg(2424, line, 0); +} + +// Retrieve the position of the end of the selection at the given line (INVALID_POSITION if no selection on this line). +int wxStyledTextCtrl::GetLineSelEndPosition(int line) { + return SendMsg(2425, line, 0); +} + +// Move caret down one line, extending rectangular selection to new caret position. +void wxStyledTextCtrl::LineDownRectExtend() { + SendMsg(2426, 0, 0); +} + +// Move caret up one line, extending rectangular selection to new caret position. +void wxStyledTextCtrl::LineUpRectExtend() { + SendMsg(2427, 0, 0); +} + +// Move caret left one character, extending rectangular selection to new caret position. +void wxStyledTextCtrl::CharLeftRectExtend() { + SendMsg(2428, 0, 0); +} + +// Move caret right one character, extending rectangular selection to new caret position. +void wxStyledTextCtrl::CharRightRectExtend() { + SendMsg(2429, 0, 0); +} + +// Move caret to first position on line, extending rectangular selection to new caret position. +void wxStyledTextCtrl::HomeRectExtend() { + SendMsg(2430, 0, 0); +} + +// Move caret to before first visible character on line. +// If already there move to first character on line. +// In either case, extend rectangular selection to new caret position. +void wxStyledTextCtrl::VCHomeRectExtend() { + SendMsg(2431, 0, 0); +} + +// Move caret to last position on line, extending rectangular selection to new caret position. +void wxStyledTextCtrl::LineEndRectExtend() { + SendMsg(2432, 0, 0); +} + +// Move caret one page up, extending rectangular selection to new caret position. +void wxStyledTextCtrl::PageUpRectExtend() { + SendMsg(2433, 0, 0); +} + +// Move caret one page down, extending rectangular selection to new caret position. +void wxStyledTextCtrl::PageDownRectExtend() { + SendMsg(2434, 0, 0); +} + +// Move caret to top of page, or one page up if already at top of page. +void wxStyledTextCtrl::StutteredPageUp() { + SendMsg(2435, 0, 0); +} + +// Move caret to top of page, or one page up if already at top of page, extending selection to new caret position. +void wxStyledTextCtrl::StutteredPageUpExtend() { + SendMsg(2436, 0, 0); +} + +// Move caret to bottom of page, or one page down if already at bottom of page. +void wxStyledTextCtrl::StutteredPageDown() { + SendMsg(2437, 0, 0); +} + +// Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position. +void wxStyledTextCtrl::StutteredPageDownExtend() { + SendMsg(2438, 0, 0); +} + +// Move caret left one word, position cursor at end of word. +void wxStyledTextCtrl::WordLeftEnd() { + SendMsg(2439, 0, 0); +} + +// Move caret left one word, position cursor at end of word, extending selection to new caret position. +void wxStyledTextCtrl::WordLeftEndExtend() { + SendMsg(2440, 0, 0); +} + +// Move caret right one word, position cursor at end of word. +void wxStyledTextCtrl::WordRightEnd() { + SendMsg(2441, 0, 0); +} + +// Move caret right one word, position cursor at end of word, extending selection to new caret position. +void wxStyledTextCtrl::WordRightEndExtend() { + SendMsg(2442, 0, 0); +} + +// Set the set of characters making up whitespace for when moving or selecting by word. +// Should be called after SetWordChars. +void wxStyledTextCtrl::SetWhitespaceChars(const wxString& characters) { + SendMsg(2443, 0, (long)(const char*)wx2stc(characters)); +} + +// Reset the set of characters for whitespace and word characters to the defaults. +void wxStyledTextCtrl::SetCharsDefault() { + SendMsg(2444, 0, 0); +} + +// Get currently selected item position in the auto-completion list +int wxStyledTextCtrl::AutoCompGetCurrent() { + return SendMsg(2445, 0, 0); +} + // Start notifying the container of all key presses and commands. void wxStyledTextCtrl::StartRecord() { SendMsg(3001, 0, 0); @@ -1639,17 +2372,17 @@ void wxStyledTextCtrl::Colourise(int start, int end) { // 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*)wx2stc(key), (long)(const char*)wx2stc(value)); } // 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*)wx2stc(keyWords)); } // 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*)wx2stc(language)); } // END of generated section @@ -1677,38 +2410,38 @@ int wxStyledTextCtrl::GetCurrentLine() { // 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)); } } @@ -1717,6 +2450,11 @@ void wxStyledTextCtrl::StyleSetSpec(int styleNum, const wxString& spec) { // Set style size, face, bold, italic, and underline attributes from // a wxFont's attributes. void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) { +#ifdef __WXGTK__ + // Ensure that the native font is initialized + int x, y; + GetTextExtent(wxT("X"), &x, &y, NULL, NULL, &font); +#endif int size = font.GetPointSize(); wxString faceName = font.GetFaceName(); bool bold = font.GetWeight() == wxBOLD; @@ -1783,15 +2521,86 @@ void wxStyledTextCtrl::ScrollToColumn(int column) { } +bool wxStyledTextCtrl::SaveFile(const wxString& filename) +{ + wxFile file(filename, wxFile::write); + + if (!file.IsOpened()) + return FALSE; + + bool success = file.Write(GetText(), *wxConvCurrent); + + if (success) + SetSavePoint(); + + return success; +} + +bool wxStyledTextCtrl::LoadFile(const wxString& filename) +{ + bool success = false; + wxFile file(filename, wxFile::read); + + if (file.IsOpened()) + { + wxString contents; + off_t len = file.Length(); + if (len > 0) + { +#if wxUSE_UNICODE + wxMemoryBuffer buffer(len+1); + success = (file.Read(buffer.GetData(), len) == len); + if (success) { + ((char*)buffer.GetData())[len] = 0; + contents = wxString(buffer, *wxConvCurrent, len); + } +#else + wxString buffer; + success = (file.Read(wxStringBuffer(buffer, len), len) == len); + contents = buffer; +#endif + } + else + success = true; // empty file is ok + + if (success) + { + SetText(contents); + EmptyUndoBuffer(); + SetSavePoint(); + } + } + + return success; +} + + +#if wxUSE_DRAG_AND_DROP +wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { + return m_swx->DoDragOver(x, y, def); +} + + +bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { + return m_swx->DoDropText(x, y, data); +} +#endif + + +void wxStyledTextCtrl::SetUseAntiAliasing(bool useAA) { + m_swx->SetUseAntiAliasing(useAA); +} + +bool wxStyledTextCtrl::GetUseAntiAliasing() { + return m_swx->GetUseAntiAliasing(); +} //---------------------------------------------------------------------- // Event handlers -void wxStyledTextCtrl::OnPaint(wxPaintEvent& evt) { +void wxStyledTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(evt)) { wxPaintDC dc(this); - wxRegion region = GetUpdateRegion(); - - m_swx->DoPaint(&dc, region.GetBox()); + m_swx->DoPaint(&dc, GetUpdateRegion().GetBox()); } void wxStyledTextCtrl::OnScrollWin(wxScrollWinEvent& evt) { @@ -1801,32 +2610,64 @@ void wxStyledTextCtrl::OnScrollWin(wxScrollWinEvent& evt) { m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition()); } -void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) { - wxSize sz = GetClientSize(); - m_swx->DoSize(sz.x, sz.y); +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& WXUNUSED(evt)) { + if (m_swx) { + wxSize sz = GetClientSize(); + m_swx->DoSize(sz.x, sz.y); + } } void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) { + SetFocus(); wxPoint pt = evt.GetPosition(); - m_swx->DoButtonDown(Point(pt.x, pt.y), m_stopWatch.Time(), + m_swx->DoLeftButtonDown(Point(pt.x, pt.y), m_stopWatch.Time(), evt.ShiftDown(), evt.ControlDown(), evt.AltDown()); } void wxStyledTextCtrl::OnMouseMove(wxMouseEvent& evt) { wxPoint pt = evt.GetPosition(); - m_swx->DoButtonMove(Point(pt.x, pt.y)); + m_swx->DoLeftButtonMove(Point(pt.x, pt.y)); } void wxStyledTextCtrl::OnMouseLeftUp(wxMouseEvent& evt) { wxPoint pt = evt.GetPosition(); - m_swx->DoButtonUp(Point(pt.x, pt.y), m_stopWatch.Time(), + m_swx->DoLeftButtonUp(Point(pt.x, pt.y), m_stopWatch.Time(), evt.ControlDown()); } +void wxStyledTextCtrl::OnMouseRightUp(wxMouseEvent& evt) { + wxPoint pt = evt.GetPosition(); + m_swx->DoContextMenu(Point(pt.x, pt.y)); +} + + +void wxStyledTextCtrl::OnMouseMiddleUp(wxMouseEvent& evt) { + wxPoint pt = evt.GetPosition(); + m_swx->DoMiddleButtonUp(Point(pt.x, pt.y)); +} + void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) { wxPoint pt = evt.GetPosition(); ScreenToClient(&pt.x, &pt.y); + /* + Show context menu at event point if it's within the window, + or at caret location if not + */ + wxHitTest ht = this->HitTest(pt); + if (ht != wxHT_WINDOW_INSIDE) { + pt = this->PointFromPosition(this->GetCurrentPos()); + } m_swx->DoContextMenu(Point(pt.x, pt.y)); } @@ -1835,19 +2676,12 @@ void wxStyledTextCtrl::OnMouseWheel(wxMouseEvent& evt) { m_swx->DoMouseWheel(evt.GetWheelRotation(), evt.GetWheelDelta(), evt.GetLinesPerAction(), - evt.ControlDown()); + evt.ControlDown(), + evt.IsPageScroll()); } 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??? - // \|@#¬[]{}?£$~ ã,õ,Ã,Õ, ñ, Ñ - // 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 @@ -1856,7 +2690,13 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) { bool alt = evt.AltDown(); bool skip = ((ctrl || alt) && ! (ctrl && alt)); - if (key <= 0xff && !iscntrl(key) && !m_lastKeyDownConsumed && !skip) { + int key = evt.GetKeyCode(); + +// printf("OnChar key:%d consumed:%d ctrl:%d alt:%d skip:%d\n", +// key, m_lastKeyDownConsumed, ctrl, alt, skip); + + if ( (key <= WXK_START || key > WXK_COMMAND) && + !m_lastKeyDownConsumed && !skip) { m_swx->DoAddChar(key); return; } @@ -1865,15 +2705,16 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) { 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(), + meta = evt.MetaDown(); - int processed = m_swx->DoKeyDown(key, shift, ctrl, alt, &m_lastKeyDownConsumed); + int processed = m_swx->DoKeyDown(key, shift, ctrl, alt, meta, &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(); @@ -1882,20 +2723,22 @@ void wxStyledTextCtrl::OnKeyDown(wxKeyEvent& evt) { void wxStyledTextCtrl::OnLoseFocus(wxFocusEvent& evt) { m_swx->DoLoseFocus(); + evt.Skip(); } void wxStyledTextCtrl::OnGainFocus(wxFocusEvent& evt) { m_swx->DoGainFocus(); + evt.Skip(); } -void wxStyledTextCtrl::OnSysColourChanged(wxSysColourChangedEvent& evt) { +void wxStyledTextCtrl::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(evt)) { m_swx->DoSysColourChange(); } -void wxStyledTextCtrl::OnEraseBackground(wxEraseEvent& evt) { +void wxStyledTextCtrl::OnEraseBackground(wxEraseEvent& WXUNUSED(evt)) { // do nothing to help avoid flashing } @@ -1906,11 +2749,24 @@ void wxStyledTextCtrl::OnMenu(wxCommandEvent& evt) { } -void wxStyledTextCtrl::OnListBox(wxCommandEvent& evt) { +void wxStyledTextCtrl::OnListBox(wxCommandEvent& WXUNUSED(evt)) { m_swx->DoOnListBox(); } +void wxStyledTextCtrl::OnIdle(wxIdleEvent& evt) { + m_swx->DoOnIdle(evt); +} + + +wxSize wxStyledTextCtrl::DoGetBestSize() const +{ + // What would be the best size for a wxSTC? + // Just give a reasonable minimum until something else can be figured out. + return wxSize(200,100); +} + + //---------------------------------------------------------------------- // Turn notifications from Scintilla into events @@ -1921,6 +2777,20 @@ void wxStyledTextCtrl::NotifyChange() { GetEventHandler()->ProcessEvent(evt); } + +static void SetEventText(wxStyledTextEvent& evt, const char* text, + size_t length) { + if(!text) return; + + // 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(length+1); + buf.AppendData((void*)text, length); + buf.AppendByte(0); + evt.SetText(stc2wx(buf)); +} + + void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) { SCNotification& scn = *_scn; wxStyledTextEvent evt(0, GetId()); @@ -1966,8 +2836,7 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) { case SCN_MODIFIED: evt.SetEventType(wxEVT_STC_MODIFIED); evt.SetModificationType(scn.modificationType); - if (scn.text) - evt.SetText(wxString(scn.text, scn.length)); + SetEventText(evt, scn.text, scn.length); evt.SetLength(scn.length); evt.SetLinesAdded(scn.linesAdded); evt.SetLine(scn.line); @@ -1992,10 +2861,6 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) { evt.SetLength(scn.length); break; - case SCN_POSCHANGED: - evt.SetEventType(wxEVT_STC_POSCHANGED); - break; - case SCN_PAINTED: evt.SetEventType(wxEVT_STC_PAINTED); break; @@ -2003,12 +2868,12 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) { case SCN_USERLISTSELECTION: evt.SetEventType(wxEVT_STC_USERLISTSELECTION); evt.SetListType(scn.listType); - evt.SetText(scn.text); + SetEventText(evt, scn.text, strlen(scn.text)); break; case SCN_URIDROPPED: evt.SetEventType(wxEVT_STC_URIDROPPED); - evt.SetText(scn.text); + SetEventText(evt, scn.text, strlen(scn.text)); break; case SCN_DWELLSTART: @@ -2023,6 +2888,22 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) { evt.SetY(scn.y); break; + case SCN_ZOOM: + evt.SetEventType(wxEVT_STC_ZOOM); + break; + + case SCN_HOTSPOTCLICK: + evt.SetEventType(wxEVT_STC_HOTSPOT_CLICK); + break; + + case SCN_HOTSPOTDOUBLECLICK: + evt.SetEventType(wxEVT_STC_HOTSPOT_DCLICK); + break; + + case SCN_CALLTIPCLICK: + evt.SetEventType(wxEVT_STC_CALLTIP_CLICK); + break; + default: return; } @@ -2054,8 +2935,8 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id) 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 } @@ -2064,35 +2945,35 @@ 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; +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; #if wxUSE_DRAG_AND_DROP - o->m_dragText = m_dragText; - o->m_dragAllowMove =m_dragAllowMove; - o->m_dragResult = m_dragResult; + m_dragResult = event.m_dragResult; #endif } @@ -2102,3 +2983,8 @@ void wxStyledTextEvent::CopyObject(wxObject& obj) const { + + + + +