add support for hiding columns when using native header control in wxGrid; also added...

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

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 3a4e2b6d9700b39cb9c56f7e58dcf5dff1d495af..f1524dc61a788faf04de4c32580d9e886a6dd5cb 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -28,10 +28,9 @@
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/dcscreen.h"
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/dcscreen.h"

+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/math.h"
-

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


@@ -290,7 +289,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
            ReleaseMouse();
         m_mouseCaptured = false;
     }
            ReleaseMouse();
         m_mouseCaptured = false;
     }

-    else if (event.Moving() && !event.Dragging())
+    else if ((event.Moving() || event.Leaving()) && !event.Dragging())

     {
         // Just change the cursor if required
         if ( sashHit != wxSASH_NONE )
     {
         // Just change the cursor if required
         if ( sashHit != wxSASH_NONE )


@@ -427,10 +426,10 @@ void wxSashWindow::DrawBorders(wxDC& dc)
     int w, h;
     GetClientSize(&w, &h);
 
     int w, h;
     GetClientSize(&w, &h);
 

-    wxPen mediumShadowPen(m_mediumShadowColour, 1, wxSOLID);
-    wxPen darkShadowPen(m_darkShadowColour, 1, wxSOLID);
-    wxPen lightShadowPen(m_lightShadowColour, 1, wxSOLID);
-    wxPen hilightPen(m_hilightColour, 1, wxSOLID);
+    wxPen mediumShadowPen(m_mediumShadowColour, 1, wxPENSTYLE_SOLID);
+    wxPen darkShadowPen(m_darkShadowColour, 1, wxPENSTYLE_SOLID);
+    wxPen lightShadowPen(m_lightShadowColour, 1, wxPENSTYLE_SOLID);
+    wxPen hilightPen(m_hilightColour, 1, wxPENSTYLE_SOLID);

 
     if ( GetWindowStyleFlag() & wxSW_3DBORDER )
     {
 
     if ( GetWindowStyleFlag() & wxSW_3DBORDER )
     {


@@ -476,16 +475,16 @@ void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc)
     int w, h;
     GetClientSize(&w, &h);
 
     int w, h;
     GetClientSize(&w, &h);
 

-    wxPen facePen(m_faceColour, 1, wxSOLID);
-    wxBrush faceBrush(m_faceColour, wxSOLID);
-    wxPen mediumShadowPen(m_mediumShadowColour, 1, wxSOLID);
-    wxPen darkShadowPen(m_darkShadowColour, 1, wxSOLID);
-    wxPen lightShadowPen(m_lightShadowColour, 1, wxSOLID);
-    wxPen hilightPen(m_hilightColour, 1, wxSOLID);
+    wxPen facePen(m_faceColour, 1, wxPENSTYLE_SOLID);
+    wxBrush faceBrush(m_faceColour, wxBRUSHSTYLE_SOLID);
+    wxPen mediumShadowPen(m_mediumShadowColour, 1, wxPENSTYLE_SOLID);
+    wxPen darkShadowPen(m_darkShadowColour, 1, wxPENSTYLE_SOLID);
+    wxPen lightShadowPen(m_lightShadowColour, 1, wxPENSTYLE_SOLID);
+    wxPen hilightPen(m_hilightColour, 1, wxPENSTYLE_SOLID);

     wxColour blackClr(0, 0, 0);
     wxColour whiteClr(255, 255, 255);
     wxColour blackClr(0, 0, 0);
     wxColour whiteClr(255, 255, 255);

-    wxPen blackPen(blackClr, 1, wxSOLID);
-    wxPen whitePen(whiteClr, 1, wxSOLID);
+    wxPen blackPen(blackClr, 1, wxPENSTYLE_SOLID);
+    wxPen whitePen(whiteClr, 1, wxPENSTYLE_SOLID);

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


@@ -588,7 +587,7 @@ void wxSashWindow::DrawSashTracker(wxSashEdgePosition edge, int x, int y)
     ClientToScreen(&x1, &y1);
     ClientToScreen(&x2, &y2);
 
     ClientToScreen(&x1, &y1);
     ClientToScreen(&x2, &y2);
 

-    wxPen sashTrackerPen(*wxBLACK, 2, wxSOLID);
+    wxPen sashTrackerPen(*wxBLACK, 2, wxPENSTYLE_SOLID);

 
     screenDC.SetLogicalFunction(wxINVERT);
     screenDC.SetPen(sashTrackerPen);
 
     screenDC.SetLogicalFunction(wxINVERT);
     screenDC.SetPen(sashTrackerPen);