Name clash correction

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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 9dd7697117f0922c9fd628357b2485df5e674d06..a5e5c668045d5dd3642eb4b8dce9c98b0c8c29bc 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -14,17 +14,11 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#define Point macPoint  // These names are also defined by some mac headers so
-#define Style macStyle  // change their names, and then undef before we need them
-
-#include <wx/wx.h>
-#include <wx/textbuf.h>
-#include <wx/dataobj.h>
-#include <wx/clipbrd.h>
-#include <wx/dnd.h>
-
-#undef Point
-#undef Style
+#include "wx/wx.h"
+#include "wx/textbuf.h"
+#include "wx/dataobj.h"
+#include "wx/clipbrd.h"
+#include "wx/dnd.h"
 
 #include "ScintillaWX.h"
 #include "ExternalLexer.h"
@@ -33,7 +27,7 @@
 
 #ifdef __WXMSW__
     // GetHwndOf()
-    #include <wx/msw/private.h>
+    #include "wx/msw/private.h"
 #endif
 
 //----------------------------------------------------------------------
@@ -160,6 +154,7 @@ END_EVENT_TABLE()
 
 //----------------------------------------------------------------------
 
+#if wxUSE_DATAOBJ
 static wxTextFileType wxConvertEOLMode(int scintillaMode)
 {
     wxTextFileType type;
@@ -183,6 +178,7 @@ static wxTextFileType wxConvertEOLMode(int scintillaMode)
     }
     return type;
 }
+#endif // wxUSE_DATAOBJ
 
 
 //----------------------------------------------------------------------
@@ -445,6 +441,7 @@ void ScintillaWX::Paste() {
     pdoc->BeginUndoAction();
     ClearSelection();
 
+#if wxUSE_DATAOBJ
     wxTextDataObject data;
     bool gotData = false;
 
@@ -461,6 +458,7 @@ void ScintillaWX::Paste() {
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
     }
+#endif // wxUSE_DATAOBJ
 
     pdoc->EndUndoAction();
     NotifyChange();
@@ -469,16 +467,21 @@ void ScintillaWX::Paste() {
 
 
 void ScintillaWX::CopyToClipboard(const SelectionText& st) {
+#if wxUSE_CLIPBOARD
     if (wxTheClipboard->Open()) {
         wxTheClipboard->UsePrimarySelection(false);
-        wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len));
+        wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len-1));
         wxTheClipboard->SetData(new wxTextDataObject(text));
         wxTheClipboard->Close();
     }
+#else
+    wxUnusedVar(st);
+#endif // wxUSE_CLIPBOARD
 }
 
 
 bool ScintillaWX::CanPaste() {
+#if wxUSE_CLIPBOARD
     bool canPaste = false;
     bool didOpen;
 
@@ -495,6 +498,9 @@ bool ScintillaWX::CanPaste() {
         }
     }
     return canPaste;
+#else
+    return false;
+#endif // wxUSE_CLIPBOARD
 }
 
 void ScintillaWX::CreateCallTipWindow(PRectangle) {
@@ -672,7 +678,6 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
     PRectangle rcClient = GetClientRectangle();
     paintingAllText = rcPaint.Contains(rcClient);
 
-    dc->BeginDrawing();
     ClipChildren(*dc, rcPaint);
     Paint(surfaceWindow, rcPaint);
 
@@ -683,7 +688,6 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
         FullPaint();
     }
     paintState = notPainting;
-    dc->EndDrawing();
 }
 
 
@@ -857,7 +861,7 @@ int  ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
          ctrl  = evt.ControlDown(),
          alt   = evt.AltDown();
 
-    if (ctrl && key >= 1 && key <= 26)
+    if (ctrl && key >= 1 && key <= 26 && key != WXK_BACK)
         key += 'A' - 1;
 
     switch (key) {
@@ -1016,28 +1020,25 @@ void ScintillaWX::DoScrollToColumn(int column) {
     HorizontalScrollTo(column * vs.spaceWidth);
 }
 
-#ifdef __WXGTK__
-void ScintillaWX::ClipChildren(wxDC& dc, PRectangle rect) {
-    wxRegion rgn(wxRectFromPRectangle(rect));
-    if (ac.Active()) {
-        wxRect childRect = ((wxWindow*)ac.lb->GetID())->GetRect();
-        rgn.Subtract(childRect);
-    }
-    if (ct.inCallTipMode) {
-        wxSTCCallTip* tip = (wxSTCCallTip*)ct.wCallTip.GetID();
-        wxRect childRect = tip->GetRect();
-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
-        childRect.SetPosition(tip->GetMyPosition());
-#endif
-        rgn.Subtract(childRect);
-    }
-
-    dc.SetClippingRegion(rgn);
-}
-#else
-void ScintillaWX::ClipChildren(wxDC& WXUNUSED(dc), PRectangle WXUNUSED(rect)) {
+// wxGTK doesn't appear to need this explicit clipping code any longer, but I
+// will leave it here commented out for a while just in case...
+void ScintillaWX::ClipChildren(wxDC& WXUNUSED(dc), PRectangle WXUNUSED(rect))
+{
+//     wxRegion rgn(wxRectFromPRectangle(rect));
+//     if (ac.Active()) {
+//         wxRect childRect = ((wxWindow*)ac.lb->GetID())->GetRect();
+//         rgn.Subtract(childRect);
+//     }
+//     if (ct.inCallTipMode) {
+//         wxSTCCallTip* tip = (wxSTCCallTip*)ct.wCallTip.GetID();
+//         wxRect childRect = tip->GetRect();
+// #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+//         childRect.SetPosition(tip->GetMyPosition());
+// #endif
+//         rgn.Subtract(childRect);
+//     }
+//     dc.SetClippingRegion(rgn);
 }
-#endif
 
 
 void ScintillaWX::SetUseAntiAliasing(bool useAA) {