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

Extended wxTextAttr and added wxTextCtrl::GetStyle stub

Browse Source 
allow better rich text support.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-06-20 16:25:31 +00:00
parent f22c3c98a0
commit e00a5d3ca1
8 changed files with 663 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/common/textcmn.cpp
View File

@@ -69,6 +69,30 @@ wxTextCtrlBase::~wxTextCtrlBase()
// style functions - not implemented here
// ----------------------------------------------------------------------------
wxTextAttr::wxTextAttr(const wxColour& colText,
const wxColour& colBack,
const wxFont& font,
wxTextAttrAlignment alignment)
: m_colText(colText), m_colBack(colBack), m_font(font), m_textAlignment(alignment)
{
m_flags = 0;
m_leftIndent = 0;
m_rightIndent = 0;
if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR;
if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR;
if (m_font.Ok()) m_flags |= wxTEXT_ATTR_FONT;
if (alignment != wxTEXT_ALIGNMENT_DEFAULT)
m_flags |= wxTEXT_ATTR_ALIGNMENT;
}
void wxTextAttr::Init()
{
m_textAlignment = wxTEXT_ALIGNMENT_DEFAULT;
m_flags = 0;
m_leftIndent = 0;
m_rightIndent = 0;
}
/* static */
wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
const wxTextAttr& attrDef,
@@ -101,9 +125,44 @@ wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
colBg = text->GetBackgroundColour();
}
return wxTextAttr(colFg, colBg, font);
wxTextAttr newAttr(colFg, colBg, font);
if (attr.HasAlignment())
newAttr.SetAlignment(attr.GetAlignment());
else if (attrDef.HasAlignment())
newAttr.SetAlignment(attrDef.GetAlignment());
if (attr.HasTabs())
newAttr.SetTabs(attr.GetTabs());
else if (attrDef.HasTabs())
newAttr.SetTabs(attrDef.GetTabs());
if (attr.HasLeftIndent())
newAttr.SetLeftIndent(attr.GetLeftIndent());
else if (attrDef.HasLeftIndent())
newAttr.SetLeftIndent(attrDef.GetLeftIndent());
if (attr.HasRightIndent())
newAttr.SetRightIndent(attr.GetRightIndent());
else if (attrDef.HasRightIndent())
newAttr.SetRightIndent(attrDef.GetRightIndent());
return newAttr;
}
void wxTextAttr::operator= (const wxTextAttr& attr)
{
m_font = attr.m_font;
m_colText = attr.m_colText;
m_colBack = attr.m_colBack;
m_textAlignment = attr.m_textAlignment;
m_leftIndent = attr.m_leftIndent;
m_rightIndent = attr.m_rightIndent;
m_tabs = attr.m_tabs;
m_flags = attr.m_flags;
}
// apply styling to text range
bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end),
const wxTextAttr& WXUNUSED(style))
@@ -112,6 +171,13 @@ bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end),
return FALSE;
}
// get the styling at the given position
bool wxTextCtrlBase::GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style))
{
// to be implemented in derived TextCtrl classes
return FALSE;
}
// change default text attributes
bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
{

85
src/msw/textctrl.cpp
View File

@@ -1918,7 +1918,9 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
// the richedit 1.0 doesn't handle setting background colour, so don't
// even try to do anything if it's the only thing we want to change
if ( m_verRichEdit == 1 && !style.HasFont() && !style.HasTextColour() )
if ( m_verRichEdit == 1 && !style.HasFont() && !style.HasTextColour() &&
!style.HasLeftIndent() && !style.HasRightIndent() && !style.HasAlignment() &&
!style.HasTabs() )
{
// nothing to do: return TRUE if there was really nothing to do and
// FALSE if we failed to set bg colour
@@ -2032,6 +2034,81 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
wxLogDebug(_T("SendMessage(EM_SETCHARFORMAT, SCF_SELECTION) failed"));
}
// now do the paragraph formatting
PARAFORMAT2 pf;
wxZeroMemory(pf);
// we can't use PARAFORMAT2 with RichEdit 1.0, so pretend it is a simple
// PARAFORMAT in that case
#if wxUSE_RICHEDIT2
if ( m_verRichEdit == 1 )
{
// this is the only thing the control is going to grok
pf.cbSize = sizeof(PARAFORMAT);
}
else
#endif
{
// PARAFORMAT or PARAFORMAT2
pf.cbSize = sizeof(pf);
}
if (style.HasAlignment())
{
pf.dwMask |= PFM_ALIGNMENT;
if (style.GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
pf.wAlignment = PFA_RIGHT;
else if (style.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
pf.wAlignment = PFA_CENTER;
else if (style.GetAlignment() == wxTEXT_ALIGNMENT_JUSTIFIED)
pf.wAlignment = PFA_JUSTIFY;
else
pf.wAlignment = PFA_LEFT;
}
if (style.HasLeftIndent())
{
pf.dwMask |= PFM_STARTINDENT;
// Convert from 1/10 mm to TWIPS
pf.dxStartIndent = (int) (((double) style.GetLeftIndent()) * mm2twips / 10.0) ;
// TODO: do we need to specify dxOffset?
}
if (style.HasRightIndent())
{
pf.dwMask |= PFM_RIGHTINDENT;
// Convert from 1/10 mm to TWIPS
pf.dxRightIndent = (int) (((double) style.GetRightIndent()) * mm2twips / 10.0) ;
}
if (style.HasTabs())
{
pf.dwMask |= PFM_TABSTOPS;
const wxArrayInt& tabs = style.GetTabs();
pf.cTabCount = wxMin(tabs.GetCount(), MAX_TAB_STOPS);
size_t i;
for (i = 0; i < (size_t) pf.cTabCount; i++)
{
// Convert from 1/10 mm to TWIPS
pf.rgxTabs[i] = (int) (((double) tabs[i]) * mm2twips / 10.0) ;
}
}
if (pf.dwMask != 0)
{
// do format the selection
bool ok = ::SendMessage(GetHwnd(), EM_SETPARAFORMAT,
0, (LPARAM) &pf) != 0;
if ( !ok )
{
wxLogDebug(_T("SendMessage(EM_SETPARAFORMAT, 0) failed"));
}
}
if ( changeSel )
{
// restore the original selection
@@ -2054,6 +2131,12 @@ bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)
return TRUE;
}
bool wxTextCtrl::GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style))
{
// TODO
return FALSE;
}
#endif
// ----------------------------------------------------------------------------