Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxTinderbox build fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-10 09:56:06 +00:00
parent 80cac95edb
commit f402150f77
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/src/stc/ScintillaWX.cpp
View File

@@ -79,7 +79,7 @@ wxDragResult wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def
void wxSTCDropTarget::OnLeave() { void wxSTCDropTarget::OnLeave() {
swx->DoDragLeave(); swx->DoDragLeave();
} }
#endif #endif // wxUSE_DRAG_AND_DROP
#if wxUSE_POPUPWIN && wxSTC_USE_POPUP #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
@@ -214,12 +214,14 @@ ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
#endif #endif
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
startDragTimer = new wxStartDragTimer(this); startDragTimer = new wxStartDragTimer(this);
#endif #endif // wxUSE_DRAG_AND_DROP
} }
ScintillaWX::~ScintillaWX() { ScintillaWX::~ScintillaWX() {
#if wxUSE_DRAG_AND_DROP
delete startDragTimer; delete startDragTimer;
#endif // wxUSE_DRAG_AND_DROP
Finalise(); Finalise();
} }
@@ -233,7 +235,7 @@ void ScintillaWX::Initialise() {
dropTarget = new wxSTCDropTarget; dropTarget = new wxSTCDropTarget;
dropTarget->SetScintilla(this); dropTarget->SetScintilla(this);
stc->SetDropTarget(dropTarget); stc->SetDropTarget(dropTarget);
#endif #endif // wxUSE_DRAG_AND_DROP
#ifdef __WXMAC__ #ifdef __WXMAC__
vs.extraFontFlag = false; // UseAntiAliasing vs.extraFontFlag = false; // UseAntiAliasing
#else #else
@@ -256,10 +258,11 @@ void ScintillaWX::StartDrag() {
// click could be lost and the STC will think it is doing a DnD when the // click could be lost and the STC will think it is doing a DnD when the
// user just wanted a normal click. // user just wanted a normal click.
startDragTimer->Start(100, true); startDragTimer->Start(100, true);
#endif #endif // wxUSE_DRAG_AND_DROP
} }
void ScintillaWX::DoStartDrag() { void ScintillaWX::DoStartDrag() {
#if wxUSE_DRAG_AND_DROP
wxString dragText = stc2wx(drag.s, drag.len); wxString dragText = stc2wx(drag.s, drag.len);
// Send an event to allow the drag text to be changed // Send an event to allow the drag text to be changed
@@ -272,7 +275,7 @@ void ScintillaWX::DoStartDrag() {
stc->GetEventHandler()->ProcessEvent(evt); stc->GetEventHandler()->ProcessEvent(evt);
dragText = evt.GetDragText(); dragText = evt.GetDragText();
if (dragText.Length()) { if (dragText.length()) {
wxDropSource source(stc); wxDropSource source(stc);
wxTextDataObject data(dragText); wxTextDataObject data(dragText);
wxDragResult result; wxDragResult result;
@@ -285,6 +288,7 @@ void ScintillaWX::DoStartDrag() {
inDragDrop = false; inDragDrop = false;
SetDragPosition(invalidPosition); SetDragPosition(invalidPosition);
} }
#endif // wxUSE_DRAG_AND_DROP
} }
@@ -828,7 +832,7 @@ void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) {
startDragTimer->Stop(); startDragTimer->Stop();
SetEmptySelection(PositionFromLocation(pt)); SetEmptySelection(PositionFromLocation(pt));
} }
#endif #endif // wxUSE_DRAG_AND_DROP
ButtonUp(pt, curTime, ctrl); ButtonUp(pt, curTime, ctrl);
} }
@@ -1031,7 +1035,7 @@ wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
void ScintillaWX::DoDragLeave() { void ScintillaWX::DoDragLeave() {
SetDragPosition(invalidPosition); SetDragPosition(invalidPosition);
} }
#endif #endif // wxUSE_DRAG_AND_DROP
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Force the whole window to be repainted // Force the whole window to be repainted

18
src/stc/ScintillaWX.cpp
View File

@@ -79,7 +79,7 @@ wxDragResult wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def
void wxSTCDropTarget::OnLeave() { void wxSTCDropTarget::OnLeave() {
swx->DoDragLeave(); swx->DoDragLeave();
} }
#endif #endif // wxUSE_DRAG_AND_DROP
#if wxUSE_POPUPWIN && wxSTC_USE_POPUP #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
@@ -214,12 +214,14 @@ ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
#endif #endif
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
startDragTimer = new wxStartDragTimer(this); startDragTimer = new wxStartDragTimer(this);
#endif #endif // wxUSE_DRAG_AND_DROP
} }
ScintillaWX::~ScintillaWX() { ScintillaWX::~ScintillaWX() {
#if wxUSE_DRAG_AND_DROP
delete startDragTimer; delete startDragTimer;
#endif // wxUSE_DRAG_AND_DROP
Finalise(); Finalise();
} }
@@ -233,7 +235,7 @@ void ScintillaWX::Initialise() {
dropTarget = new wxSTCDropTarget; dropTarget = new wxSTCDropTarget;
dropTarget->SetScintilla(this); dropTarget->SetScintilla(this);
stc->SetDropTarget(dropTarget); stc->SetDropTarget(dropTarget);
#endif #endif // wxUSE_DRAG_AND_DROP
#ifdef __WXMAC__ #ifdef __WXMAC__
vs.extraFontFlag = false; // UseAntiAliasing vs.extraFontFlag = false; // UseAntiAliasing
#else #else
@@ -256,10 +258,11 @@ void ScintillaWX::StartDrag() {
// click could be lost and the STC will think it is doing a DnD when the // click could be lost and the STC will think it is doing a DnD when the
// user just wanted a normal click. // user just wanted a normal click.
startDragTimer->Start(100, true); startDragTimer->Start(100, true);
#endif #endif // wxUSE_DRAG_AND_DROP
} }
void ScintillaWX::DoStartDrag() { void ScintillaWX::DoStartDrag() {
#if wxUSE_DRAG_AND_DROP
wxString dragText = stc2wx(drag.s, drag.len); wxString dragText = stc2wx(drag.s, drag.len);
// Send an event to allow the drag text to be changed // Send an event to allow the drag text to be changed
@@ -272,7 +275,7 @@ void ScintillaWX::DoStartDrag() {
stc->GetEventHandler()->ProcessEvent(evt); stc->GetEventHandler()->ProcessEvent(evt);
dragText = evt.GetDragText(); dragText = evt.GetDragText();
if (dragText.Length()) { if (dragText.length()) {
wxDropSource source(stc); wxDropSource source(stc);
wxTextDataObject data(dragText); wxTextDataObject data(dragText);
wxDragResult result; wxDragResult result;
@@ -285,6 +288,7 @@ void ScintillaWX::DoStartDrag() {
inDragDrop = false; inDragDrop = false;
SetDragPosition(invalidPosition); SetDragPosition(invalidPosition);
} }
#endif // wxUSE_DRAG_AND_DROP
} }
@@ -828,7 +832,7 @@ void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) {
startDragTimer->Stop(); startDragTimer->Stop();
SetEmptySelection(PositionFromLocation(pt)); SetEmptySelection(PositionFromLocation(pt));
} }
#endif #endif // wxUSE_DRAG_AND_DROP
ButtonUp(pt, curTime, ctrl); ButtonUp(pt, curTime, ctrl);
} }
@@ -1031,7 +1035,7 @@ wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
void ScintillaWX::DoDragLeave() { void ScintillaWX::DoDragLeave() {
SetDragPosition(invalidPosition); SetDragPosition(invalidPosition);
} }
#endif #endif // wxUSE_DRAG_AND_DROP
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Force the whole window to be repainted // Force the whole window to be repainted