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

Simplify wxRect construction at the wxPoint(0,0) with given size.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-11-05 21:04:46 +00:00
parent 141f4958e0
commit 34158fee38
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/univ/textctrl.cpp
View File

@@ -695,7 +695,7 @@ bool wxTextCtrl::Create(wxWindow *parent,
// create data object for single line controls // create data object for single line controls
m_data.sdata = new wxTextSingleLineData; m_data.sdata = new wxTextSingleLineData;
} }
#if wxUSE_TWO_WINDOWS #if wxUSE_TWO_WINDOWS
if ((style & wxBORDER_MASK) == 0) if ((style & wxBORDER_MASK) == 0)
style |= wxBORDER_SUNKEN; style |= wxBORDER_SUNKEN;
@@ -1650,7 +1650,7 @@ wxString wxTextCtrl::GetLineText(wxTextCoord line) const
{ {
//this is called during DoGetBestSize //this is called during DoGetBestSize
if (line == 0 && GetLineCount() == 0) return wxEmptyString ; if (line == 0 && GetLineCount() == 0) return wxEmptyString ;
wxCHECK_MSG( (size_t)line < GetLineCount(), _T(""), wxCHECK_MSG( (size_t)line < GetLineCount(), _T(""),
_T("line index out of range") ); _T("line index out of range") );
@@ -2360,7 +2360,7 @@ wxSize wxTextCtrl::DoGetBestClientSize() const
void wxTextCtrl::UpdateTextRect() void wxTextCtrl::UpdateTextRect()
{ {
wxRect rectTotal(wxPoint(0, 0), GetClientSize()); wxRect rectTotal(GetClientSize());
wxCoord *extraSpace = WrapLines() ? &WData().m_widthMark : NULL; wxCoord *extraSpace = WrapLines() ? &WData().m_widthMark : NULL;
m_rectText = GetRenderer()->GetTextClientArea(this, rectTotal, extraSpace); m_rectText = GetRenderer()->GetTextClientArea(this, rectTotal, extraSpace);
@@ -4146,7 +4146,7 @@ void wxTextCtrl::DoDraw(wxControlRenderer *renderer)
// the update region is in window coords and text area is in the client // the update region is in window coords and text area is in the client
// ones, so it must be shifted before computing intersection // ones, so it must be shifted before computing intersection
wxRegion rgnUpdate = GetUpdateRegion(); wxRegion rgnUpdate = GetUpdateRegion();
wxRect rectTextArea = GetRealTextArea(); wxRect rectTextArea = GetRealTextArea();
wxPoint pt = GetClientAreaOrigin(); wxPoint pt = GetClientAreaOrigin();
wxRect rectTextAreaAdjusted = rectTextArea; wxRect rectTextAreaAdjusted = rectTextArea;