X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b941f2d3143c1205fc7c5b01bd254781db728b3..82a16d7e5e5c83e95a4caa7314de2dbfbd1debdc:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 19223f77f7..58f901a085 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -42,7 +42,7 @@ #include "wx/log.h" #include -#ifdef __WXMSW__ +#if defined(__WXMSW__) && !defined(__PALMOS__) #include "wx/msw/wrapwin.h" #endif @@ -125,6 +125,12 @@ wxRect::wxRect(const wxPoint& point, const wxSize& size) width = size.x; height = size.y; } +wxRect::wxRect(const wxSize& size) +{ + x = 0; y = 0; + width = size.x; height = size.y; +} + bool wxRect::operator==(const wxRect& rect) const { return ((x == rect.x) && @@ -854,7 +860,7 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize, // a different font if we create it with empty facename, but it is // still better than never matching anything in the cache at all // in this case - if ( same && !facename.IsEmpty() ) + if ( same && !facename.empty() ) { const wxString& fontFace = font->GetFaceName();