fixed wxrc's dependencies

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

diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index ae4c66e40fc4ded9b8f841b507dac94a5ae82914..f1d31dd0b3a2d562f6377012a5cbb560b713c4cb 100644 (file)
--- a/src/common/effects.cpp
+++ b/src/common/effects.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "effects.h"
 #endif
 
@@ -35,11 +35,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
@@ -96,11 +96,14 @@ bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap)
 
     wxMemoryDC dcMem;
 
+#if wxUSE_PALETTE
     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(* bitmap.GetPalette());
         dcMem.SetPalette(* bitmap.GetPalette());
     }
+#endif // wxUSE_PALETTE
+
     dcMem.SelectObject(bitmap);
 
     int i, j;
@@ -111,11 +114,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;
 }