diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 13a67f7c69..6c020d0f53 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: richtext/richtextbuffer.cpp +// Name: src/richtext/richtextbuffer.cpp // Purpose: Buffer for wxRichTextCtrl // Author: Julian Smart // Modified by: @@ -13,7 +13,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_RICHTEXT @@ -21,7 +21,8 @@ #include "wx/richtext/richtextbuffer.h" #ifndef WX_PRECOMP - #include "wx/wx.h" + #include "wx/dc.h" + #include "wx/intl.h" #endif #include "wx/filename.h" @@ -3046,7 +3047,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR return true; } - + bool wxRichTextPlainText::DrawTabbedString(wxDC& dc,const wxRect& rect,wxString& str, wxCoord& x, wxCoord& y, bool selected) { wxArrayInt tab_array = GetAttributes().GetTabs(); @@ -3059,7 +3060,7 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc,const wxRect& rect,wxString& dc.SetMapMode(wxMM_LOMETRIC ); int num_tabs = tab_array.GetCount(); for( int i = 0; i < num_tabs; ++i){ - tab_array[i] = dc.LogicalToDeviceXRel(tab_array[i]); + tab_array[i] = dc.LogicalToDeviceXRel(tab_array[i]); } dc.SetMapMode(map_mode ); int next_tab_pos = -1; @@ -3075,7 +3076,7 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc,const wxRect& rect,wxString& dc.SetTextForeground(GetAttributes().GetTextColour()); dc.SetBackgroundMode(wxTRANSPARENT); } - while(str.Find(wxT('\t')) >= 0){// the string has a tab + while(str.Find(wxT('\t')) >= 0){// the string has a tab // break up the string at the Tab wxString stringChunk = str.BeforeFirst(wxT('\t')); str = str.AfterFirst(wxT('\t')); @@ -3089,18 +3090,18 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc,const wxRect& rect,wxString& if(selected){ w = next_tab_pos - x; wxRect selRect(x, rect.y, w, rect.GetHeight()); - dc.DrawRectangle(selRect); + dc.DrawRectangle(selRect); } dc.DrawText(stringChunk, x, y); x = next_tab_pos; } } } - + dc.GetTextExtent(str, & w, & h); if(selected){ wxRect selRect(x, rect.y, w, rect.GetHeight()); - dc.DrawRectangle(selRect); + dc.DrawRectangle(selRect); } dc.DrawText(str, x, y); x += w; @@ -3147,23 +3148,27 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz wxString stringChunk = m_text.Mid(startPos, (size_t) len); wxCoord w, h; int width = 0; - if(stringChunk.Find(wxT('\t')) >= 0){// the string has a tab + if(stringChunk.Find(wxT('\t')) >= 0){// the string has a tab wxArrayInt tab_array = GetAttributes().GetTabs(); - if(tab_array.IsEmpty()){// create a default tab list at 10 mm each. - for( int i = 0; i < 20; ++i){ + if(tab_array.IsEmpty()) + { + // create a default tab list at 10 mm each. + for( int i = 0; i < 20; ++i) + { tab_array.Add(i*100); } } int map_mode = dc.GetMapMode(); dc.SetMapMode(wxMM_LOMETRIC ); int num_tabs = tab_array.GetCount(); - for( int i = 0; i < num_tabs; ++i){ - tab_array[i] = dc.LogicalToDeviceXRel(tab_array[i]); + for( int i = 0; i < num_tabs; ++i) + { + tab_array[i] = dc.LogicalToDeviceXRel(tab_array[i]); } dc.SetMapMode(map_mode ); int next_tab_pos = -1; - - while(stringChunk.Find(wxT('\t')) >= 0){// the string has a tab + + while(stringChunk.Find(wxT('\t')) >= 0){// the string has a tab // break up the string at the Tab wxString stringFragment = stringChunk.BeforeFirst(wxT('\t')); stringChunk = stringChunk.AfterFirst(wxT('\t')); @@ -3174,7 +3179,7 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz for( int i = 0; i < num_tabs && not_found; ++i){ next_tab_pos = tab_array.Item(i); if( next_tab_pos > absolute_width){ - not_found = false; + not_found = false; width = next_tab_pos - position.x; } } @@ -3183,7 +3188,7 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz dc.GetTextExtent(stringChunk, & w, & h, & descent); width += w; size = wxSize(width, dc.GetCharHeight()); - + return true; } @@ -4922,7 +4927,7 @@ bool wxRichTextAttr::GetFontAttributes(const wxFont& font) wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& attr, const wxRichTextAttr& attrDef, const wxTextCtrlBase *text) -{ +{ wxColour colFg = attr.GetTextColour(); if ( !colFg.Ok() ) { @@ -4945,19 +4950,19 @@ wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& attr, if (attr.HasWeight()) newAttr.SetFontWeight(attr.GetFontWeight()); - + if (attr.HasSize()) newAttr.SetFontSize(attr.GetFontSize()); - + if (attr.HasItalic()) newAttr.SetFontStyle(attr.GetFontStyle()); - + if (attr.HasUnderlined()) newAttr.SetFontUnderlined(attr.GetFontUnderlined()); - + if (attr.HasFaceName()) newAttr.SetFontFaceName(attr.GetFontFaceName()); - + if (attr.HasAlignment()) newAttr.SetAlignment(attr.GetAlignment()); else if (attrDef.HasAlignment()) @@ -4977,33 +4982,33 @@ wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& attr, newAttr.SetRightIndent(attr.GetRightIndent()); else if (attrDef.HasRightIndent()) newAttr.SetRightIndent(attrDef.GetRightIndent()); - + // NEW ATTRIBUTES - + if (attr.HasParagraphSpacingAfter()) newAttr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter()); - + if (attr.HasParagraphSpacingBefore()) newAttr.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore()); if (attr.HasLineSpacing()) newAttr.SetLineSpacing(attr.GetLineSpacing()); - + if (attr.HasCharacterStyleName()) newAttr.SetCharacterStyleName(attr.GetCharacterStyleName()); - + if (attr.HasParagraphStyleName()) newAttr.SetParagraphStyleName(attr.GetParagraphStyleName()); - + if (attr.HasBulletStyle()) newAttr.SetBulletStyle(attr.GetBulletStyle()); if (attr.HasBulletNumber()) newAttr.SetBulletNumber(attr.GetBulletNumber()); - + if (attr.HasBulletSymbol()) newAttr.SetBulletSymbol(attr.GetBulletSymbol()); - + return newAttr; } @@ -5059,7 +5064,7 @@ void wxTextAttrEx::operator= (const wxTextAttr& attr) wxTextAttrEx wxTextAttrEx::CombineEx(const wxTextAttrEx& attr, const wxTextAttrEx& attrDef, const wxTextCtrlBase *text) -{ +{ wxTextAttrEx newAttr; // If attr specifies the complete font, just use that font, overriding all @@ -5165,33 +5170,33 @@ wxTextAttrEx wxTextAttrEx::CombineEx(const wxTextAttrEx& attr, newAttr.SetRightIndent(attr.GetRightIndent()); else if (attrDef.HasRightIndent()) newAttr.SetRightIndent(attrDef.GetRightIndent()); - + // NEW ATTRIBUTES - + if (attr.HasParagraphSpacingAfter()) newAttr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter()); - + if (attr.HasParagraphSpacingBefore()) newAttr.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore()); if (attr.HasLineSpacing()) newAttr.SetLineSpacing(attr.GetLineSpacing()); - + if (attr.HasCharacterStyleName()) newAttr.SetCharacterStyleName(attr.GetCharacterStyleName()); - + if (attr.HasParagraphStyleName()) newAttr.SetParagraphStyleName(attr.GetParagraphStyleName()); - + if (attr.HasBulletStyle()) newAttr.SetBulletStyle(attr.GetBulletStyle()); if (attr.HasBulletNumber()) newAttr.SetBulletNumber(attr.GetBulletNumber()); - + if (attr.HasBulletSymbol()) newAttr.SetBulletSymbol(attr.GetBulletSymbol()); - + return newAttr; } diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index b3cef4837e..1c06c5137d 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -21,8 +21,10 @@ #include "wx/richtext/richtextctrl.h" #ifndef WX_PRECOMP - #include "wx/wx.h" #include "wx/settings.h" + #include "wx/menu.h" + #include "wx/intl.h" + #include "wx/stopwatch.h" #endif #include "wx/textfile.h" @@ -155,7 +157,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va RecreateBuffer(size); SetCursor(wxCursor(wxCURSOR_IBEAM)); - + if (!value.IsEmpty()) SetValue(value); @@ -1645,7 +1647,7 @@ wxRichTextCtrl::HitTest(const wxPoint& pt, { wxClientDC dc((wxRichTextCtrl*) this); ((wxRichTextCtrl*)this)->PrepareDC(dc); - + // Buffer uses logical position (relative to start of buffer) // so convert wxPoint pt2 = GetLogicalPoint(pt); @@ -2222,7 +2224,7 @@ const wxTextAttrEx& wxRichTextCtrl::GetDefaultStyleEx() const const wxTextAttr& wxRichTextCtrl::GetDefaultStyle() const { - return GetBuffer().GetDefaultStyle(); + return GetBuffer().GetDefaultStyle(); } bool wxRichTextCtrl::GetStyle(long position, wxTextAttr& style) const diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index 81b44e7a0c..6ec0aed2d1 100644 --- a/src/richtext/richtexthtml.cpp +++ b/src/richtext/richtexthtml.cpp @@ -21,7 +21,6 @@ #include "wx/richtext/richtexthtml.h" #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "wx/filename.h" diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp index 1a4d342fca..6ecda90988 100644 --- a/src/richtext/richtextstyles.cpp +++ b/src/richtext/richtextstyles.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: richtextstyles.cpp +// Name: src/richtext/richtextstyles.cpp // Purpose: Style management for wxRichTextCtrl // Author: Julian Smart -// Modified by: +// Modified by: // Created: 2005-09-30 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -21,7 +21,7 @@ #include "wx/richtext/richtextstyles.h" #ifndef WX_PRECOMP - #include "wx/wx.h" + #include "wx/dcclient.h" #endif #include "wx/filename.h" @@ -79,7 +79,7 @@ wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxList& list, c if (def->GetName().Lower() == name.Lower()) return def; } - return NULL; + return NULL; } /// Delete all styles @@ -193,7 +193,7 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons int size = 5; // Standard size is 12, say - size += 12 - def->GetStyle().GetFontSize(); + size += 12 - def->GetStyle().GetFontSize(); str += wxT("GetInsertionPoint(), m_richTextCtrl->GetInsertionPoint()); - + // Flags are defined within each definition, so only certain // attributes are applied. wxRichTextAttr attr(def->GetStyle()); @@ -308,4 +308,3 @@ wxColour wxRichTextStyleListBox::GetSelectedTextBgColour(const wxColour& colBg) #endif // wxUSE_RICHTEXT - diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp index 0d05379693..869560414f 100644 --- a/src/richtext/richtextxml.cpp +++ b/src/richtext/richtextxml.cpp @@ -13,7 +13,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_RICHTEXT && wxUSE_XML @@ -21,7 +21,6 @@ #include "wx/richtext/richtextxml.h" #ifndef WX_PRECOMP - #include "wx/wx.h" #include "wx/intl.h" #endif