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

Added ability for wxSTC's scrollbars to be supplieed externally, such

Browse Source 
as those that are created in wxDynamicSashWindows,


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-11-25 08:53:33 +00:00
parent 281de223c8
commit 5fa4613c81
10 changed files with 304 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/include/wx/stc/stc.h
View File

@@ -1594,6 +1594,14 @@ public:
// Send a message to Scintilla // Send a message to Scintilla
long SendMsg(int msg, long wp=0, long lp=0); long SendMsg(int msg, long wp=0, long lp=0);
// Set the vertical scrollbar to use instead of the ont that's built-in.
void SetVScrollBar(wxScrollBar* bar) { m_vScrollBar = bar; }
// Set the horizontal scrollbar to use instead of the ont that's built-in.
void SetHScrollBar(wxScrollBar* bar) { m_hScrollBar = bar; }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -1602,6 +1610,7 @@ private:
// Event handlers // Event handlers
void OnPaint(wxPaintEvent& evt); void OnPaint(wxPaintEvent& evt);
void OnScrollWin(wxScrollWinEvent& evt); void OnScrollWin(wxScrollWinEvent& evt);
void OnScroll(wxScrollEvent& evt);
void OnSize(wxSizeEvent& evt); void OnSize(wxSizeEvent& evt);
void OnMouseLeftDown(wxMouseEvent& evt); void OnMouseLeftDown(wxMouseEvent& evt);
void OnMouseMove(wxMouseEvent& evt); void OnMouseMove(wxMouseEvent& evt);
@@ -1629,6 +1638,8 @@ private:
ScintillaWX* m_swx; ScintillaWX* m_swx;
wxStopWatch m_stopWatch; wxStopWatch m_stopWatch;
wxScrollBar* m_vScrollBar;
wxScrollBar* m_hScrollBar;
bool m_lastKeyDownConsumed; bool m_lastKeyDownConsumed;
@@ -1695,7 +1706,6 @@ public:
bool GetControl() const; bool GetControl() const;
bool GetAlt() const; bool GetAlt() const;
// void CopyObject(wxObject& obj) const;
virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); } virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
#ifndef SWIG #ifndef SWIG

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

@@ -22,7 +22,7 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
const int H_SCROLL_MAX = 2000; const int H_SCROLL_MAX = 4000;
const int H_SCROLL_STEP = 20; const int H_SCROLL_STEP = 20;
const int H_SCROLL_PAGE = 200; const int H_SCROLL_PAGE = 200;
@@ -138,7 +138,7 @@ void ScintillaWX::StartDrag() {
dragText = evt.GetDragText(); dragText = evt.GetDragText();
if (dragText.Length()) { if (dragText.Length()) {
wxDropSource source(wMain.GetID()); wxDropSource source(stc);
wxTextDataObject data(dragText); wxTextDataObject data(dragText);
wxDragResult result; wxDragResult result;
@@ -175,9 +175,9 @@ void ScintillaWX::SetTicking(bool on) {
void ScintillaWX::SetMouseCapture(bool on) { void ScintillaWX::SetMouseCapture(bool on) {
if (on && !capturedMouse) if (on && !capturedMouse)
wMain.GetID()->CaptureMouse(); stc->CaptureMouse();
else if (!on && capturedMouse) else if (!on && capturedMouse)
wMain.GetID()->ReleaseMouse(); stc->ReleaseMouse();
capturedMouse = on; capturedMouse = on;
} }
@@ -189,37 +189,68 @@ bool ScintillaWX::HaveMouseCapture() {
void ScintillaWX::ScrollText(int linesToMove) { void ScintillaWX::ScrollText(int linesToMove) {
int dy = vs.lineHeight * (linesToMove); int dy = vs.lineHeight * (linesToMove);
wMain.GetID()->ScrollWindow(0, dy); stc->ScrollWindow(0, dy);
wMain.GetID()->Update(); stc->Update();
} }
void ScintillaWX::SetVerticalScrollPos() { void ScintillaWX::SetVerticalScrollPos() {
wMain.GetID()->SetScrollPos(wxVERTICAL, topLine); if (stc->m_vScrollBar == NULL) { // Use built-in scrollbar
stc->SetScrollPos(wxVERTICAL, topLine);
}
else { // otherwise use the one that's been given to us
stc->m_vScrollBar->SetThumbPosition(topLine);
}
} }
void ScintillaWX::SetHorizontalScrollPos() { void ScintillaWX::SetHorizontalScrollPos() {
wMain.GetID()->SetScrollPos(wxHORIZONTAL, xOffset); if (stc->m_hScrollBar == NULL) { // Use built-in scrollbar
stc->SetScrollPos(wxHORIZONTAL, xOffset);
}
else { // otherwise use the one that's been given to us
stc->m_hScrollBar->SetThumbPosition(xOffset);
}
} }
bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) { bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
bool modified = false; bool modified = false;
int sbMax = wMain.GetID()->GetScrollRange(wxVERTICAL);
int sbThumb = wMain.GetID()->GetScrollThumb(wxVERTICAL);
int sbPos = wMain.GetID()->GetScrollPos(wxVERTICAL);
if (stc->m_vScrollBar == NULL) { // Use built-in scrollbar
if (sbMax != nMax || sbThumb != nPage) { int sbMax = stc->GetScrollRange(wxVERTICAL);
wMain.GetID()->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax); int sbThumb = stc->GetScrollThumb(wxVERTICAL);
modified = true; int sbPos = stc->GetScrollPos(wxVERTICAL);
if (sbMax != nMax || sbThumb != nPage) {
stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax);
modified = true;
}
}
else { // otherwise use the one that's been given to us
int sbMax = stc->m_vScrollBar->GetRange();
int sbPage = stc->m_vScrollBar->GetPageSize();
int sbPos = stc->m_vScrollBar->GetThumbPosition();
if (sbMax != nMax || sbPage != nPage) {
stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax, nPage);
modified = true;
}
} }
if (horizontalScrollBarVisible) { if (horizontalScrollBarVisible) {
sbMax = wMain.GetID()->GetScrollRange(wxHORIZONTAL); if (stc->m_hScrollBar == NULL) { // Use built-in scrollbar
sbThumb = wMain.GetID()->GetScrollThumb(wxHORIZONTAL); int sbMax = stc->GetScrollRange(wxHORIZONTAL);
if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) { int sbThumb = stc->GetScrollThumb(wxHORIZONTAL);
wMain.GetID()->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX); if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) {
modified = true; stc->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX);
modified = true;
}
}
else { // otherwise use the one that's been given to us
int sbMax = stc->m_hScrollBar->GetRange();
int sbPage = stc->m_hScrollBar->GetPageSize();
if ((sbMax != H_SCROLL_MAX) || (sbPage != H_SCROLL_STEP)) {
stc->m_hScrollBar->SetScrollbar(0, H_SCROLL_STEP, H_SCROLL_MAX, H_SCROLL_STEP);
modified = true;
}
} }
} }
return modified; return modified;
@@ -282,7 +313,7 @@ bool ScintillaWX::CanPaste() {
} }
void ScintillaWX::CreateCallTipWindow(PRectangle) { void ScintillaWX::CreateCallTipWindow(PRectangle) {
ct.wCallTip = new wxSTCCallTip(wMain.GetID(), -1, &ct); ct.wCallTip = new wxSTCCallTip(stc, -1, &ct);
ct.wDraw = ct.wCallTip; ct.wDraw = ct.wCallTip;
} }
@@ -347,19 +378,19 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
void ScintillaWX::DoHScroll(int type, int pos) { void ScintillaWX::DoHScroll(int type, int pos) {
int xPos = xOffset; int xPos = xOffset;
if (type == wxEVT_SCROLLWIN_LINEUP) if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)
xPos -= H_SCROLL_STEP; xPos -= H_SCROLL_STEP;
else if (type == wxEVT_SCROLLWIN_LINEDOWN) else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)
xPos += H_SCROLL_STEP; xPos += H_SCROLL_STEP;
else if (type == wxEVT_SCROLLWIN_PAGEUP) else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)
xPos -= H_SCROLL_PAGE; xPos -= H_SCROLL_PAGE;
else if (type == wxEVT_SCROLLWIN_PAGEDOWN) else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN)
xPos += H_SCROLL_PAGE; xPos += H_SCROLL_PAGE;
else if (type == wxEVT_SCROLLWIN_TOP) else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)
xPos = 0; xPos = 0;
else if (type == wxEVT_SCROLLWIN_BOTTOM) else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)
xPos = H_SCROLL_MAX; xPos = H_SCROLL_MAX;
else if (type == wxEVT_SCROLLWIN_THUMBTRACK) else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)
xPos = pos; xPos = pos;
HorizontalScrollTo(xPos); HorizontalScrollTo(xPos);
@@ -367,19 +398,19 @@ void ScintillaWX::DoHScroll(int type, int pos) {
void ScintillaWX::DoVScroll(int type, int pos) { void ScintillaWX::DoVScroll(int type, int pos) {
int topLineNew = topLine; int topLineNew = topLine;
if (type == wxEVT_SCROLLWIN_LINEUP) if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)
topLineNew -= 1; topLineNew -= 1;
else if (type == wxEVT_SCROLLWIN_LINEDOWN) else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)
topLineNew += 1; topLineNew += 1;
else if (type == wxEVT_SCROLLWIN_PAGEUP) else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)
topLineNew -= LinesToScroll(); topLineNew -= LinesToScroll();
else if (type == wxEVT_SCROLLWIN_PAGEDOWN) else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN)
topLineNew += LinesToScroll(); topLineNew += LinesToScroll();
else if (type == wxEVT_SCROLLWIN_TOP) else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)
topLineNew = 0; topLineNew = 0;
else if (type == wxEVT_SCROLLWIN_BOTTOM) else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)
topLineNew = MaxScrollPos(); topLineNew = MaxScrollPos();
else if (type == wxEVT_SCROLLWIN_THUMBTRACK) else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)
topLineNew = pos; topLineNew = pos;
ScrollTo(topLineNew); ScrollTo(topLineNew);
@@ -567,13 +598,13 @@ void ScintillaWX::FullPaint() {
paintState = painting; paintState = painting;
rcPaint = GetTextRectangle(); rcPaint = GetTextRectangle();
paintingAllText = true; paintingAllText = true;
wxClientDC dc(wMain.GetID()); wxClientDC dc(stc);
Surface surfaceWindow; Surface surfaceWindow;
surfaceWindow.Init(&dc); surfaceWindow.Init(&dc);
Paint(&surfaceWindow, rcPaint); Paint(&surfaceWindow, rcPaint);
surfaceWindow.Release(); surfaceWindow.Release();
// wMain.GetID()->Refresh(FALSE); // stc->Refresh(FALSE);
paintState = notPainting; paintState = notPainting;
} }

19
contrib/src/stc/stc.cpp
View File

@@ -103,6 +103,7 @@ DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
EVT_PAINT (wxStyledTextCtrl::OnPaint) EVT_PAINT (wxStyledTextCtrl::OnPaint)
EVT_SCROLLWIN (wxStyledTextCtrl::OnScrollWin) EVT_SCROLLWIN (wxStyledTextCtrl::OnScrollWin)
EVT_SCROLL (wxStyledTextCtrl::OnScroll)
EVT_SIZE (wxStyledTextCtrl::OnSize) EVT_SIZE (wxStyledTextCtrl::OnSize)
EVT_LEFT_DOWN (wxStyledTextCtrl::OnMouseLeftDown) EVT_LEFT_DOWN (wxStyledTextCtrl::OnMouseLeftDown)
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -143,6 +144,8 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
m_swx = new ScintillaWX(this); m_swx = new ScintillaWX(this);
m_stopWatch.Start(); m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE; m_lastKeyDownConsumed = FALSE;
m_vScrollBar = NULL;
m_hScrollBar = NULL;
} }
@@ -1801,6 +1804,16 @@ void wxStyledTextCtrl::OnScrollWin(wxScrollWinEvent& evt) {
m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition()); m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
} }
void wxStyledTextCtrl::OnScroll(wxScrollEvent& evt) {
wxScrollBar* sb = wxDynamicCast(evt.GetEventObject(), wxScrollBar);
if (sb) {
if (sb->IsVertical())
m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
else
m_swx->DoHScroll(evt.GetEventType(), evt.GetPosition());
}
}
void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) { void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
wxSize sz = GetClientSize(); wxSize sz = GetClientSize();
m_swx->DoSize(sz.x, sz.y); m_swx->DoSize(sz.x, sz.y);
@@ -2064,6 +2077,7 @@ bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0
bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; } bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; }
bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; } bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; }
wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event): wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
wxCommandEvent(event) wxCommandEvent(event)
{ {
@@ -2101,3 +2115,8 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):

64
contrib/src/stc/stc.cpp.in
View File

@@ -103,6 +103,7 @@ DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
EVT_PAINT (wxStyledTextCtrl::OnPaint) EVT_PAINT (wxStyledTextCtrl::OnPaint)
EVT_SCROLLWIN (wxStyledTextCtrl::OnScrollWin) EVT_SCROLLWIN (wxStyledTextCtrl::OnScrollWin)
EVT_SCROLL (wxStyledTextCtrl::OnScroll)
EVT_SIZE (wxStyledTextCtrl::OnSize) EVT_SIZE (wxStyledTextCtrl::OnSize)
EVT_LEFT_DOWN (wxStyledTextCtrl::OnMouseLeftDown) EVT_LEFT_DOWN (wxStyledTextCtrl::OnMouseLeftDown)
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -143,6 +144,8 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
m_swx = new ScintillaWX(this); m_swx = new ScintillaWX(this);
m_stopWatch.Start(); m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE; m_lastKeyDownConsumed = FALSE;
m_vScrollBar = NULL;
m_hScrollBar = NULL;
} }
@@ -345,6 +348,16 @@ void wxStyledTextCtrl::OnScrollWin(wxScrollWinEvent& evt) {
m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition()); m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
} }
void wxStyledTextCtrl::OnScroll(wxScrollEvent& evt) {
wxScrollBar* sb = wxDynamicCast(evt.GetEventObject(), wxScrollBar);
if (sb) {
if (sb->IsVertical())
m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
else
m_swx->DoHScroll(evt.GetEventType(), evt.GetPosition());
}
}
void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) { void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
wxSize sz = GetClientSize(); wxSize sz = GetClientSize();
m_swx->DoSize(sz.x, sz.y); m_swx->DoSize(sz.x, sz.y);
@@ -608,35 +621,35 @@ bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0
bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; } bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; }
bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; } bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; }
void wxStyledTextEvent::CopyObject(wxObject& obj) const {
wxCommandEvent::CopyObject(obj);
wxStyledTextEvent* o = (wxStyledTextEvent*)&obj; wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
o->m_position = m_position; wxCommandEvent(event)
o->m_key = m_key; {
o->m_modifiers = m_modifiers; m_position = event.m_position;
o->m_modificationType = m_modificationType; m_key = event.m_key;
o->m_text = m_text; m_modifiers = event.m_modifiers;
o->m_length = m_length; m_modificationType = event.m_modificationType;
o->m_linesAdded = m_linesAdded; m_text = event.m_text;
o->m_line = m_line; m_length = event.m_length;
o->m_foldLevelNow = m_foldLevelNow; m_linesAdded = event.m_linesAdded;
o->m_foldLevelPrev = m_foldLevelPrev; m_line = event.m_line;
m_foldLevelNow = event.m_foldLevelNow;
m_foldLevelPrev = event.m_foldLevelPrev;
o->m_margin = m_margin; m_margin = event.m_margin;
o->m_message = m_message; m_message = event.m_message;
o->m_wParam = m_wParam; m_wParam = event.m_wParam;
o->m_lParam = m_lParam; m_lParam = event.m_lParam;
o->m_listType = m_listType; m_listType = event.m_listType;
o->m_x = m_x; m_x = event.m_x;
o->m_y = m_y; m_y = event.m_y;
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
o->m_dragText = m_dragText; m_dragText = event.m_dragText;
o->m_dragAllowMove =m_dragAllowMove; m_dragAllowMove =event.m_dragAllowMove;
o->m_dragResult = m_dragResult; m_dragResult = event.m_dragResult;
#endif #endif
} }
@@ -646,3 +659,8 @@ void wxStyledTextEvent::CopyObject(wxObject& obj) const {

14
contrib/src/stc/stc.h.in
View File

@@ -148,6 +148,14 @@ public:
// Send a message to Scintilla // Send a message to Scintilla
long SendMsg(int msg, long wp=0, long lp=0); long SendMsg(int msg, long wp=0, long lp=0);
// Set the vertical scrollbar to use instead of the ont that's built-in.
void SetVScrollBar(wxScrollBar* bar) { m_vScrollBar = bar; }
// Set the horizontal scrollbar to use instead of the ont that's built-in.
void SetHScrollBar(wxScrollBar* bar) { m_hScrollBar = bar; }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -156,6 +164,7 @@ private:
// Event handlers // Event handlers
void OnPaint(wxPaintEvent& evt); void OnPaint(wxPaintEvent& evt);
void OnScrollWin(wxScrollWinEvent& evt); void OnScrollWin(wxScrollWinEvent& evt);
void OnScroll(wxScrollEvent& evt);
void OnSize(wxSizeEvent& evt); void OnSize(wxSizeEvent& evt);
void OnMouseLeftDown(wxMouseEvent& evt); void OnMouseLeftDown(wxMouseEvent& evt);
void OnMouseMove(wxMouseEvent& evt); void OnMouseMove(wxMouseEvent& evt);
@@ -183,6 +192,8 @@ private:
ScintillaWX* m_swx; ScintillaWX* m_swx;
wxStopWatch m_stopWatch; wxStopWatch m_stopWatch;
wxScrollBar* m_vScrollBar;
wxScrollBar* m_hScrollBar;
bool m_lastKeyDownConsumed; bool m_lastKeyDownConsumed;
@@ -195,6 +206,7 @@ private:
class wxStyledTextEvent : public wxCommandEvent { class wxStyledTextEvent : public wxCommandEvent {
public: public:
wxStyledTextEvent(const wxStyledTextEvent& event);
wxStyledTextEvent(wxEventType commandType=0, int id=0); wxStyledTextEvent(wxEventType commandType=0, int id=0);
~wxStyledTextEvent() {} ~wxStyledTextEvent() {}
@@ -248,7 +260,7 @@ public:
bool GetControl() const; bool GetControl() const;
bool GetAlt() const; bool GetAlt() const;
void CopyObject(wxObject& obj) const; virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
#ifndef SWIG #ifndef SWIG
private: private:

12
include/wx/stc/stc.h
View File

@@ -1594,6 +1594,14 @@ public:
// Send a message to Scintilla // Send a message to Scintilla
long SendMsg(int msg, long wp=0, long lp=0); long SendMsg(int msg, long wp=0, long lp=0);
// Set the vertical scrollbar to use instead of the ont that's built-in.
void SetVScrollBar(wxScrollBar* bar) { m_vScrollBar = bar; }
// Set the horizontal scrollbar to use instead of the ont that's built-in.
void SetHScrollBar(wxScrollBar* bar) { m_hScrollBar = bar; }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -1602,6 +1610,7 @@ private:
// Event handlers // Event handlers
void OnPaint(wxPaintEvent& evt); void OnPaint(wxPaintEvent& evt);
void OnScrollWin(wxScrollWinEvent& evt); void OnScrollWin(wxScrollWinEvent& evt);
void OnScroll(wxScrollEvent& evt);
void OnSize(wxSizeEvent& evt); void OnSize(wxSizeEvent& evt);
void OnMouseLeftDown(wxMouseEvent& evt); void OnMouseLeftDown(wxMouseEvent& evt);
void OnMouseMove(wxMouseEvent& evt); void OnMouseMove(wxMouseEvent& evt);
@@ -1629,6 +1638,8 @@ private:
ScintillaWX* m_swx; ScintillaWX* m_swx;
wxStopWatch m_stopWatch; wxStopWatch m_stopWatch;
wxScrollBar* m_vScrollBar;
wxScrollBar* m_hScrollBar;
bool m_lastKeyDownConsumed; bool m_lastKeyDownConsumed;
@@ -1695,7 +1706,6 @@ public:
bool GetControl() const; bool GetControl() const;
bool GetAlt() const; bool GetAlt() const;
// void CopyObject(wxObject& obj) const;
virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); } virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
#ifndef SWIG #ifndef SWIG

105
src/stc/ScintillaWX.cpp
View File

@@ -22,7 +22,7 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
const int H_SCROLL_MAX = 2000; const int H_SCROLL_MAX = 4000;
const int H_SCROLL_STEP = 20; const int H_SCROLL_STEP = 20;
const int H_SCROLL_PAGE = 200; const int H_SCROLL_PAGE = 200;
@@ -138,7 +138,7 @@ void ScintillaWX::StartDrag() {
dragText = evt.GetDragText(); dragText = evt.GetDragText();
if (dragText.Length()) { if (dragText.Length()) {
wxDropSource source(wMain.GetID()); wxDropSource source(stc);
wxTextDataObject data(dragText); wxTextDataObject data(dragText);
wxDragResult result; wxDragResult result;
@@ -175,9 +175,9 @@ void ScintillaWX::SetTicking(bool on) {
void ScintillaWX::SetMouseCapture(bool on) { void ScintillaWX::SetMouseCapture(bool on) {
if (on && !capturedMouse) if (on && !capturedMouse)
wMain.GetID()->CaptureMouse(); stc->CaptureMouse();
else if (!on && capturedMouse) else if (!on && capturedMouse)
wMain.GetID()->ReleaseMouse(); stc->ReleaseMouse();
capturedMouse = on; capturedMouse = on;
} }
@@ -189,37 +189,68 @@ bool ScintillaWX::HaveMouseCapture() {
void ScintillaWX::ScrollText(int linesToMove) { void ScintillaWX::ScrollText(int linesToMove) {
int dy = vs.lineHeight * (linesToMove); int dy = vs.lineHeight * (linesToMove);
wMain.GetID()->ScrollWindow(0, dy); stc->ScrollWindow(0, dy);
wMain.GetID()->Update(); stc->Update();
} }
void ScintillaWX::SetVerticalScrollPos() { void ScintillaWX::SetVerticalScrollPos() {
wMain.GetID()->SetScrollPos(wxVERTICAL, topLine); if (stc->m_vScrollBar == NULL) { // Use built-in scrollbar
stc->SetScrollPos(wxVERTICAL, topLine);
}
else { // otherwise use the one that's been given to us
stc->m_vScrollBar->SetThumbPosition(topLine);
}
} }
void ScintillaWX::SetHorizontalScrollPos() { void ScintillaWX::SetHorizontalScrollPos() {
wMain.GetID()->SetScrollPos(wxHORIZONTAL, xOffset); if (stc->m_hScrollBar == NULL) { // Use built-in scrollbar
stc->SetScrollPos(wxHORIZONTAL, xOffset);
}
else { // otherwise use the one that's been given to us
stc->m_hScrollBar->SetThumbPosition(xOffset);
}
} }
bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) { bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
bool modified = false; bool modified = false;
int sbMax = wMain.GetID()->GetScrollRange(wxVERTICAL);
int sbThumb = wMain.GetID()->GetScrollThumb(wxVERTICAL);
int sbPos = wMain.GetID()->GetScrollPos(wxVERTICAL);
if (stc->m_vScrollBar == NULL) { // Use built-in scrollbar
if (sbMax != nMax || sbThumb != nPage) { int sbMax = stc->GetScrollRange(wxVERTICAL);
wMain.GetID()->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax); int sbThumb = stc->GetScrollThumb(wxVERTICAL);
modified = true; int sbPos = stc->GetScrollPos(wxVERTICAL);
if (sbMax != nMax || sbThumb != nPage) {
stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax);
modified = true;
}
}
else { // otherwise use the one that's been given to us
int sbMax = stc->m_vScrollBar->GetRange();
int sbPage = stc->m_vScrollBar->GetPageSize();
int sbPos = stc->m_vScrollBar->GetThumbPosition();
if (sbMax != nMax || sbPage != nPage) {
stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax, nPage);
modified = true;
}
} }
if (horizontalScrollBarVisible) { if (horizontalScrollBarVisible) {
sbMax = wMain.GetID()->GetScrollRange(wxHORIZONTAL); if (stc->m_hScrollBar == NULL) { // Use built-in scrollbar
sbThumb = wMain.GetID()->GetScrollThumb(wxHORIZONTAL); int sbMax = stc->GetScrollRange(wxHORIZONTAL);
if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) { int sbThumb = stc->GetScrollThumb(wxHORIZONTAL);
wMain.GetID()->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX); if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) {
modified = true; stc->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX);
modified = true;
}
}
else { // otherwise use the one that's been given to us
int sbMax = stc->m_hScrollBar->GetRange();
int sbPage = stc->m_hScrollBar->GetPageSize();
if ((sbMax != H_SCROLL_MAX) || (sbPage != H_SCROLL_STEP)) {
stc->m_hScrollBar->SetScrollbar(0, H_SCROLL_STEP, H_SCROLL_MAX, H_SCROLL_STEP);
modified = true;
}
} }
} }
return modified; return modified;
@@ -282,7 +313,7 @@ bool ScintillaWX::CanPaste() {
} }
void ScintillaWX::CreateCallTipWindow(PRectangle) { void ScintillaWX::CreateCallTipWindow(PRectangle) {
ct.wCallTip = new wxSTCCallTip(wMain.GetID(), -1, &ct); ct.wCallTip = new wxSTCCallTip(stc, -1, &ct);
ct.wDraw = ct.wCallTip; ct.wDraw = ct.wCallTip;
} }
@@ -347,19 +378,19 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
void ScintillaWX::DoHScroll(int type, int pos) { void ScintillaWX::DoHScroll(int type, int pos) {
int xPos = xOffset; int xPos = xOffset;
if (type == wxEVT_SCROLLWIN_LINEUP) if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)
xPos -= H_SCROLL_STEP; xPos -= H_SCROLL_STEP;
else if (type == wxEVT_SCROLLWIN_LINEDOWN) else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)
xPos += H_SCROLL_STEP; xPos += H_SCROLL_STEP;
else if (type == wxEVT_SCROLLWIN_PAGEUP) else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)
xPos -= H_SCROLL_PAGE; xPos -= H_SCROLL_PAGE;
else if (type == wxEVT_SCROLLWIN_PAGEDOWN) else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN)
xPos += H_SCROLL_PAGE; xPos += H_SCROLL_PAGE;
else if (type == wxEVT_SCROLLWIN_TOP) else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)
xPos = 0; xPos = 0;
else if (type == wxEVT_SCROLLWIN_BOTTOM) else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)
xPos = H_SCROLL_MAX; xPos = H_SCROLL_MAX;
else if (type == wxEVT_SCROLLWIN_THUMBTRACK) else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)
xPos = pos; xPos = pos;
HorizontalScrollTo(xPos); HorizontalScrollTo(xPos);
@@ -367,19 +398,19 @@ void ScintillaWX::DoHScroll(int type, int pos) {
void ScintillaWX::DoVScroll(int type, int pos) { void ScintillaWX::DoVScroll(int type, int pos) {
int topLineNew = topLine; int topLineNew = topLine;
if (type == wxEVT_SCROLLWIN_LINEUP) if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)
topLineNew -= 1; topLineNew -= 1;
else if (type == wxEVT_SCROLLWIN_LINEDOWN) else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)
topLineNew += 1; topLineNew += 1;
else if (type == wxEVT_SCROLLWIN_PAGEUP) else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)
topLineNew -= LinesToScroll(); topLineNew -= LinesToScroll();
else if (type == wxEVT_SCROLLWIN_PAGEDOWN) else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN)
topLineNew += LinesToScroll(); topLineNew += LinesToScroll();
else if (type == wxEVT_SCROLLWIN_TOP) else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)
topLineNew = 0; topLineNew = 0;
else if (type == wxEVT_SCROLLWIN_BOTTOM) else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)
topLineNew = MaxScrollPos(); topLineNew = MaxScrollPos();
else if (type == wxEVT_SCROLLWIN_THUMBTRACK) else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)
topLineNew = pos; topLineNew = pos;
ScrollTo(topLineNew); ScrollTo(topLineNew);
@@ -567,13 +598,13 @@ void ScintillaWX::FullPaint() {
paintState = painting; paintState = painting;
rcPaint = GetTextRectangle(); rcPaint = GetTextRectangle();
paintingAllText = true; paintingAllText = true;
wxClientDC dc(wMain.GetID()); wxClientDC dc(stc);
Surface surfaceWindow; Surface surfaceWindow;
surfaceWindow.Init(&dc); surfaceWindow.Init(&dc);
Paint(&surfaceWindow, rcPaint); Paint(&surfaceWindow, rcPaint);
surfaceWindow.Release(); surfaceWindow.Release();
// wMain.GetID()->Refresh(FALSE); // stc->Refresh(FALSE);
paintState = notPainting; paintState = notPainting;
} }

19
src/stc/stc.cpp
View File

@@ -103,6 +103,7 @@ DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
EVT_PAINT (wxStyledTextCtrl::OnPaint) EVT_PAINT (wxStyledTextCtrl::OnPaint)
EVT_SCROLLWIN (wxStyledTextCtrl::OnScrollWin) EVT_SCROLLWIN (wxStyledTextCtrl::OnScrollWin)
EVT_SCROLL (wxStyledTextCtrl::OnScroll)
EVT_SIZE (wxStyledTextCtrl::OnSize) EVT_SIZE (wxStyledTextCtrl::OnSize)
EVT_LEFT_DOWN (wxStyledTextCtrl::OnMouseLeftDown) EVT_LEFT_DOWN (wxStyledTextCtrl::OnMouseLeftDown)
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -143,6 +144,8 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
m_swx = new ScintillaWX(this); m_swx = new ScintillaWX(this);
m_stopWatch.Start(); m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE; m_lastKeyDownConsumed = FALSE;
m_vScrollBar = NULL;
m_hScrollBar = NULL;
} }
@@ -1801,6 +1804,16 @@ void wxStyledTextCtrl::OnScrollWin(wxScrollWinEvent& evt) {
m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition()); m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
} }
void wxStyledTextCtrl::OnScroll(wxScrollEvent& evt) {
wxScrollBar* sb = wxDynamicCast(evt.GetEventObject(), wxScrollBar);
if (sb) {
if (sb->IsVertical())
m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
else
m_swx->DoHScroll(evt.GetEventType(), evt.GetPosition());
}
}
void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) { void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
wxSize sz = GetClientSize(); wxSize sz = GetClientSize();
m_swx->DoSize(sz.x, sz.y); m_swx->DoSize(sz.x, sz.y);
@@ -2064,6 +2077,7 @@ bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0
bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; } bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; }
bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; } bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; }
wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event): wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
wxCommandEvent(event) wxCommandEvent(event)
{ {
@@ -2101,3 +2115,8 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):

64
src/stc/stc.cpp.in
View File

@@ -103,6 +103,7 @@ DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
EVT_PAINT (wxStyledTextCtrl::OnPaint) EVT_PAINT (wxStyledTextCtrl::OnPaint)
EVT_SCROLLWIN (wxStyledTextCtrl::OnScrollWin) EVT_SCROLLWIN (wxStyledTextCtrl::OnScrollWin)
EVT_SCROLL (wxStyledTextCtrl::OnScroll)
EVT_SIZE (wxStyledTextCtrl::OnSize) EVT_SIZE (wxStyledTextCtrl::OnSize)
EVT_LEFT_DOWN (wxStyledTextCtrl::OnMouseLeftDown) EVT_LEFT_DOWN (wxStyledTextCtrl::OnMouseLeftDown)
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -143,6 +144,8 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
m_swx = new ScintillaWX(this); m_swx = new ScintillaWX(this);
m_stopWatch.Start(); m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE; m_lastKeyDownConsumed = FALSE;
m_vScrollBar = NULL;
m_hScrollBar = NULL;
} }
@@ -345,6 +348,16 @@ void wxStyledTextCtrl::OnScrollWin(wxScrollWinEvent& evt) {
m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition()); m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
} }
void wxStyledTextCtrl::OnScroll(wxScrollEvent& evt) {
wxScrollBar* sb = wxDynamicCast(evt.GetEventObject(), wxScrollBar);
if (sb) {
if (sb->IsVertical())
m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
else
m_swx->DoHScroll(evt.GetEventType(), evt.GetPosition());
}
}
void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) { void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
wxSize sz = GetClientSize(); wxSize sz = GetClientSize();
m_swx->DoSize(sz.x, sz.y); m_swx->DoSize(sz.x, sz.y);
@@ -608,35 +621,35 @@ bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0
bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; } bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; }
bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; } bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; }
void wxStyledTextEvent::CopyObject(wxObject& obj) const {
wxCommandEvent::CopyObject(obj);
wxStyledTextEvent* o = (wxStyledTextEvent*)&obj; wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
o->m_position = m_position; wxCommandEvent(event)
o->m_key = m_key; {
o->m_modifiers = m_modifiers; m_position = event.m_position;
o->m_modificationType = m_modificationType; m_key = event.m_key;
o->m_text = m_text; m_modifiers = event.m_modifiers;
o->m_length = m_length; m_modificationType = event.m_modificationType;
o->m_linesAdded = m_linesAdded; m_text = event.m_text;
o->m_line = m_line; m_length = event.m_length;
o->m_foldLevelNow = m_foldLevelNow; m_linesAdded = event.m_linesAdded;
o->m_foldLevelPrev = m_foldLevelPrev; m_line = event.m_line;
m_foldLevelNow = event.m_foldLevelNow;
m_foldLevelPrev = event.m_foldLevelPrev;
o->m_margin = m_margin; m_margin = event.m_margin;
o->m_message = m_message; m_message = event.m_message;
o->m_wParam = m_wParam; m_wParam = event.m_wParam;
o->m_lParam = m_lParam; m_lParam = event.m_lParam;
o->m_listType = m_listType; m_listType = event.m_listType;
o->m_x = m_x; m_x = event.m_x;
o->m_y = m_y; m_y = event.m_y;
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
o->m_dragText = m_dragText; m_dragText = event.m_dragText;
o->m_dragAllowMove =m_dragAllowMove; m_dragAllowMove =event.m_dragAllowMove;
o->m_dragResult = m_dragResult; m_dragResult = event.m_dragResult;
#endif #endif
} }
@@ -646,3 +659,8 @@ void wxStyledTextEvent::CopyObject(wxObject& obj) const {

14
src/stc/stc.h.in
View File

@@ -148,6 +148,14 @@ public:
// Send a message to Scintilla // Send a message to Scintilla
long SendMsg(int msg, long wp=0, long lp=0); long SendMsg(int msg, long wp=0, long lp=0);
// Set the vertical scrollbar to use instead of the ont that's built-in.
void SetVScrollBar(wxScrollBar* bar) { m_vScrollBar = bar; }
// Set the horizontal scrollbar to use instead of the ont that's built-in.
void SetHScrollBar(wxScrollBar* bar) { m_hScrollBar = bar; }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -156,6 +164,7 @@ private:
// Event handlers // Event handlers
void OnPaint(wxPaintEvent& evt); void OnPaint(wxPaintEvent& evt);
void OnScrollWin(wxScrollWinEvent& evt); void OnScrollWin(wxScrollWinEvent& evt);
void OnScroll(wxScrollEvent& evt);
void OnSize(wxSizeEvent& evt); void OnSize(wxSizeEvent& evt);
void OnMouseLeftDown(wxMouseEvent& evt); void OnMouseLeftDown(wxMouseEvent& evt);
void OnMouseMove(wxMouseEvent& evt); void OnMouseMove(wxMouseEvent& evt);
@@ -183,6 +192,8 @@ private:
ScintillaWX* m_swx; ScintillaWX* m_swx;
wxStopWatch m_stopWatch; wxStopWatch m_stopWatch;
wxScrollBar* m_vScrollBar;
wxScrollBar* m_hScrollBar;
bool m_lastKeyDownConsumed; bool m_lastKeyDownConsumed;
@@ -195,6 +206,7 @@ private:
class wxStyledTextEvent : public wxCommandEvent { class wxStyledTextEvent : public wxCommandEvent {
public: public:
wxStyledTextEvent(const wxStyledTextEvent& event);
wxStyledTextEvent(wxEventType commandType=0, int id=0); wxStyledTextEvent(wxEventType commandType=0, int id=0);
~wxStyledTextEvent() {} ~wxStyledTextEvent() {}
@@ -248,7 +260,7 @@ public:
bool GetControl() const; bool GetControl() const;
bool GetAlt() const; bool GetAlt() const;
void CopyObject(wxObject& obj) const; virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
#ifndef SWIG #ifndef SWIG
private: private: