//END SW
std::vector<CrystalLineParser::TEXTBLOCK> MergeTextBlocks(const std::vector<CrystalLineParser::TEXTBLOCK>& blocks1, const std::vector<CrystalLineParser::TEXTBLOCK>& blocks2) const;
- std::vector<CrystalLineParser::TEXTBLOCK> GetMarkerTextBlocks(int nLineIndex) const;
+ virtual std::vector<CrystalLineParser::TEXTBLOCK> GetMarkerTextBlocks(int nLineIndex) const;
virtual std::vector<CrystalLineParser::TEXTBLOCK> GetAdditionalTextBlocks (int nLineIndex);
public:
pDoc->UpdateHeaderActivity(m_nThisPane, !!bActivate);
}
+std::vector<CrystalLineParser::TEXTBLOCK> CMergeEditView::GetMarkerTextBlocks(int nLineIndex) const
+{
+ if (m_bDetailView)
+ {
+ if (nLineIndex < m_lineBegin || nLineIndex > m_lineEnd)
+ return std::vector<CrystalLineParser::TEXTBLOCK>();
+ }
+ return CCrystalTextView::GetMarkerTextBlocks(nLineIndex);
+}
+
std::vector<TEXTBLOCK> CMergeEditView::GetAdditionalTextBlocks (int nLineIndex)
{
static const std::vector<TEXTBLOCK> emptyBlocks;
void SelectArea(const CPoint & ptStart, const CPoint & ptEnd) { SetSelection(ptStart, ptEnd); } // make public
using CGhostTextView::GetSelection;
virtual void UpdateSiblingScrollPos (bool bHorz) override;
+ virtual std::vector<CrystalLineParser::TEXTBLOCK> GetMarkerTextBlocks(int nLineIndex) const;
virtual std::vector<CrystalLineParser::TEXTBLOCK> GetAdditionalTextBlocks (int nLineIndex) override;
virtual COLORREF GetColor(int nColorIndex) override;
virtual void GetLineColors (int nLineIndex, COLORREF & crBkgnd,