use CVSROOT/modules now instead

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

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 5f0bbe3ba1b0cd014029d5bbd7312e35aacb3be3..a808264d02be01f497dfa1b551d46300d28091d3 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -45,28 +45,19 @@ BEGIN_EVENT_TABLE(wxSashWindow, wxWindow)
     EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)
 END_EVENT_TABLE()
 
-wxSashWindow::wxSashWindow()
+bool wxSashWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
+    const wxSize& size, long style, const wxString& name)
 {
-    m_draggingEdge = wxSASH_NONE;
-    m_dragMode = wxSASH_DRAG_NONE;
-    m_oldX = 0;
-    m_oldY = 0;
-    m_firstX = 0;
-    m_firstY = 0;
-    m_borderSize = 3 ;
-    m_extraBorderSize = 0;
-    m_sashCursorWE = NULL;
-    m_sashCursorNS = NULL;
+    return wxWindow::Create(parent, id, pos, size, style, name);
+}
 
-    m_minimumPaneSizeX = 0;
-    m_minimumPaneSizeY = 0;
-    m_maximumPaneSizeX = 10000;
-    m_maximumPaneSizeY = 10000;
+wxSashWindow::~wxSashWindow()
+{
+    delete m_sashCursorWE;
+    delete m_sashCursorNS;
 }
 
-wxSashWindow::wxSashWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos,
-    const wxSize& size, long style, const wxString& name)
-  :wxWindow(parent, id, pos, size, style, name)
+void wxSashWindow::Init()
 {
     m_draggingEdge = wxSASH_NONE;
     m_dragMode = wxSASH_DRAG_NONE;
@@ -87,12 +78,6 @@ wxSashWindow::wxSashWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos,
     InitColours();
 }
 
-wxSashWindow::~wxSashWindow()
-{
-    delete m_sashCursorWE;
-    delete m_sashCursorNS;
-}
-
 void wxSashWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
@@ -111,11 +96,11 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
     wxSashEdgePosition sashHit = SashHitTest(x, y);
 
     // reset the cursor
-#ifdef __WXMOTIF__
+#if defined(__WXMOTIF__) || defined(__WXGTK__)
     SetCursor(* wxSTANDARD_CURSOR);
 #endif
 #ifdef __WXMSW__
-    SetCursor(wxCursor());
+    SetCursor(wxNullCursor);
 #endif
 
     if (event.LeftDown())
@@ -306,7 +291,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         }
         else
         {
-            SetCursor(* wxSTANDARD_CURSOR);
+            SetCursor(wxNullCursor);
         }
     }
     else if ( event.Dragging() &&
@@ -415,7 +400,7 @@ void wxSashWindow::DrawBorders(wxDC& dc)
     wxPen lightShadowPen(m_lightShadowColour, 1, wxSOLID);
     wxPen hilightPen(m_hilightColour, 1, wxSOLID);
 
-    if ( GetWindowStyleFlag() & wxSW_3D )
+    if ( GetWindowStyleFlag() & wxSW_3DBORDER )
     {
         dc.SetPen(mediumShadowPen);
         dc.DrawLine(0, 0, w-1, 0);
@@ -480,7 +465,7 @@ void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc)
         dc.SetBrush(faceBrush);
         dc.DrawRectangle(sashPosition, 0, GetEdgeMargin(edge), h);
 
-        if (GetWindowStyleFlag() & wxSW_3D)
+        if (GetWindowStyleFlag() & wxSW_3DSASH)
         {
             if (edge == wxSASH_LEFT)
             {
@@ -491,9 +476,9 @@ void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc)
             }
             else
             {
-                // Draw a light grey line on the right to indicate that the
+                // Draw a highlight line on the right to indicate that the
                 // sash is raised
-                dc.SetPen(lightShadowPen);
+                dc.SetPen(hilightPen);
                 dc.DrawLine(w - GetEdgeMargin(edge), 0, w - GetEdgeMargin(edge), h);
             }
         }
@@ -510,13 +495,13 @@ void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc)
         dc.SetBrush(faceBrush);
         dc.DrawRectangle(0, sashPosition, w, GetEdgeMargin(edge));
 
-        if (GetWindowStyleFlag() & wxSW_3D)
+        if (GetWindowStyleFlag() & wxSW_3DSASH)
         {
             if (edge == wxSASH_BOTTOM)
             {
-                // Draw a light grey line on the bottom to indicate that the
+                // Draw a highlight line on the bottom to indicate that the
                 // sash is raised
-                dc.SetPen(lightShadowPen);
+                dc.SetPen(hilightPen);
                 dc.DrawLine(0, h - GetEdgeMargin(edge), w, h - GetEdgeMargin(edge));
             }
             else