I don't think the last person to edit splitter.cpp did
actually run the sample afterwards. I did. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -268,7 +268,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
|
|||||||
}
|
}
|
||||||
|
|
||||||
SizeWindows();
|
SizeWindows();
|
||||||
m_needUpdating = FALSE;
|
|
||||||
} // left up && dragging
|
} // left up && dragging
|
||||||
else if (event.Moving() && !event.Dragging())
|
else if (event.Moving() && !event.Dragging())
|
||||||
{
|
{
|
||||||
@@ -297,8 +296,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
|
|||||||
SetCursor(* wxSTANDARD_CURSOR);
|
SetCursor(* wxSTANDARD_CURSOR);
|
||||||
}
|
}
|
||||||
#endif // __WXGTK__
|
#endif // __WXGTK__
|
||||||
|
|
||||||
m_needUpdating = FALSE;
|
|
||||||
}
|
}
|
||||||
else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))
|
else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))
|
||||||
{
|
{
|
||||||
@@ -332,6 +329,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (new_sash_position == m_sashPosition)
|
||||||
|
return;
|
||||||
|
|
||||||
// Erase old tracker
|
// Erase old tracker
|
||||||
if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
|
if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
|
||||||
@@ -344,12 +344,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
|
|||||||
else
|
else
|
||||||
y = new_sash_position;
|
y = new_sash_position;
|
||||||
|
|
||||||
if (new_sash_position != -1)
|
// Remember old positions
|
||||||
{
|
m_oldX = x;
|
||||||
// Only modify if permitted
|
m_oldY = y;
|
||||||
m_oldX = x;
|
|
||||||
m_oldY = y;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
// As we captured the mouse, we may get the mouse events from outside
|
// As we captured the mouse, we may get the mouse events from outside
|
||||||
@@ -683,6 +680,8 @@ void wxSplitterWindow::SizeWindows()
|
|||||||
if ( m_borderSize > 0 )
|
if ( m_borderSize > 0 )
|
||||||
DrawBorders(dc);
|
DrawBorders(dc);
|
||||||
DrawSash(dc);
|
DrawSash(dc);
|
||||||
|
|
||||||
|
m_needUpdating = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set pane for unsplit window
|
// Set pane for unsplit window
|
||||||
|
Reference in New Issue
Block a user