show error message if exec() failed: not pretty but better than nothing

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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index a45afda5a1b9d0eaa4b063ff863ac0a629d6b7aa..12ad21dafe4403a3aeab97d9023096c8c87ba02b 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -405,6 +405,11 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
 
 // This is called by the Editor base class whenever something is selected
 void ScintillaWX::ClaimSelection() {
+#if 0
+    // Until wxGTK is able to support using both the primary selection and the
+    // clipboard at the same time I think it causes more problems than it is
+    // worth to implement this method.  Selecting text should not clear the
+    // clipboard.  --Robin
 #ifdef __WXGTK__
     // Put the selected text in the PRIMARY selection
     if (currentPos != anchor) {
@@ -419,6 +424,7 @@ void ScintillaWX::ClaimSelection() {
         }
     }
 #endif
+#endif
 }
 
 
@@ -557,6 +563,8 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta,
         }
     }
     else { // otherwise just scroll the window
+        if ( !delta )
+            delta = 120;
         wheelRotation += rotation;
         lines = wheelRotation / delta;
         wheelRotation -= lines * delta;
@@ -662,7 +670,9 @@ int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* cons
     case WXK_RIGHT:             key = SCK_RIGHT;    break;
     case WXK_HOME:              key = SCK_HOME;     break;
     case WXK_END:               key = SCK_END;      break;
+    case WXK_PAGEUP:            // fall through
     case WXK_PRIOR:             key = SCK_PRIOR;    break;
+    case WXK_PAGEDOWN:          // fall through
     case WXK_NEXT:              key = SCK_NEXT;     break;
     case WXK_DELETE:            key = SCK_DELETE;   break;
     case WXK_INSERT:            key = SCK_INSERT;   break;