added possibility to throw different objects and crash directly from the main frame...

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

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 845ccb41f9558e427503b0bfa868740928877398..b3b3cd2765934fc9eee85b8337c6c9b373f1dd6f 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -46,7 +46,9 @@ static long wxColourAsLong(const wxColour& co) {
 
 static wxColour wxColourFromLong(long c) {
     wxColour clr;
 
 static wxColour wxColourFromLong(long c) {
     wxColour clr;

-    clr.Set(c & 0xff, (c >> 8) & 0xff, (c >> 16) & 0xff);
+    clr.Set((unsigned char)(c & 0xff),
+            (unsigned char)((c >> 8) & 0xff),
+            (unsigned char)((c >> 16) & 0xff));

     return clr;
 }
 
     return clr;
 }
 


@@ -60,7 +62,9 @@ static wxColour wxColourFromSpec(const wxString& spec) {
         spec.Mid(1,2).ToLong(&red,   16);
         spec.Mid(3,2).ToLong(&green, 16);
         spec.Mid(5,2).ToLong(&blue,  16);
         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);
+        return wxColour((unsigned char)red,
+                        (unsigned char)green,
+                        (unsigned char)blue);

     }
     else
         return wxColour(spec);
     }
     else
         return wxColour(spec);


@@ -2603,7 +2607,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
     if (file.IsOpened())
     {
         wxString contents;
     if (file.IsOpened())
     {
         wxString contents;

-        size_t len = (size_t)file.Length();
+        // get the file size (assume it is not huge file...)
+        ssize_t len = (ssize_t)file.Length();
+

         if (len > 0)
         {
 #if wxUSE_UNICODE
         if (len > 0)
         {
 #if wxUSE_UNICODE


@@ -2620,7 +2626,12 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
 #endif
         }
         else
 #endif
         }
         else

-            success = true;            // empty file is ok
+        {
+            if (len == 0)
+                success = true;  // empty file is ok
+            else
+                success = false; // len == wxInvalidOffset
+        }

 
         if (success)
         {
 
         if (success)
         {


@@ -2741,7 +2752,7 @@ void wxStyledTextCtrl::OnMouseWheel(wxMouseEvent& evt) {
 
 
 void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
 
 
 void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {

-    // On (some?) non-US keyboards the AltGr key is required to enter some
+    // On (some?) non-US PC 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
     // alt let's skip it.
     // 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
     // alt let's skip it.


@@ -2756,32 +2767,38 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
 #endif
     bool skip = ((ctrl || alt) && ! (ctrl && alt));
 
 #endif
     bool skip = ((ctrl || alt) && ! (ctrl && alt));
 

-    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;
+    if (!m_lastKeyDownConsumed && !skip) {
+#if wxUSE_UNICODE
+        int key = evt.GetUnicodeKey();
+        bool keyOk = true;
+
+        // if the unicode key code is not really a unicode character (it may
+        // 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) {
+            key = evt.GetKeyCode();
+            keyOk = (key <= 255);
+        }
+        if (keyOk) {
+            m_swx->DoAddChar(key);
+            return;
+        }
+#else
+        int key = evt.GetKeyCode();
+        if (key <= WXK_START || key > WXK_COMMAND) {
+            m_swx->DoAddChar(key);
+            return;
+        }
+#endif

     }
     }

+    

     evt.Skip();
 }
 
 
 void wxStyledTextCtrl::OnKeyDown(wxKeyEvent& evt) {
     evt.Skip();
 }
 
 
 void wxStyledTextCtrl::OnKeyDown(wxKeyEvent& evt) {

-    int key = evt.GetKeyCode();
-    bool shift = evt.ShiftDown(),
-         ctrl  = evt.ControlDown(),
-         alt   = evt.AltDown(),
-         meta  = evt.MetaDown();
-
-    int processed = m_swx->DoKeyDown(key, shift, ctrl, alt, meta, &m_lastKeyDownConsumed);
-
-//     printf("KeyDn  key:%d  shift:%d  ctrl:%d  alt:%d  processed:%d  consumed:%d\n",
-//            key, shift, ctrl, alt, processed, m_lastKeyDownConsumed);
-
+    int processed = m_swx->DoKeyDown(evt, &m_lastKeyDownConsumed);

     if (!processed && !m_lastKeyDownConsumed)
         evt.Skip();
 }
     if (!processed && !m_lastKeyDownConsumed)
         evt.Skip();
 }