diff options
| author | nyamatongwe <devnull@localhost> | 2000-05-04 11:35:09 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2000-05-04 11:35:09 +0000 |
| commit | 5bc8ef291a4669fa1e223e35eed77a2620223dc6 (patch) | |
| tree | 8574ccdab794d82fc10bd86e43938419cffe8057 | |
| parent | 3689e638aea103d4d5eed65d621cbc5e4b82d129 (diff) | |
| download | scintilla-mirror-5bc8ef291a4669fa1e223e35eed77a2620223dc6.tar.gz | |
Patched keypad patch to not apply when Ctrl pressed so magnification works again.
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 2 | ||||
| -rw-r--r-- | include/Scintilla.iface | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 65b8023d5..32b708696 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -807,7 +807,7 @@ gint ScintillaGTK::KeyPress(GtkWidget *, GdkEventKey *event, ScintillaGTK *sciTh int key = event->keyval; if (ctrl && (key < 128)) key = toupper(key); - else if (key >= GDK_KP_Multiply && key <= GDK_KP_9) + else if (!ctrl && (key >= GDK_KP_Multiply && key <= GDK_KP_9)) key &= 0x7F; else key = KeyTranslate(key); diff --git a/include/Scintilla.iface b/include/Scintilla.iface index 32297f772..e7f61202b 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -30,7 +30,8 @@ ## bool -> integer, 1=true, 0=false ## position -> integer position in a document ## colour -> colour integer containing red, green and blue bytes. -## string -> pointer to character +## string -> pointer to const character +## stringresult -> pointer to character ## cells -> pointer to array of cells, each cell containing a style byte and character byte ## textrange -> complex structure ## keymod -> integer containing key in low half and modifiers in high half @@ -49,13 +50,13 @@ val SCI_OPTIONAL_START=3000 val SCI_LEXER_START=4000 # Add text to the document -fun void AddText=2001(int length, string s) +fun void AddText=2001(int length, string text) # Add array of cells to document -fun void AddStyledText=2002(int length, cells s) +fun void AddStyledText=2002(int length, cells c) # Insert string at a position -fun void InsertText=2003(position pos, string s) +fun void InsertText=2003(position pos, string text) # Delete all text in the document fun void ClearAll=2004(,) @@ -123,7 +124,7 @@ fun void SetAnchor=2026(position posAnchor,) # Retrieve the text of the line containing the caret. # Returns the index of the caret on the line. -fun int GetCurLine=2027(,string text) +fun int GetCurLine=2027(,stringresult text) # Retrieve the position of the last correctly styled character. get position GetEndStyled=2028(,) @@ -951,7 +952,7 @@ fun int EM_GetSel=176(,) # Retrieve the selected text. # Return the length of the text. -fun int EM_GetSelText=1086(,string text) +fun int EM_GetSelText=1086(,stringresult text) # Retrieve a range of text. # Return the length of the text. @@ -1012,7 +1013,7 @@ fun void WM_Cut=768(,) # Retrieve all the text in the document. # Returns number of characters retrieved. -fun int WM_GetText=13(int length, string text) +fun int WM_GetText=13(int length, stringresult text) # Retrieve the number of characters in the document. fun void WM_GetTextLength=14(,) |