replacing old core graphics with new graphics context implementation

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

diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index bf68eb47403ada6d2f35bd2cd90ce368d6f2b2e4..e72542ecf4d22012ab62be91240fb3f31d175797 100644 (file)
--- a/src/common/effects.cpp
+++ b/src/common/effects.cpp
@@ -22,10 +22,9 @@
     #include "wx/dcmemory.h"
     #include "wx/pen.h"
     #include "wx/settings.h"
     #include "wx/dcmemory.h"
     #include "wx/pen.h"
     #include "wx/settings.h"

+    #include "wx/gdicmn.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/gdicmn.h"
-

 /*
  * wxEffects: various 3D effects
  */
 /*
  * wxEffects: various 3D effects
  */


@@ -89,14 +88,13 @@ void wxEffects::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int WXUNUSED(border
 
 bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap)
 {
 
 bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap)
 {

-    static bool hiColour = (wxDisplayDepth() >= 16) ;
-

     int w = bitmap.GetWidth();
     int h = bitmap.GetHeight();
 
     wxMemoryDC dcMem;
 
 #if wxUSE_PALETTE
     int w = bitmap.GetWidth();
     int h = bitmap.GetHeight();
 
     wxMemoryDC dcMem;
 
 #if wxUSE_PALETTE

+    static bool hiColour = (wxDisplayDepth() >= 16) ;

     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(* bitmap.GetPalette());
     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(* bitmap.GetPalette());