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

fixed code for swapping rect corners if out of order (bug 800180)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-26 20:50:27 +00:00
parent 6f96ac03f0
commit d7a7546b8e
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changes.txt
View File

@@ -59,12 +59,12 @@ OTHER CHANGES
All: All:
- added wxGzipInput/OutputStream, bug fixes in wxZlibStreams (M.J.Wetherell)
- wxDateTime::ParseDateTime() implemented (Linus McCabe) - wxDateTime::ParseDateTime() implemented (Linus McCabe)
- wxHTTP::GetResponse() added (David Nock) - wxHTTP::GetResponse() added (David Nock)
- added conversions to/from UTF 16/32 LE/BE (Andreas Pflug) - added conversions to/from UTF 16/32 LE/BE (Andreas Pflug)
- wxFileName::Normalize(wxPATH_NORM_ALL) doesn't lower filename case any more - wxFileName::Normalize(wxPATH_NORM_ALL) doesn't lower filename case any more
- added wxTextInputStream::ReadChar() (M.J.Wetherell) - added wxTextInputStream::ReadChar() (M.J.Wetherell)
- several wxZlibStreams bug fixes enhancements (M.J.Wetherell)
All (GUI): All (GUI):
@@ -72,6 +72,7 @@ All (GUI):
- added wxListCtrl::GetViewRect() - added wxListCtrl::GetViewRect()
- added wxTextCtrl::MarkDirty() - added wxTextCtrl::MarkDirty()
- wxToolBar::ToggleTool() now works for radio buttons (Dag <20>gren) - wxToolBar::ToggleTool() now works for radio buttons (Dag <20>gren)
- bug in wxRect ctor from two [out of order] wxPoints fixed (Steve Cornett)
wxMSW: wxMSW:

16
src/common/gdicmn.cpp
View File

@@ -97,24 +97,26 @@ wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<w
IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight) wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
{ {
x = topLeft.x; x = point1.x;
y = topLeft.y; y = point1.y;
width = bottomRight.x - topLeft.x + 1; width = point2.x - point1.x;
height = bottomRight.y - topLeft.y + 1; height = point2.y - point1.y;
if (width < 0) if (width < 0)
{ {
width = -width; width = -width;
x -= width; x = point2.x;
} }
width++;
if (height < 0) if (height < 0)
{ {
height = -height; height = -height;
y -= height; y = point2.y;
} }
height++;
} }
wxRect::wxRect(const wxPoint& point, const wxSize& size) wxRect::wxRect(const wxPoint& point, const wxSize& size)