fixed code for swapping rect corners if out of order (bug 800180)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6f96ac03f0
commit
d7a7546b8e
@ -59,12 +59,12 @@ OTHER CHANGES
|
||||
|
||||
All:
|
||||
|
||||
- added wxGzipInput/OutputStream, bug fixes in wxZlibStreams (M.J.Wetherell)
|
||||
- wxDateTime::ParseDateTime() implemented (Linus McCabe)
|
||||
- wxHTTP::GetResponse() added (David Nock)
|
||||
- added conversions to/from UTF 16/32 LE/BE (Andreas Pflug)
|
||||
- wxFileName::Normalize(wxPATH_NORM_ALL) doesn't lower filename case any more
|
||||
- added wxTextInputStream::ReadChar() (M.J.Wetherell)
|
||||
- several wxZlibStreams bug fixes enhancements (M.J.Wetherell)
|
||||
|
||||
All (GUI):
|
||||
|
||||
@ -72,6 +72,7 @@ All (GUI):
|
||||
- added wxListCtrl::GetViewRect()
|
||||
- added wxTextCtrl::MarkDirty()
|
||||
- wxToolBar::ToggleTool() now works for radio buttons (Dag Ågren)
|
||||
- bug in wxRect ctor from two [out of order] wxPoints fixed (Steve Cornett)
|
||||
|
||||
wxMSW:
|
||||
|
||||
|
@ -97,24 +97,26 @@ wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<w
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
|
||||
|
||||
wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
|
||||
wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
|
||||
{
|
||||
x = topLeft.x;
|
||||
y = topLeft.y;
|
||||
width = bottomRight.x - topLeft.x + 1;
|
||||
height = bottomRight.y - topLeft.y + 1;
|
||||
x = point1.x;
|
||||
y = point1.y;
|
||||
width = point2.x - point1.x;
|
||||
height = point2.y - point1.y;
|
||||
|
||||
if (width < 0)
|
||||
{
|
||||
width = -width;
|
||||
x -= width;
|
||||
x = point2.x;
|
||||
}
|
||||
width++;
|
||||
|
||||
if (height < 0)
|
||||
{
|
||||
height = -height;
|
||||
y -= height;
|
||||
y = point2.y;
|
||||
}
|
||||
height++;
|
||||
}
|
||||
|
||||
wxRect::wxRect(const wxPoint& point, const wxSize& size)
|
||||
|
Loading…
Reference in New Issue
Block a user