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

wxAuiNotebook tab drag-drop bug fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams
2006-11-08 09:54:05 +00:00
parent fe4ed5ebff
commit 87e5fe6990
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/aui/auibook.cpp
View File

@@ -2728,8 +2728,12 @@ void wxAuiNotebook::OnTabDragMotion(wxCommandEvent& evt)
{ {
wxWindow* tab_ctrl = ::wxFindWindowAtPoint(screen_pt); wxWindow* tab_ctrl = ::wxFindWindowAtPoint(screen_pt);
// if we aren't over any window, stop here
if (!tab_ctrl)
return;
// make sure we are not over the hint window // make sure we are not over the hint window
if (tab_ctrl && !tab_ctrl->IsKindOf(CLASSINFO(wxFrame))) if (!tab_ctrl->IsKindOf(CLASSINFO(wxFrame)))
{ {
while (tab_ctrl) while (tab_ctrl)
{ {
@@ -2744,12 +2748,20 @@ void wxAuiNotebook::OnTabDragMotion(wxCommandEvent& evt)
if (nb != this) if (nb != this)
{ {
wxRect hint_rect = tab_ctrl->GetRect(); wxRect hint_rect = tab_ctrl->GetClientRect();
tab_ctrl->ClientToScreen(&hint_rect.x, &hint_rect.y); tab_ctrl->ClientToScreen(&hint_rect.x, &hint_rect.y);
m_mgr.ShowHint(hint_rect); m_mgr.ShowHint(hint_rect);
return; return;
} }
}
}
else
{
if (!dest_tabs)
{
// we are either over a hint window, or not over a tab
// window, and there is no where to drag to, so exit
return;
} }
} }
} }