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

Added functionality for disabling the vertical scrollbar.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2012-02-23 17:01:30 +00:00
parent bf973818a3
commit 12f5219fac
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/richtext/richtextctrl.h
View File

@@ -1676,6 +1676,16 @@ public:
*/ */
virtual bool CanInsertContent(wxRichTextParagraphLayoutBox& container, long pos) const; virtual bool CanInsertContent(wxRichTextParagraphLayoutBox& container, long pos) const;
/**
Enable or disable the vertical scrollbar.
*/
virtual void EnableVerticalScrollbar(bool enable);
/**
Returns @true if the vertical scrollbar is enabled.
*/
virtual bool GetVerticalScrollbarEnabled() const { return m_verticalScrollbarEnabled; }
// Command handlers // Command handlers
/** /**
@@ -2159,6 +2169,9 @@ protected:
/// Are we editable? /// Are we editable?
bool m_editable; bool m_editable;
/// Is the vertical scrollbar enabled?
bool m_verticalScrollbarEnabled;
/// Are we showing the caret position at the start of a line /// Are we showing the caret position at the start of a line
/// instead of at the end of the previous one? /// instead of at the end of the previous one?
bool m_caretAtLineStart; bool m_caretAtLineStart;

10
interface/wx/richtext/richtextctrl.h
View File

@@ -1635,6 +1635,16 @@ public:
*/ */
virtual bool CanInsertContent(wxRichTextParagraphLayoutBox& container, long pos) const; virtual bool CanInsertContent(wxRichTextParagraphLayoutBox& container, long pos) const;
/**
Enable or disable the vertical scrollbar.
*/
virtual void EnableVerticalScrollbar(bool enable);
/**
Returns @true if the vertical scrollbar is enabled.
*/
virtual bool GetVerticalScrollbarEnabled() const;
// Command handlers // Command handlers
/** /**

9
src/richtext/richtextctrl.cpp
View File

@@ -356,6 +356,7 @@ void wxRichTextCtrl::Init()
m_selectionAnchorObject = NULL; m_selectionAnchorObject = NULL;
m_selectionState = wxRichTextCtrlSelectionState_Normal; m_selectionState = wxRichTextCtrlSelectionState_Normal;
m_editable = true; m_editable = true;
m_verticalScrollbarEnabled = true;
m_caretAtLineStart = false; m_caretAtLineStart = false;
m_dragging = false; m_dragging = false;
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
@@ -2555,7 +2556,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop)
if (IsFrozen()) if (IsFrozen())
return; return;
if (GetBuffer().IsEmpty()) if (GetBuffer().IsEmpty() || !m_verticalScrollbarEnabled)
{ {
SetScrollbars(0, 0, 0, 0, 0, 0); SetScrollbars(0, 0, 0, 0, 0, 0);
return; return;
@@ -4560,6 +4561,12 @@ bool wxRichTextCtrl::CanInsertContent(wxRichTextParagraphLayoutBox& WXUNUSED(con
return true; return true;
} }
void wxRichTextCtrl::EnableVerticalScrollbar(bool enable)
{
m_verticalScrollbarEnabled = enable;
SetupScrollbars();
}
#if wxRICHTEXT_USE_OWN_CARET #if wxRICHTEXT_USE_OWN_CARET