X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce1ecc6d48415cf3b348e42b1e53ae2333d9098a..025292e998c62dd027dcbac732452e763a034f0f:/src/stc/stc.cpp?ds=sidebyside

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index a362eaf491..9b46ce0510 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -66,6 +66,23 @@ int wxForceScintillaLexers(void)
 
 const wxChar* wxSTCNameStr = "stcwindow";
 
+
+DEFINE_EVENT_TYPE( wxEVT_STC_CHANGE )
+DEFINE_EVENT_TYPE( wxEVT_STC_STYLENEEDED )
+DEFINE_EVENT_TYPE( wxEVT_STC_CHARADDED )
+DEFINE_EVENT_TYPE( wxEVT_STC_UPDATEUI )
+DEFINE_EVENT_TYPE( wxEVT_STC_SAVEPOINTREACHED )
+DEFINE_EVENT_TYPE( wxEVT_STC_SAVEPOINTLEFT )
+DEFINE_EVENT_TYPE( wxEVT_STC_ROMODIFYATTEMPT )
+DEFINE_EVENT_TYPE( wxEVT_STC_DOUBLECLICK )
+DEFINE_EVENT_TYPE( wxEVT_STC_MODIFIED )
+DEFINE_EVENT_TYPE( wxEVT_STC_KEY )
+DEFINE_EVENT_TYPE( wxEVT_STC_MACRORECORD )
+DEFINE_EVENT_TYPE( wxEVT_STC_MARGINCLICK )
+DEFINE_EVENT_TYPE( wxEVT_STC_NEEDSHOWN )
+DEFINE_EVENT_TYPE( wxEVT_STC_POSCHANGED )
+
+
 BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
     EVT_PAINT                   (wxStyledTextCtrl::OnPaint)
     EVT_SCROLLWIN               (wxStyledTextCtrl::OnScrollWin)
@@ -1481,7 +1498,6 @@ wxPoint wxStyledTextCtrl::PointFromPosition(int pos) {
     return wxPoint(x, y);
 }
 
-
 // Scroll enough to make the given line visible
 void wxStyledTextCtrl::ScrollToLine(int line) {
     m_swx->DoScrollToLine(line);
@@ -1494,6 +1510,7 @@ void wxStyledTextCtrl::ScrollToColumn(int column) {
 }
 
 
+
 //----------------------------------------------------------------------
 // Event handlers
 
@@ -1539,38 +1556,16 @@ void wxStyledTextCtrl::OnMouseRightUp(wxMouseEvent& evt) {
     m_swx->DoContextMenu(Point(pt.x, pt.y));
 }
 
-
 void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
     long key = evt.KeyCode();
-    switch (key) {
-        // Special handling for charcters that must be typed with AltGr down on
-        // foreign keyboards.  (Comes to us as Ctrl+Alt, and so would get
-        // filtered out by the default case below.)
-        //
-        // There should be a better way to do this...
-        //
-        case '\\':
-        case '|':
-        case '@':
-        case '#':
-        case '¬':
-        case '[':
-        case ']':
-        case '{':
-        case '}':
-        case '?':
-            m_swx->DoAddChar(key);
-            break;
-
-        default:
-            if ((key > WXK_ESCAPE) && (key != WXK_DELETE) && (key < 255) &&
-                !evt.ControlDown() && !evt.AltDown()) {
-
-                m_swx->DoAddChar(key);
-            }
-            else {
-                evt.Skip();
-            }
+    if ((key > WXK_ESCAPE) &&
+        (key != WXK_DELETE) && (key < 255) &&
+        !evt.ControlDown() && !evt.AltDown()) {
+
+        m_swx->DoAddChar(key);
+    }
+    else {
+        evt.Skip();
     }
 }
 
@@ -1583,7 +1578,6 @@ void wxStyledTextCtrl::OnKeyDown(wxKeyEvent& evt) {
         evt.Skip();
 }
 
-
 void wxStyledTextCtrl::OnLoseFocus(wxFocusEvent& evt) {
     m_swx->DoLoseFocus();
 }