Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix segfault when Update() is called inbetween mouse-up and mouse-down

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams
2008-08-03 10:09:43 +00:00
parent 4c0ce682d8
commit d19390718e
1 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/aui/framemanager.cpp
View File

@@ -2391,6 +2391,7 @@ void wxAuiManager::GetDockSizeConstraint(double* width_pct, double* height_pct)
void wxAuiManager::Update()
{
m_hover_button = NULL;
m_action_part = NULL;
wxSizer* sizer;
int i, pane_count = m_panes.GetCount();
@@ -4184,6 +4185,9 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event)
{
m_hover_button = NULL;
m_frame->ReleaseMouse();
if (m_action_part)
{
UpdateButtonOnScreen(m_action_part, event);
// make sure we're still over the item that was originally clicked
@@ -4197,6 +4201,7 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event)
ProcessMgrEvent(e);
}
}
}
else if (m_action == actionClickCaption)
{
m_frame->ReleaseMouse();
@@ -4256,6 +4261,8 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
if (m_action == actionResize)
{
if (m_action_part)
{
wxPoint pos = m_action_part->rect.GetPosition();
if (m_action_part->orientation == wxHORIZONTAL)
@@ -4272,6 +4279,7 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
DrawResizeHint(dc, rect);
m_action_hintrect = rect;
}
}
else if (m_action == actionClickCaption)
{
int drag_x_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_X);
@@ -4280,8 +4288,9 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
// caption has been clicked. we need to check if the mouse
// is now being dragged. if it is, we need to change the
// mouse action to 'drag'
if (abs(event.m_x - m_action_start.x) > drag_x_threshold ||
abs(event.m_y - m_action_start.y) > drag_y_threshold)
if (m_action_part &&
(abs(event.m_x - m_action_start.x) > drag_x_threshold ||
abs(event.m_y - m_action_start.y) > drag_y_threshold))
{
wxAuiPaneInfo* pane_info = m_action_part->pane;