added {debughlp|stackwalk}.{h|cpp}

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index a2c7cb5a8c74f10dac92f48cceaefdbc99fab593..5de95ee422c64f3a6f94d7fc83974afa039f952e 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -42,7 +42,7 @@
 #include "wx/log.h"
 #include <string.h>
 
-#if defined(__WXMSW__) && !defined(__PALMOS__)
+#if defined(__WXMSW__)
 #include "wx/msw/wrapwin.h"
 #endif
 
@@ -138,8 +138,13 @@ wxRect wxRect::operator+(const wxRect& rect) const
 
 wxRect& wxRect::Union(const wxRect& rect)
 {
-    // ignore empty rectangles
-    if ( rect.width && rect.height )
+    // ignore empty rectangles: union with an empty rectangle shouldn't extend
+    // this one to (0, 0)
+    if ( !width || !height )
+    {
+        *this = rect;
+    }
+    else if ( rect.width && rect.height )
     {
         int x1 = wxMin(x, rect.x);
         int y1 = wxMin(y, rect.y);
@@ -151,6 +156,7 @@ wxRect& wxRect::Union(const wxRect& rect)
         width = x2 - x1;
         height = y2 - y1;
     }
+    //else: we're not empty and rect is empty
 
     return *this;
 }
@@ -388,7 +394,7 @@ void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour)
     }
     else // new colour
     {
-        (*m_map)[name] = new wxColour(colour);
+        (*m_map)[colName] = new wxColour(colour);
     }
 }