added translation of mac system into language, adaption of search paths

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

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 56ac22155814357e5cab1abec0681773987b34a7..30a896b9038e23101c679210c62bbc41d09b5269 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -95,6 +95,7 @@ ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
     wMain = win;
     wDraw = win;
     stc   = win;
+    wheelRotation = 0;
     Initialise();
 }
 
@@ -273,8 +274,6 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
 
     if (!enabled)
         popup.GetID()->Enable(cmd, enabled);
-
-    // TODO:  need to create event handler mappings for the cmd ID
 }
 
 
@@ -283,18 +282,18 @@ void ScintillaWX::ClaimSelection() {
 }
 
 
-LRESULT ScintillaWX::DefWndProc(UINT /*iMessage*/, WPARAM /*wParam*/, LPARAM /*lParam*/) {
+long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) {
     return 0;
 }
 
-LRESULT ScintillaWX::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
-    switch (iMessage) {
-    case EM_CANPASTE:
-        return CanPaste();
-    default:
+long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) {
+//      switch (iMessage) {
+//      case EM_CANPASTE:
+//          return CanPaste();
+//      default:
         return ScintillaBase::WndProc(iMessage, wParam, lParam);
-    }
-    return 0;
+//      }
+//      return 0;
 }
 
 
@@ -317,65 +316,70 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
         FullPaint();
     }
     paintState = notPainting;
+#ifdef __WXGTK__
+    // On wxGTK the editor window paints can overwrite the listbox...
+    if (ac.Active())
+        ((wxWindow*)ac.lb.GetID())->Refresh(TRUE);
+#endif
 }
 
 
 void ScintillaWX::DoHScroll(int type, int pos) {
     int xPos = xOffset;
-    switch (type) {
-    case wxEVT_SCROLLWIN_LINEUP:
+    if (type == wxEVT_SCROLLWIN_LINEUP)
         xPos -= H_SCROLL_STEP;
-        break;
-    case wxEVT_SCROLLWIN_LINEDOWN:
+    else if (type == wxEVT_SCROLLWIN_LINEDOWN)
         xPos += H_SCROLL_STEP;
-        break;
-    case wxEVT_SCROLLWIN_PAGEUP:
+    else if (type == wxEVT_SCROLLWIN_PAGEUP)
         xPos -= H_SCROLL_PAGE;
-        break;
-    case wxEVT_SCROLLWIN_PAGEDOWN:
+    else if (type == wxEVT_SCROLLWIN_PAGEDOWN)
         xPos += H_SCROLL_PAGE;
-        break;
-    case wxEVT_SCROLLWIN_TOP:
+    else if (type == wxEVT_SCROLLWIN_TOP)
         xPos = 0;
-        break;
-    case wxEVT_SCROLLWIN_BOTTOM:
+    else if (type == wxEVT_SCROLLWIN_BOTTOM)
         xPos = H_SCROLL_MAX;
-        break;
-    case wxEVT_SCROLLWIN_THUMBTRACK:
+    else if (type == wxEVT_SCROLLWIN_THUMBTRACK)
         xPos = pos;
-        break;
-    }
+
     HorizontalScrollTo(xPos);
 }
 
 void ScintillaWX::DoVScroll(int type, int pos) {
     int topLineNew = topLine;
-    switch (type) {
-    case wxEVT_SCROLLWIN_LINEUP:
+    if (type == wxEVT_SCROLLWIN_LINEUP)
         topLineNew -= 1;
-        break;
-    case wxEVT_SCROLLWIN_LINEDOWN:
+    else if (type == wxEVT_SCROLLWIN_LINEDOWN)
         topLineNew += 1;
-        break;
-    case wxEVT_SCROLLWIN_PAGEUP:
+    else if (type ==  wxEVT_SCROLLWIN_PAGEUP)
         topLineNew -= LinesToScroll();
-        break;
-    case wxEVT_SCROLLWIN_PAGEDOWN:
+    else if (type ==  wxEVT_SCROLLWIN_PAGEDOWN)
         topLineNew += LinesToScroll();
-        break;
-    case wxEVT_SCROLLWIN_TOP:
+    else if (type ==  wxEVT_SCROLLWIN_TOP)
         topLineNew = 0;
-        break;
-    case wxEVT_SCROLLWIN_BOTTOM:
+    else if (type ==  wxEVT_SCROLLWIN_BOTTOM)
         topLineNew = MaxScrollPos();
-        break;
-    case wxEVT_SCROLLWIN_THUMBTRACK:
+    else if (type ==   wxEVT_SCROLLWIN_THUMBTRACK)
         topLineNew = pos;
-        break;
-    }
+
     ScrollTo(topLineNew);
 }
 
+
+void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction) {
+    int topLineNew = topLine;
+    int lines;
+
+    wheelRotation += rotation;
+    lines = wheelRotation / delta;
+    wheelRotation -= lines * delta;
+    if (lines != 0) {
+        lines *= linesPerAction;
+        topLineNew -= lines;
+        ScrollTo(topLineNew);
+    }
+}
+
+
 void ScintillaWX::DoSize(int width, int height) {
     PRectangle rcClient(0,0,width,height);
     SetScrollBarsTo(rcClient);
@@ -415,6 +419,29 @@ void ScintillaWX::DoAddChar(char ch) {
 }
 
 int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt) {
+    switch (key) {
+        case WXK_DOWN: key = SCK_DOWN; break;
+        case WXK_UP: key = SCK_UP; break;
+        case WXK_LEFT: key = SCK_LEFT; break;
+        case WXK_RIGHT: key = SCK_RIGHT; break;
+        case WXK_HOME: key = SCK_HOME; break;
+        case WXK_END: key = SCK_END; break;
+        case WXK_PRIOR: key = SCK_PRIOR; break;
+        case WXK_NEXT: key = SCK_NEXT; break;
+        case WXK_DELETE: key = SCK_DELETE; break;
+        case WXK_INSERT: key = SCK_INSERT; break;
+        case WXK_ESCAPE: key = SCK_ESCAPE; break;
+        case WXK_BACK: key = SCK_BACK; break;
+        case WXK_TAB: key = SCK_TAB; break;
+        case WXK_RETURN: key = SCK_RETURN; break;
+        case WXK_ADD: key = SCK_ADD; break;
+        case WXK_SUBTRACT: key = SCK_SUBTRACT; break;
+        case WXK_DIVIDE: key = SCK_DIVIDE; break;
+        case WXK_CONTROL: key = 0; break;
+        case WXK_ALT: key = 0; break;
+        case WXK_SHIFT: key = 0; break;
+    }
+
     return KeyDown(key, shift, ctrl, alt);
 }
 
@@ -463,13 +490,16 @@ void ScintillaWX::DoDragLeave() {
 // Redraw all of text area. This paint will not be abandoned.
 void ScintillaWX::FullPaint() {
     paintState = painting;
-//      rcPaint = GetTextRectangle();
-//      wxClientDC dc(wMain.GetID());
-//      Surface surfaceWindow;
-//      surfaceWindow.Init(&dc);
-//      Paint(&surfaceWindow, rcPaint);
-//      surfaceWindow.Release();
-    wMain.GetID()->Refresh(FALSE);
+    rcPaint = GetTextRectangle();
+    paintingAllText = true;
+    wxClientDC dc(wMain.GetID());
+    Surface surfaceWindow;
+    surfaceWindow.Init(&dc);
+    Paint(&surfaceWindow, rcPaint);
+    surfaceWindow.Release();
+
+//     wMain.GetID()->Refresh(FALSE);
+
     paintState = notPainting;
 }