Fixed warning, move caret in OnPaint

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-10-21 14:50:29 +00:00
parent be665c07ab
commit 7383cf9d17
2 changed files with 3 additions and 1 deletions

View File

@@ -243,8 +243,8 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT); GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);
GetBuffer().SetDirty(false); GetBuffer().SetDirty(false);
SetupScrollbars(); SetupScrollbars();
PositionCaret();
} }
PositionCaret();
GetBuffer().Draw(dc, GetBuffer().GetRange(), GetSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */); GetBuffer().Draw(dc, GetBuffer().GetRange(), GetSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);
} }

View File

@@ -339,6 +339,7 @@ static wxOutputStream& operator <<(wxOutputStream& stream, const wxString& s)
return stream; return stream;
} }
#if 0
static wxOutputStream& operator <<(wxOutputStream& stream, long l) static wxOutputStream& operator <<(wxOutputStream& stream, long l)
{ {
wxString str; wxString str;
@@ -352,6 +353,7 @@ static wxOutputStream& operator <<(wxOutputStream& stream, const char c)
str.Printf(wxT("%c"), c); str.Printf(wxT("%c"), c);
return stream << str; return stream << str;
} }
#endif
// Convert a colour to a 6-digit hex string // Convert a colour to a 6-digit hex string
static wxString ColourToHexString(const wxColour& col) static wxString ColourToHexString(const wxColour& col)