compilation fix

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 34df0496ceb30c201545a065ec5ac757de496fc1..eae3619cec93a64c641595af7a755ff43988f401 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -20,7 +20,7 @@
 #pragma hdrstop
 #endif
 
-
+#include "wx/event.h"
 #include "wx/gdicmn.h"
 #include "wx/brush.h"
 #include "wx/pen.h"
@@ -82,7 +82,7 @@ wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
   if (height < 0)
   {
     height = -height;
-    x -= height;
+    y -= height;
   }
 }
 
@@ -270,6 +270,9 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 
 // TODO for other implementations. This should really go into
 // platform-specific directories.
+#ifdef __WXMAC__
+  else return NULL;
+#endif
 #ifdef __WXSTUBS__
   else return NULL;
 #endif
@@ -598,7 +601,7 @@ wxFont *wxFontList::
           //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
           //#else
           each_font->GetFamily () == FamilyOrFontId &&
-          (!each_font->GetFaceName() || each_font->GetFaceName() == Face))
+          ((each_font->GetFaceName() == "") || each_font->GetFaceName() == Face))
         //#endif
         return each_font;
     }