Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\ScintillaWX.cpp
Last modified2005-09-18 10:01:50.001 +0200
Size29.6 Kb (1057 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\ScintillaWX.cpp
Last modified2006-03-16 13:06:58.001 +0100
Size30.5 Kb (1091 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged161043
Inserted536
Deleted22
Ignored00
Changed824



   Comparison Details  

8 skipped lines
9U9U// Author:      Robin Dunn
10U10U//
11U11U// Created:     13-Jan-2000
12C// RCS-ID:      $Id: ScintillaWX.cpp,v 1.85 2005/08/23 16:02:48 ABX Exp $ 12C// RCS-ID:      $Id: ScintillaWX.cpp,v 1.85.2.1 2006/03/12 06:03:52 RD Exp $
13U13U// Copyright:   (c) 2000 by Total Control Software
14U14U// Licence:     wxWindows license
15U15U/////////////////////////////////////////////////////////////////////////////
16U16U 
17C#include <wx/wx.h> 17C#include "wx/wx.h"
18C#include <wx/textbuf.h> 18C#include "wx/textbuf.h"
19C#include <wx/dataobj.h> 19C#include "wx/dataobj.h"
20C#include <wx/clipbrd.h> 20C#include "wx/clipbrd.h"
21C#include <wx/dnd.h> 21C#include "wx/dnd.h"
22U22U 
23U23U#include "ScintillaWX.h"
24U24U#include "ExternalLexer.h"
2 skipped lines
27U27U 
28U28U#ifdef __WXMSW__
29U29U    // GetHwndOf()
30C    #include <wx/msw/private.h> 30C    #include "wx/msw/private.h"
31U31U#endif
32U32U 
33U33U//----------------------------------------------------------------------
15 skipped lines
49U49U 
50U50U 
51U51U#if wxUSE_DRAG_AND_DROP
  52Aclass wxStartDragTimer : public wxTimer {
  53Apublic:
  54A    wxStartDragTimer(ScintillaWX* swx) {
  55A        this->swx = swx;
  56A    }
5 skipped lines
  62Aprivate:
  63A    ScintillaWX* swx;
  64A};
  65A 
  66A 
52U67Ubool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) {
53U68U    return swx->DoDropText(x, y, data);
54U69U}
9 skipped lines
64U79Uvoid  wxSTCDropTarget::OnLeave() {
65U80U    swx->DoDragLeave();
66U81U}
67C#endif 82C#endif // wxUSE_DRAG_AND_DROP
68U83U 
69U84U 
70U85U#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
126 skipped lines
197U212U    sysCaretWidth = 0;
198U213U    sysCaretHeight = 0;
199U214U#endif
  215A#if wxUSE_DRAG_AND_DROP
  216A    startDragTimer = new wxStartDragTimer(this);
  217A#endif // wxUSE_DRAG_AND_DROP
200U218U}
201U219U 
202U220U 
203U221UScintillaWX::~ScintillaWX() {
  222A#if wxUSE_DRAG_AND_DROP
  223A    delete startDragTimer;
  224A#endif // wxUSE_DRAG_AND_DROP
204U225U    Finalise();
205U226U}
206U227U 
7 skipped lines
214U235U    dropTarget = new wxSTCDropTarget;
215U236U    dropTarget->SetScintilla(this);
216U237U    stc->SetDropTarget(dropTarget);
217C#endif 238C#endif // wxUSE_DRAG_AND_DROP
218U239U#ifdef __WXMAC__
219U240U    vs.extraFontFlag = false;  // UseAntiAliasing
220U241U#else
12 skipped lines
233U254U 
234U255Uvoid ScintillaWX::StartDrag() {
235U256U#if wxUSE_DRAG_AND_DROP
  257A    // We defer the starting of the DnD, otherwise the LeftUp of a normal
  258A    // click could be lost and the STC will think it is doing a DnD when the
  259A    // user just wanted a normal click.
  260A    startDragTimer->Start(200, true);
  261A#endif // wxUSE_DRAG_AND_DROP
  262A}
  263A 
  264Avoid ScintillaWX::DoStartDrag() {
  265A#if wxUSE_DRAG_AND_DROP
236U266U    wxString dragText = stc2wx(drag.s, drag.len);
237U267U 
238U268U    // Send an event to allow the drag text to be changed
6 skipped lines
245U275U    stc->GetEventHandler()->ProcessEvent(evt);
246U276U    dragText = evt.GetDragText();
247U277U 
248C    if (dragText.Length()) { 278C    if (dragText.length()) {
249U279U        wxDropSource        source(stc);
250U280U        wxTextDataObject    data(dragText);
251U281U        wxDragResult        result;
6 skipped lines
258U288U        inDragDrop = false;
259U289U        SetDragPosition(invalidPosition);
260U290U    }
261C#endif 291C#endif // wxUSE_DRAG_AND_DROP
262U292U}
263U293U 
264U294U 
413 skipped lines
678U708U    PRectangle rcClient = GetClientRectangle();
679U709U    paintingAllText = rcPaint.Contains(rcClient);
680U710U 
681R    dc->BeginDrawing();  
682U711U    ClipChildren(*dc, rcPaint);
683U712U    Paint(surfaceWindow, rcPaint);
684U713U 
4 skipped lines
689U718U        FullPaint();
690U719U    }
691U720U    paintState = notPainting;
692R    dc->EndDrawing();  
693U721U}
694U722U 
695U723U 
103 skipped lines
799U827U}
800U828U 
801U829Uvoid ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) {
  830A#if wxUSE_DRAG_AND_DROP
  831A    if (startDragTimer->IsRunning()) {
  832A        startDragTimer->Stop();
  833A        SetEmptySelection(PositionFromLocation(pt));
  834A    }
  835A#endif // wxUSE_DRAG_AND_DROP
802U836U    ButtonUp(pt, curTime, ctrl);
803U837U}
804U838U 
196 skipped lines
1001U1035Uvoid ScintillaWX::DoDragLeave() {
1002U1036U    SetDragPosition(invalidPosition);
1003U1037U}
1004C#endif 1038C#endif // wxUSE_DRAG_AND_DROP
1005U1039U//----------------------------------------------------------------------
1006U1040U 
1007U1041U// Force the whole window to be repainted
50 skipped lines

   Text comparison Options  

Match character case: yes.
Match line endings: no.
Match spaces

At start of lines: yes,
In middle of lines: yes,
At end of lines: yes.
Blank lines as empty lines: no.
Activate comparison algorithm
At word level: yes,
At character level: no.


   Legend  

UExample of unchanged line
CExample of modified line
AExample of added line
RExample of removed line
IExample of ignored line
Modified text
Added text
Removed text

This report has been generated by Ellié Computing Merge on 2006-09-07 16:23:46.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.