added (and documented) msw.xp-tab-ok option

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 19223f77f70eb8b0a14a0f4e55a0565ddb936005..58f901a085e271587d47d4f55ee8dc2899705b16 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -42,7 +42,7 @@
 #include "wx/log.h"
 #include <string.h>
 
 #include "wx/log.h"
 #include <string.h>
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__PALMOS__)

 #include "wx/msw/wrapwin.h"
 #endif
 
 #include "wx/msw/wrapwin.h"
 #endif
 


@@ -125,6 +125,12 @@ wxRect::wxRect(const wxPoint& point, const wxSize& size)
     width = size.x; height = size.y;
 }
 
     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) &&
 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
             // 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();
 
             {
                 const wxString& fontFace = font->GetFaceName();