Applied patch [ 1178610 ] datectlg.cpp: wxDropdownButton + bug fixes

[wxWidgets.git] / src / generic / sashwin.cpp

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index ad855afdbc82af2428752c880ed4ebd195a9661b..b2cd42c75979c77e7954acaa5e530d043fae5423 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -30,7 +30,8 @@
     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 

-#include <math.h>
+#include "wx/math.h"
+

 #include <stdlib.h>
 
 #include "wx/dcscreen.h"
 #include <stdlib.h>
 
 #include "wx/dcscreen.h"


@@ -483,8 +484,10 @@ void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc)
     wxPen darkShadowPen(m_darkShadowColour, 1, wxSOLID);
     wxPen lightShadowPen(m_lightShadowColour, 1, wxSOLID);
     wxPen hilightPen(m_hilightColour, 1, wxSOLID);
     wxPen darkShadowPen(m_darkShadowColour, 1, wxSOLID);
     wxPen lightShadowPen(m_lightShadowColour, 1, wxSOLID);
     wxPen hilightPen(m_hilightColour, 1, wxSOLID);

-    wxPen blackPen(wxColour(0, 0, 0), 1, wxSOLID);
-    wxPen whitePen(wxColour(255, 255, 255), 1, wxSOLID);
+    wxColour blackClr(0, 0, 0);
+    wxColour whiteClr(255, 255, 255);
+    wxPen blackPen(blackClr, 1, wxSOLID);
+    wxPen whitePen(whiteClr, 1, wxSOLID);

 
     if ( edge == wxSASH_LEFT || edge == wxSASH_RIGHT )
     {
 
     if ( edge == wxSASH_LEFT || edge == wxSASH_RIGHT )
     {