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

Warning fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-10-20 14:40:47 +00:00
parent 1e967276d8
commit e191ee8751
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/richtext/richtextbuffer.cpp
View File

@@ -1502,7 +1502,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
{ {
// We'll be using a copy of the paragraph to make style changes, // We'll be using a copy of the paragraph to make style changes,
// not updating the buffer directly. // not updating the buffer directly.
wxRichTextParagraph* newPara = NULL; wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL);
if (haveControl && withUndo) if (haveControl && withUndo)
{ {
@@ -1527,8 +1527,8 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
// we can start applying a different style. // we can start applying a different style.
// TODO: check that the style actually changes or is different // TODO: check that the style actually changes or is different
// from style outside of range // from style outside of range
wxRichTextObject* firstObject = NULL; wxRichTextObject* firstObject wxDUMMY_INITIALIZE(NULL);
wxRichTextObject* lastObject = NULL; wxRichTextObject* lastObject wxDUMMY_INITIALIZE(NULL);
if (childRange.GetStart() == newPara->GetRange().GetStart()) if (childRange.GetStart() == newPara->GetRange().GetStart())
firstObject = newPara->GetChildren().GetFirst()->GetData(); firstObject = newPara->GetChildren().GetFirst()->GetData();
@@ -1596,11 +1596,13 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
/// Get the text attributes for this position. /// Get the text attributes for this position.
bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style) const bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style) const
{ {
wxRichTextObject* obj = NULL; wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL);
if (style.IsParagraphStyle()) if (style.IsParagraphStyle())
obj = GetParagraphAtPosition(position); obj = GetParagraphAtPosition(position);
else else
obj = GetLeafObjectAtPosition(position); obj = GetLeafObjectAtPosition(position);
if (obj) if (obj)
{ {
style = obj->GetAttributes(); style = obj->GetAttributes();
@@ -1613,11 +1615,13 @@ bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style)
/// Get the text attributes for this position. /// Get the text attributes for this position.
bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style) const bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style) const
{ {
wxRichTextObject* obj = NULL; wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL);
if (style.IsParagraphStyle()) if (style.IsParagraphStyle())
obj = GetParagraphAtPosition(position); obj = GetParagraphAtPosition(position);
else else
obj = GetLeafObjectAtPosition(position); obj = GetLeafObjectAtPosition(position);
if (obj) if (obj)
{ {
style = obj->GetAttributes(); style = obj->GetAttributes();
@@ -1869,7 +1873,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range),
wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL; wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL;
wxPoint linePos; wxPoint linePos;
int lineHeight = 0; int lineHeight wxDUMMY_INITIALIZE(0);
if (line) if (line)
{ {
lineHeight = line->GetSize().y; lineHeight = line->GetSize().y;
@@ -4849,12 +4853,11 @@ bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStr
return false; return false;
wxString str; wxString str;
int ch = 0;
int lastCh = 0; int lastCh = 0;
while (!stream.Eof()) while (!stream.Eof())
{ {
ch = stream.GetC(); int ch = stream.GetC();
if (ch == 10 && lastCh != 13) if (ch == 10 && lastCh != 13)
str += wxT('\n'); str += wxT('\n');