applying OSAF patch for "toolbar selection not correct on Mac after calling Realize...

[wxWidgets.git] / src / stc / stc.cpp

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index b3b3cd2765934fc9eee85b8337c6c9b373f1dd6f..248ceb73e50c8fa4497fc5b7eaf555e91aa54a3f 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -178,6 +178,8 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
     SetCodePage(wxSTC_CP_UTF8);
 #endif
 
+    // Reduces flicker on GTK+/X11
+    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
     SetBestFittingSize(size);
 }
 
@@ -2408,6 +2410,12 @@ void wxStyledTextCtrl::Allocate(int bytes) {
     SendMsg(2446, bytes, 0);
 }
 
+// Find the position of a column on a line taking into account tabs and 
+// multi-byte characters. If beyond end of line, return line end position.
+int wxStyledTextCtrl::FindColumn(int line, int column) {
+    return SendMsg(2456, line, column);
+}
+
 // Start notifying the container of all key presses and commands.
 void wxStyledTextCtrl::StartRecord() {
     SendMsg(3001, 0, 0);
@@ -2776,9 +2784,9 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
         // be a function key or etc., the platforms appear to always give us a
         // small value in this case) then fallback to the ascii key code but
         // don't do anything for function keys or etc.
-        if (key <= 255) {
+        if (key <= 127) {
             key = evt.GetKeyCode();
-            keyOk = (key <= 255);
+            keyOk = (key <= 127);
         }
         if (keyOk) {
             m_swx->DoAddChar(key);