X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/819451b6c76bdcaf5fd8865479209859511aa986..793db75554d2d2bc5dc9b0fc42c0b7aa03a44183:/src/common/rgncmn.cpp?ds=sidebyside

diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index c192366f29..581ecbf68e 100644
--- a/src/common/rgncmn.cpp
+++ b/src/common/rgncmn.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "rgncmn.h"
 #endif
 
@@ -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
 }
 
 //---------------------------------------------------------------------------