removed more unneeded files, see patch 890642

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

diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index c4fb8fae0b5be9258dca8753724553140af8e423..581ecbf68eb209445f2a25e8134d3a8072a85a0d 100644 (file)
--- a/src/common/rgncmn.cpp
+++ b/src/common/rgncmn.cpp
@@ -23,7 +23,9 @@
 
 #include "wx/region.h"
 #include "wx/bitmap.h"
+#if wxUSE_IMAGE
 #include "wx/image.h"
+#endif
 #include "wx/dcmemory.h"
 
 
@@ -48,10 +50,17 @@ wxBitmap wxRegion::ConvertToBitmap() const
 
 //---------------------------------------------------------------------------
 
+#if wxUSE_IMAGE
 bool wxRegion::Union(const wxBitmap& bmp,
                      const wxColour& transColour,
                      int   tolerance)
+#else
+bool wxRegion::Union(const wxBitmap& WXUNUSED(bmp),
+                     const wxColour& WXUNUSED(transColour),
+                     int   WXUNUSED(tolerance))
+#endif
 {
+#if wxUSE_IMAGE
     unsigned char loR, loG, loB;
     unsigned char hiR, hiG, hiB;
 
@@ -113,7 +122,11 @@ bool wxRegion::Union(const wxBitmap& bmp,
         }
     }
 
-    return TRUE;
+    return true;
+#else
+    // No wxImage support
+    return false;
+#endif
 }
 
 //---------------------------------------------------------------------------