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

Warning fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-09-27 11:57:12 +00:00
parent 81e4cb8bdf
commit 93b9de865c
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/aui/framemanager.cpp
View File

@@ -2341,7 +2341,7 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
int new_layer = wxMax( wxMax( GetMaxLayer(docks, wxAUI_DOCK_BOTTOM), int new_layer = wxMax( wxMax( GetMaxLayer(docks, wxAUI_DOCK_BOTTOM),
GetMaxLayer(docks, wxAUI_DOCK_LEFT)), GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1; GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1;
drop.Dock().Bottom(). drop.Dock().Bottom().
Layer(new_layer). Layer(new_layer).
Row(0). Row(0).
@@ -2356,7 +2356,7 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
{ {
if (!part || !part->dock) if (!part || !part->dock)
return false; return false;
// calculate the offset from where the dock begins // calculate the offset from where the dock begins
// to the point where the user dropped the pane // to the point where the user dropped the pane
int dock_drop_offset = 0; int dock_drop_offset = 0;
@@ -2384,12 +2384,12 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
{ {
drop.Float(); drop.Float();
} }
m_skipping = false; m_skipping = false;
return ProcessDockResult(target, drop); return ProcessDockResult(target, drop);
} }
drop.Position(pt.x - GetDockPixelOffset(drop) - offset.x); drop.Position(pt.x - GetDockPixelOffset(drop) - offset.x);
return ProcessDockResult(target, drop); return ProcessDockResult(target, drop);
@@ -2398,7 +2398,7 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
{ {
m_skipping = false; m_skipping = false;
} }
if (!m_skipping) if (!m_skipping)
{ {
m_last_rect = part->dock->rect; m_last_rect = part->dock->rect;
@@ -2949,6 +2949,8 @@ void wxFrameManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
pos = wnd->ClientToScreen( pos ); pos = wnd->ClientToScreen( pos );
pt.y = pos.y; pt.y = pos.y;
} }
#else
wxUnusedVar(dir);
#endif #endif
wxPoint client_pt = m_frame->ScreenToClient(pt); wxPoint client_pt = m_frame->ScreenToClient(pt);
@@ -3050,6 +3052,8 @@ void wxFrameManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir)
pos = wnd->ClientToScreen( pos ); pos = wnd->ClientToScreen( pos );
pt.y = pos.y; pt.y = pos.y;
} }
#else
wxUnusedVar(dir);
#endif #endif
wxPoint client_pt = m_frame->ScreenToClient(pt); wxPoint client_pt = m_frame->ScreenToClient(pt);