Improved wxDCPen/BrushChangers.

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

diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index b06227cc2426b39d4b4d78f427d545ed01934f57..a32f24e8cf25a6089db563e2c8bf1e4233a6db0f 100644 (file)
--- a/src/common/rgncmn.cpp
+++ b/src/common/rgncmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        rgncmn.cpp
+// Name:        src/common/rgncmn.cpp

 // Purpose:     Methods of wxRegion that have a generic implementation
 // Author:      Robin Dunn
 // Modified by:
 // Purpose:     Methods of wxRegion that have a generic implementation
 // Author:      Robin Dunn
 // Modified by:


@@ -13,15 +13,20 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #include "wx/region.h"
 #endif
 
 #include "wx/region.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+#endif //WX_PRECOMP
+

 #include "wx/bitmap.h"
 #include "wx/bitmap.h"

+

 #if wxUSE_IMAGE
 #if wxUSE_IMAGE

-#include "wx/image.h"
+    #include "wx/image.h"

 #endif
 #endif

-#include "wx/dcmemory.h"

 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------


@@ -131,7 +136,7 @@ bool wxRegion::Union(const wxBitmap& bmp,
                          tolerance);
 #else
     return false;
                          tolerance);
 #else
     return false;

-#endif                         
+#endif

 }
 
 #else
 }
 
 #else