wxMemoryDC constructor now optionally accepts a wxBitmap parameter,

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

diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index 7f3c8e029569d0a1823912b5b31ee56b75a6dc74..e72542ecf4d22012ab62be91240fb3f31d175797 100644 (file)
--- a/src/common/effects.cpp
+++ b/src/common/effects.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        effects.cpp
+// Name:        src/common/effects.cpp
 // Purpose:     wxEffects implementation
 // Author:      Julian Smart
 // Modified by:
@@ -9,23 +9,22 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "effects.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/gdicmn.h"
-#include "wx/pen.h"
-#include "wx/dcmemory.h"
-
 #include "wx/effects.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+    #include "wx/pen.h"
+    #include "wx/settings.h"
+    #include "wx/gdicmn.h"
+#endif //WX_PRECOMP
+
 /*
  * wxEffects: various 3D effects
  */
@@ -35,11 +34,11 @@ IMPLEMENT_CLASS(wxEffects, wxObject)
 // Assume system colours
 wxEffects::wxEffects()
 {
-    m_highlightColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT) ;
-    m_lightShadow = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT) ;
-    m_faceColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
-    m_mediumShadow = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW) ;
-    m_darkShadow = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW) ;
+    m_highlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT) ;
+    m_lightShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT) ;
+    m_faceColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE) ;
+    m_mediumShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW) ;
+    m_darkShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW) ;
 }
 
 // Going from lightest to darkest
@@ -54,7 +53,7 @@ wxEffects::wxEffects(const wxColour& highlightColour, const wxColour& lightShado
 }
 
 // Draw a sunken edge
-void wxEffects::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int borderSize)
+void wxEffects::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int WXUNUSED(borderSize))
 {
     wxPen highlightPen(m_highlightColour, 1, wxSOLID);
     wxPen lightShadowPen(m_lightShadow, 1, wxSOLID);
@@ -87,20 +86,22 @@ void wxEffects::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int borderSize)
     dc.SetPen(wxNullPen);
 }
 
-bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, 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
+    static bool hiColour = (wxDisplayDepth() >= 16) ;
     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(* bitmap.GetPalette());
         dcMem.SetPalette(* bitmap.GetPalette());
     }
+#endif // wxUSE_PALETTE
+
     dcMem.SelectObject(bitmap);
 
     int i, j;
@@ -111,11 +112,13 @@ bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap)
     }
     dcMem.SelectObject(wxNullBitmap);
 
+#if wxUSE_PALETTE
     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(wxNullPalette);
         dcMem.SetPalette(wxNullPalette);
     }
+#endif // wxUSE_PALETTE
 
-    return TRUE;
+    return true;
 }