DP: GetBitmap() added to wxImageList

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 84ec2282aa7497cf40250b952614d893b05c15e4..7f0ec5df0f93815b35bca7605be4813778434ace 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -67,8 +67,8 @@ wxSplitterWindow::wxSplitterWindow(void)
     m_minimumPaneSize = 0;
 }
 
-wxSplitterWindow::wxSplitterWindow(wxWindow *parent, const wxWindowID id, const wxPoint& pos,
-    const wxSize& size, const long style, const wxString& name)
+wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos,
+    const wxSize& size, long style, const wxString& name)
   :wxWindow(parent, id, pos, size, style, name)
 {
     m_splitMode = wxSPLIT_VERTICAL;
@@ -173,7 +173,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         m_dragMode = wxSPLIT_DRAG_NONE;
 
         SetCursor(*wxSTANDARD_CURSOR);
-        wxSetCursor(*wxSTANDARD_CURSOR);
     }
        else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING)
        {
@@ -259,19 +258,15 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                if ( m_splitMode == wxSPLIT_VERTICAL )
                 {
                        SetCursor(*m_sashCursorWE);
-                    // Windows needs the following
-                       wxSetCursor(*m_sashCursorWE);
                 }
                 else
                 {
                        SetCursor(*m_sashCursorNS);
-                       wxSetCursor(*m_sashCursorNS);
                 }
         }
         else
         {
            SetCursor(*wxSTANDARD_CURSOR);
-           wxSetCursor(*wxSTANDARD_CURSOR);
         }
        }
        else if ( (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) ||
@@ -280,12 +275,10 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
          if ( m_splitMode == wxSPLIT_VERTICAL )
          {
                SetCursor(*m_sashCursorWE);
-               wxSetCursor(*m_sashCursorWE);
          }
          else
          {
                SetCursor(*m_sashCursorNS);
-               wxSetCursor(*m_sashCursorNS);
          }
 
         // Detect that this is really a drag: we've moved more than 1 pixel either way
@@ -316,8 +309,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     }
     else
     {
-        SetCursor(*wxSTANDARD_CURSOR);
-        wxSetCursor(*wxSTANDARD_CURSOR);
     }
 }
 
@@ -341,7 +332,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& WXUNUSED(event))
     SizeWindows();
 }
 
-bool wxSplitterWindow::SashHitTest(const int x, const int y, const int tolerance)
+bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
 {
     if ( m_windowTwo == NULL || m_sashPosition == 0)
         return FALSE; // No sash
@@ -429,8 +420,8 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
             dc.DrawLine(m_sashPosition+m_sashSize-2, 1, m_sashPosition+m_sashSize-2, h-1);
 
             dc.SetPen(*m_darkShadowPen);
-            dc.DrawLine(m_sashPosition+m_sashSize-1, 2, m_sashPosition+m_sashSize-1, h-2);
-        }
+                       dc.DrawLine(m_sashPosition+m_sashSize-1, 2, m_sashPosition+m_sashSize-1, h-2);
+               }
         else
         {
             dc.SetPen(*m_facePen);
@@ -481,7 +472,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
 }
 
 // Draw the sash tracker (for whilst moving the sash)
-void wxSplitterWindow::DrawSashTracker(const int x, const int y)
+void wxSplitterWindow::DrawSashTracker(int x, int y)
 {
     int w, h;
     GetClientSize(&w, &h);
@@ -591,7 +582,7 @@ void wxSplitterWindow::Initialize(wxWindow *window)
 // Associates the given window with window 2, drawing the appropriate sash
 // and changing the split mode.
 // Does nothing and returns FALSE if the window is already split.
-bool wxSplitterWindow::SplitVertically(wxWindow *window1, wxWindow *window2, const int sashPosition)
+bool wxSplitterWindow::SplitVertically(wxWindow *window1, wxWindow *window2, int sashPosition)
 {
     if ( IsSplit() )
         return FALSE;
@@ -609,7 +600,7 @@ bool wxSplitterWindow::SplitVertically(wxWindow *window1, wxWindow *window2, con
     return TRUE;
 }
 
-bool wxSplitterWindow::SplitHorizontally(wxWindow *window1, wxWindow *window2, const int sashPosition)
+bool wxSplitterWindow::SplitHorizontally(wxWindow *window1, wxWindow *window2, int sashPosition)
 {
     if ( IsSplit() )
         return FALSE;
@@ -658,7 +649,7 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
     return TRUE;
 }
 
-void wxSplitterWindow::SetSashPosition(const int position, const bool redraw)
+void wxSplitterWindow::SetSashPosition(int position, bool redraw)
 {
     m_sashPosition = position;