no changes, just refactor the code sending spin update event to SendSpinUpdate()...

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

diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index 965c5724eafbfc6a22873aaba4a81c596cc9c67b..4439ff42bae167624d271913988d00289fa10ca1 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:
 // Purpose:     wxEffects implementation
 // Author:      Julian Smart
 // Modified by:


@@ -9,23 +9,22 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "effects.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/gdicmn.h"
-#include "wx/pen.h"
-#include "wx/dcmemory.h"
-#include "wx/settings.h"

 #include "wx/effects.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
  */
 /*
  * wxEffects: various 3D effects
  */


@@ -35,11 +34,11 @@ IMPLEMENT_CLASS(wxEffects, wxObject)
 // Assume system colours
 wxEffects::wxEffects()
 {
 // 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
 }
 
 // Going from lightest to darkest


@@ -87,16 +86,15 @@ void wxEffects::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int WXUNUSED(border
     dc.SetPen(wxNullPen);
 }
 
     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
     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());


@@ -104,7 +102,7 @@ bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap)
     }
 #endif // wxUSE_PALETTE
 
     }
 #endif // wxUSE_PALETTE
 

-    dcMem.SelectObject(bitmap);
+    dcMem.SelectObjectAsSource(bitmap);

 
     int i, j;
     for (i = rect.x; i < rect.x + rect.width; i += w)
 
     int i, j;
     for (i = rect.x; i < rect.x + rect.width; i += w)


@@ -122,5 +120,5 @@ bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap)
     }
 #endif // wxUSE_PALETTE
 
     }
 #endif // wxUSE_PALETTE
 

-    return TRUE;
+    return true;

 }
 }