removed obsolete file

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

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index f7349c8d27e9cc06e63170576fbb55891bbbadaa..127c172a909523365d4a076007c35b78ab1b381c 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -93,8 +93,8 @@ END_EVENT_TABLE()
 ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
     capturedMouse = false;
     wMain = win;
-    wDraw = win;
     stc   = win;
+    wheelRotation = 0;
     Initialise();
 }
 
@@ -169,8 +169,8 @@ bool ScintillaWX::HaveMouseCapture() {
 
 void ScintillaWX::ScrollText(int linesToMove) {
     int dy = vs.lineHeight * (linesToMove);
-    // TODO: calculate the rectangle to refreshed...
     wMain.GetID()->ScrollWindow(0, dy);
+    wMain.GetID()->Update();
 }
 
 void ScintillaWX::SetVerticalScrollPos() {
@@ -260,7 +260,7 @@ bool ScintillaWX::CanPaste() {
 }
 
 void ScintillaWX::CreateCallTipWindow(PRectangle) {
-    ct.wCallTip = new wxSTCCallTip(wDraw.GetID(), -1, &ct);
+    ct.wCallTip = new wxSTCCallTip(wMain.GetID(), -1, &ct);
     ct.wDraw = ct.wCallTip;
 }
 
@@ -325,60 +325,70 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
 
 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 ctrlDown) {
+    int topLineNew = topLine;
+    int lines;
+
+    if (ctrlDown) {  // Zoom the fonts if Ctrl key down
+        if (rotation < 0) {
+            KeyCommand(SCI_ZOOMIN);
+        }
+        else {
+            KeyCommand(SCI_ZOOMOUT);
+        }
+    }
+    else { // otherwise just scroll the window
+        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);
@@ -386,11 +396,11 @@ void ScintillaWX::DoSize(int width, int height) {
 }
 
 void ScintillaWX::DoLoseFocus(){
-    DropCaret();
+    SetFocusState(false);
 }
 
 void ScintillaWX::DoGainFocus(){
-    ShowCaretAtCurrentPosition();
+    SetFocusState(true);
 }
 
 void ScintillaWX::DoSysColourChange() {
@@ -417,7 +427,7 @@ void ScintillaWX::DoAddChar(char ch) {
     //    AutoCompleteChanged(ch);
 }
 
-int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt) {
+int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed) {
     switch (key) {
         case WXK_DOWN: key = SCK_DOWN; break;
         case WXK_UP: key = SCK_UP; break;
@@ -441,7 +451,7 @@ int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt) {
         case WXK_SHIFT: key = 0; break;
     }
 
-    return KeyDown(key, shift, ctrl, alt);
+    return KeyDown(key, shift, ctrl, alt, consumed);
 }
 
 
@@ -489,13 +499,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;
 }