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

no changes, just deTAbified and fixed really strange indentation of 'else' statements

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-05-05 22:15:02 +00:00
parent c36d477458
commit 7608fd01a1
1 changed files with 131 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/aui/framemanager.cpp
View File

@@ -2950,20 +2950,16 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
insert_layer = 0; insert_layer = 0;
insert_dock_row = true; insert_dock_row = true;
if (pt.x >= part->rect.x && const wxRect& pr = part->rect;
pt.x < part->rect.x+new_row_pixels_x) if (pt.x >= pr.x && pt.x < pr.x + new_row_pixels_x)
insert_dir = wxAUI_DOCK_LEFT; insert_dir = wxAUI_DOCK_LEFT;
else else if (pt.y >= pr.y && pt.y < pr.y + new_row_pixels_y)
if (pt.y >= part->rect.y &&
pt.y < part->rect.y+new_row_pixels_y)
insert_dir = wxAUI_DOCK_TOP; insert_dir = wxAUI_DOCK_TOP;
else else if (pt.x >= pr.x + pr.width - new_row_pixels_x &&
if (pt.x >= part->rect.x + part->rect.width-new_row_pixels_x && pt.x < pr.x + pr.width)
pt.x < part->rect.x + part->rect.width)
insert_dir = wxAUI_DOCK_RIGHT; insert_dir = wxAUI_DOCK_RIGHT;
else else if (pt.y >= pr.y+ pr.height - new_row_pixels_y &&
if (pt.y >= part->rect.y+ part->rect.height-new_row_pixels_y && pt.y < pr.y + pr.height)
pt.y < part->rect.y + part->rect.height)
insert_dir = wxAUI_DOCK_BOTTOM; insert_dir = wxAUI_DOCK_BOTTOM;
else else
return false; return false;
@@ -3327,22 +3323,22 @@ void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
pt.y = pos.y; pt.y = pos.y;
// and some more pixels for the title bar // and some more pixels for the title bar
pt.y -= 5; pt.y -= 5;
} else }
if (dir == wxWEST) else if (dir == wxWEST)
{ {
// move to pane's left border // move to pane's left border
wxPoint pos( 0,0 ); wxPoint pos( 0,0 );
pos = wnd->ClientToScreen( pos ); pos = wnd->ClientToScreen( pos );
pt.x = pos.x; pt.x = pos.x;
} else }
if (dir == wxEAST) else if (dir == wxEAST)
{ {
// move to pane's right border // move to pane's right border
wxPoint pos( wnd->GetSize().x, 0 ); wxPoint pos( wnd->GetSize().x, 0 );
pos = wnd->ClientToScreen( pos ); pos = wnd->ClientToScreen( pos );
pt.x = pos.x; pt.x = pos.x;
} else }
if (dir == wxSOUTH) else if (dir == wxSOUTH)
{ {
// move to pane's bottom border // move to pane's bottom border
wxPoint pos( 0, wnd->GetSize().y ); wxPoint pos( 0, wnd->GetSize().y );
@@ -3430,22 +3426,22 @@ void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir)
pt.y = pos.y; pt.y = pos.y;
// and some more pixels for the title bar // and some more pixels for the title bar
pt.y -= 10; pt.y -= 10;
} else }
if (dir == wxWEST) else if (dir == wxWEST)
{ {
// move to pane's left border // move to pane's left border
wxPoint pos( 0,0 ); wxPoint pos( 0,0 );
pos = wnd->ClientToScreen( pos ); pos = wnd->ClientToScreen( pos );
pt.x = pos.x; pt.x = pos.x;
} else }
if (dir == wxEAST) else if (dir == wxEAST)
{ {
// move to pane's right border // move to pane's right border
wxPoint pos( wnd->GetSize().x, 0 ); wxPoint pos( wnd->GetSize().x, 0 );
pos = wnd->ClientToScreen( pos ); pos = wnd->ClientToScreen( pos );
pt.x = pos.x; pt.x = pos.x;
} else }
if (dir == wxSOUTH) else if (dir == wxSOUTH)
{ {
// move to pane's bottom border // move to pane's bottom border
wxPoint pos( 0, wnd->GetSize().y ); wxPoint pos( 0, wnd->GetSize().y );