Added more 3d rendering to row and col labels and removed sunken border style from...

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

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index df44939ecb400619b12dab6c33952562393ecadf..b326c0caee146038ca7150f65bcbc2da27c98a0f 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -26,9 +26,7 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#if !wxUSE_SASH
-    #error "Thisfile requires wxUSE_SASH to be defined."
-#endif // wxUSE_SASH
+#if wxUSE_SASH

 
 #include <math.h>
 #include <stdlib.h>
 
 #include <math.h>
 #include <stdlib.h>


@@ -38,7 +36,6 @@
 #include "wx/sashwin.h"
 #include "wx/laywin.h"
 
 #include "wx/sashwin.h"
 #include "wx/laywin.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxSashEvent, wxCommandEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxSashEvent, wxCommandEvent)
 


@@ -47,7 +44,6 @@ BEGIN_EVENT_TABLE(wxSashWindow, wxWindow)
     EVT_SIZE(wxSashWindow::OnSize)
     EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)
 END_EVENT_TABLE()
     EVT_SIZE(wxSashWindow::OnSize)
     EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)
 END_EVENT_TABLE()

-#endif

 
 wxSashWindow::wxSashWindow()
 {
 
 wxSashWindow::wxSashWindow()
 {


@@ -124,10 +120,10 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
 
     if (event.LeftDown())
     {
 
     if (event.LeftDown())
     {

+        CaptureMouse();
+

         if ( sashHit != wxSASH_NONE )
         {
         if ( sashHit != wxSASH_NONE )
         {

-            CaptureMouse();
-

             // Required for X to specify that
             // that we wish to draw on top of all windows
             // - and we optimise by specifying the area
             // Required for X to specify that
             // that we wish to draw on top of all windows
             // - and we optimise by specifying the area


@@ -149,6 +145,15 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
             m_draggingEdge = sashHit;
             m_firstX = x;
             m_firstY = y;
             m_draggingEdge = sashHit;
             m_firstX = x;
             m_firstY = y;

+
+            if ( (sashHit == wxSASH_LEFT) || (sashHit == wxSASH_RIGHT) )
+            {
+                SetCursor(*m_sashCursorWE);
+            }
+            else
+            {
+                SetCursor(*m_sashCursorNS);
+            }

         }
     }
     else if ( event.LeftUp() && m_dragMode == wxSASH_DRAG_LEFT_DOWN )
         }
     }
     else if ( event.LeftUp() && m_dragMode == wxSASH_DRAG_LEFT_DOWN )


@@ -281,6 +286,10 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         event.SetDragRect(dragRect);
         GetEventHandler()->ProcessEvent(event);
     }
         event.SetDragRect(dragRect);
         GetEventHandler()->ProcessEvent(event);
     }

+    else if ( event.LeftUp() )
+    {
+        ReleaseMouse();
+    }

     else if (event.Moving() && !event.Dragging())
     {
         // Just change the cursor if required
     else if (event.Moving() && !event.Dragging())
     {
         // Just change the cursor if required


@@ -671,3 +680,4 @@ void wxSashWindow::SetSashVisible(wxSashEdgePosition edge, bool sash)
         m_sashes[edge].m_margin = 0;
 }
 
         m_sashes[edge].m_margin = 0;
 }
 

+#endif // wxUSE_SASH