AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
src/aui/framemanager.cpp
View File

@ -512,12 +512,12 @@ wxAuiManager::wxAuiManager(wxWindow* managed_wnd, unsigned int flags)
wxAuiManager::~wxAuiManager()
{
int i;
for (i = 0; i < m_panes.Count(); i++ )
{
wxAuiPaneInfo& pinfo = m_panes.Item(i);
if (pinfo.window && pinfo.window->GetParent() == 0)
delete pinfo.window;
}
for (i = 0; i < m_panes.Count(); i++ )
{
wxAuiPaneInfo& pinfo = m_panes.Item(i);
if (pinfo.window && pinfo.window->GetParent() == 0)
delete pinfo.window;
}
delete m_art;
}
@ -722,7 +722,7 @@ void wxAuiManager::UpdateHintWindowConfig()
#endif
}
else
else
{
if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) != 0 ||
(m_flags & wxAUI_MGR_VENETIAN_BLINDS_HINT) != 0)
@ -991,7 +991,7 @@ bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info,
{
return AddPane(window, pane_info);
}
else
else
{
if (pane_info.IsFloating())
{
@ -1001,7 +1001,7 @@ bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info,
if (pane_info.floating_size != wxDefaultSize)
existing_pane.FloatingSize(pane_info.floating_size);
}
else
else
{
// if the new pane is docked then we should undo maximize
RestoreMaximizedPane();
@ -1486,7 +1486,7 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock,
size += gripper_size;
size += pane.best_size.x;
}
else
else
{
if (pane.HasGripper() && pane.HasGripperTop())
size += gripper_size;
@ -1511,7 +1511,7 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock,
if (amount >= 0)
offset += amount;
else
else
positions[pane_i] -= -amount;
offset += sizes[pane_i];
@ -1525,7 +1525,7 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock,
int amount = positions[pane_i] - offset;
if (amount >= 0)
offset += amount;
else
else
positions[pane_i] += -amount;
offset += sizes[pane_i];
@ -1552,7 +1552,7 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont,
int orientation;
if (dock.IsHorizontal())
orientation = wxHORIZONTAL;
else
else
orientation = wxVERTICAL;
// this variable will store the proportion
@ -1697,7 +1697,7 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont,
part.sizer_item = sizer_item;
uiparts.Add(part);
}
else
else
{
sizer_item = cont->Add(horz_pane_sizer, pane_proportion, wxEXPAND);
}
@ -1760,7 +1760,7 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont,
{
if (dock.IsVertical())
sizer_item = dock_sizer->Add(1, amount, 0, wxEXPAND);
else
else
sizer_item = dock_sizer->Add(amount, 1, 0, wxEXPAND);
part.type = wxAuiDockUIPart::typeBackground;
@ -1823,7 +1823,7 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont,
if (dock.dock_direction == wxAUI_DOCK_CENTER || has_maximized_pane)
sizer_item = cont->Add(dock_sizer, 1, wxEXPAND);
else
else
sizer_item = cont->Add(dock_sizer, 0, wxEXPAND);
part.type = wxAuiDockUIPart::typeDock;
@ -1837,7 +1837,7 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont,
if (dock.IsHorizontal())
cont->SetItemMinSize(dock_sizer, 0, dock.size);
else
else
cont->SetItemMinSize(dock_sizer, dock.size, 0);
// top and left docks have a sash after them
@ -1907,7 +1907,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
// found the right dock
dock = arr.Item(0);
}
else
else
{
// dock was not found, so we need to create a new one
wxAuiDockInfo d;
@ -1929,7 +1929,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
if (!FindPaneInDock(*dock, p.window))
dock->panes.Add(&p);
}
else
else
{
// remove the pane from any existing docks
RemovePaneFromDocks(docks, p);
@ -1970,7 +1970,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
if (dock.IsHorizontal())
size = wxMax(pane_size.y, size);
else
else
size = wxMax(pane_size.x, size);
}
@ -2008,7 +2008,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
if (dock.IsHorizontal())
size = wxMin(size, max_dock_y_size);
else
else
size = wxMin(size, max_dock_x_size);
// absolute minimum size for a dock is 10 pixels
@ -2037,7 +2037,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
if (pane.min_size.y > dock_min_size)
dock_min_size = pane.min_size.y;
}
else
else
{
if (pane.min_size.x > dock_min_size)
dock_min_size = pane.min_size.x;
@ -2106,7 +2106,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
int amount = pane.dock_pos - offset;
if (amount >= 0)
offset += amount;
else
else
pane.dock_pos += -amount;
offset += pane_sizes[j];
@ -2183,7 +2183,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
for (row = 0,row_count = arr.GetCount(); row<row_count; ++row)
LayoutAddDock(middle, *arr.Item(row), uiparts, spacer_only);
}
else if (!m_has_maximized)
else if (!m_has_maximized)
{
// there are no center docks, add a background area
wxSizerItem* sizer_item = middle->Add(1,1, 1, wxEXPAND);
@ -2197,7 +2197,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
uiparts.Add(part);
}
}
else
else
{
middle->Add(old_cont, 1, wxEXPAND);
}
@ -2358,7 +2358,7 @@ void wxAuiManager::Update()
if (p.IsShown() && !frame->IsShown())
frame->Show();
}
else
else
{
// frame already exists, make sure it's position
// and size reflect the information in wxAuiPaneInfo
@ -2379,7 +2379,7 @@ void wxAuiManager::Update()
p.frame->Show(p.IsShown());
}
}
else
else
{
if (p.window->IsShown() != p.IsShown())
p.window->Show(p.IsShown());
@ -2582,7 +2582,7 @@ int wxAuiManager::GetDockPixelOffset(wxAuiPaneInfo& test)
{
if (dock.IsVertical())
return dock.rect.y;
else
else
return dock.rect.x;
}
}
@ -2731,7 +2731,7 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
int dock_drop_offset = 0;
if (part->dock->IsHorizontal())
dock_drop_offset = pt.x - part->dock->rect.x - offset.x;
else
else
dock_drop_offset = pt.y - part->dock->rect.y - offset.y;
@ -2950,23 +2950,19 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
insert_layer = 0;
insert_dock_row = true;
if (pt.x >= part->rect.x &&
pt.x < part->rect.x+new_row_pixels_x)
insert_dir = wxAUI_DOCK_LEFT;
else
if (pt.y >= part->rect.y &&
pt.y < part->rect.y+new_row_pixels_y)
insert_dir = wxAUI_DOCK_TOP;
else
if (pt.x >= part->rect.x + part->rect.width-new_row_pixels_x &&
pt.x < part->rect.x + part->rect.width)
insert_dir = wxAUI_DOCK_RIGHT;
else
if (pt.y >= part->rect.y+ part->rect.height-new_row_pixels_y &&
pt.y < part->rect.y + part->rect.height)
insert_dir = wxAUI_DOCK_BOTTOM;
else
return false;
const wxRect& pr = part->rect;
if (pt.x >= pr.x && pt.x < pr.x + new_row_pixels_x)
insert_dir = wxAUI_DOCK_LEFT;
else if (pt.y >= pr.y && pt.y < pr.y + new_row_pixels_y)
insert_dir = wxAUI_DOCK_TOP;
else if (pt.x >= pr.x + pr.width - new_row_pixels_x &&
pt.x < pr.x + pr.width)
insert_dir = wxAUI_DOCK_RIGHT;
else if (pt.y >= pr.y+ pr.height - new_row_pixels_y &&
pt.y < pr.y + pr.height)
insert_dir = wxAUI_DOCK_BOTTOM;
else
return false;
insert_row = GetMaxRow(panes, insert_dir, insert_layer) + 1;
}
@ -2992,7 +2988,7 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
offset = pt.y - part->rect.y;
size = part->rect.GetHeight();
}
else
else
{
offset = pt.x - part->rect.x;
size = part->rect.GetWidth();
@ -3086,7 +3082,7 @@ void wxAuiManager::ShowHint(const wxRect& rect)
m_hint_fadetimer.Start(5);
}
}
else // Not using a transparent hint window...
else // Not using a transparent hint window...
{
if (!(m_flags & wxAUI_MGR_RECTANGLE_HINT))
return;
@ -3177,7 +3173,7 @@ void wxAuiManager::StartPaneDrag(wxWindow* pane_window,
{
m_action = actionDragToolbarPane;
}
else
else
{
m_action = actionDragFloatingPane;
}
@ -3293,7 +3289,7 @@ void wxAuiManager::DrawHintRect(wxWindow* pane_window,
{
HideHint();
}
else
else
{
ShowHint(rect);
}
@ -3327,22 +3323,22 @@ void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
pt.y = pos.y;
// and some more pixels for the title bar
pt.y -= 5;
} else
if (dir == wxWEST)
}
else if (dir == wxWEST)
{
// move to pane's left border
wxPoint pos( 0,0 );
pos = wnd->ClientToScreen( pos );
pt.x = pos.x;
} else
if (dir == wxEAST)
}
else if (dir == wxEAST)
{
// move to pane's right border
wxPoint pos( wnd->GetSize().x, 0 );
pos = wnd->ClientToScreen( pos );
pt.x = pos.x;
} else
if (dir == wxSOUTH)
}
else if (dir == wxSOUTH)
{
// move to pane's bottom border
wxPoint pos( 0, wnd->GetSize().y );
@ -3430,22 +3426,22 @@ void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir)
pt.y = pos.y;
// and some more pixels for the title bar
pt.y -= 10;
} else
if (dir == wxWEST)
}
else if (dir == wxWEST)
{
// move to pane's left border
wxPoint pos( 0,0 );
pos = wnd->ClientToScreen( pos );
pt.x = pos.x;
} else
if (dir == wxEAST)
}
else if (dir == wxEAST)
{
// move to pane's right border
wxPoint pos( wnd->GetSize().x, 0 );
pos = wnd->ClientToScreen( pos );
pt.x = pos.x;
} else
if (dir == wxSOUTH)
}
else if (dir == wxSOUTH)
{
// move to pane's bottom border
wxPoint pos( 0, wnd->GetSize().y );
@ -3481,7 +3477,7 @@ void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir)
if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
pane.frame->SetTransparent(255);
}
else if (m_has_maximized)
else if (m_has_maximized)
{
RestoreMaximizedPane();
}
@ -3519,7 +3515,7 @@ void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt)
evt.Veto();
return;
}
else
else
{
ClosePane(pane);
}
@ -3720,10 +3716,10 @@ void wxAuiManager::OnSetCursor(wxSetCursorEvent& event)
if (part->orientation == wxVERTICAL)
cursor = wxCursor(wxCURSOR_SIZEWE);
else
else
cursor = wxCursor(wxCURSOR_SIZENS);
}
else if (part->type == wxAuiDockUIPart::typeGripper)
else if (part->type == wxAuiDockUIPart::typeGripper)
{
cursor = wxCursor(wxCURSOR_SIZING);
}
@ -3747,10 +3743,10 @@ void wxAuiManager::UpdateButtonOnScreen(wxAuiDockUIPart* button_ui_part,
{
if (event.LeftDown())
state = wxAUI_BUTTON_STATE_PRESSED;
else
else
state = wxAUI_BUTTON_STATE_HOVER;
}
else
else
{
if (event.LeftDown())
state = wxAUI_BUTTON_STATE_HOVER;
@ -3805,7 +3801,7 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event)
event.m_y - part->rect.y);
m_frame->CaptureMouse();
}
else if (part->type == wxAuiDockUIPart::typePaneButton)
else if (part->type == wxAuiDockUIPart::typePaneButton)
{
m_action = actionClickButton;
m_action_part = part;
@ -3814,7 +3810,7 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event)
UpdateButtonOnScreen(part, event);
}
else if (part->type == wxAuiDockUIPart::typeCaption ||
else if (part->type == wxAuiDockUIPart::typeCaption ||
part->type == wxAuiDockUIPart::typeGripper)
{
// if we are managing a wxAuiFloatingFrame window, then
@ -3911,8 +3907,8 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event)
Update();
Repaint(NULL);
}
else if (m_action_part &&
m_action_part->type == wxAuiDockUIPart::typePaneSizer)
else if (m_action_part &&
m_action_part->type == wxAuiDockUIPart::typePaneSizer)
{
wxAuiDockInfo& dock = *m_action_part->dock;
wxAuiPaneInfo& pane = *m_action_part->pane;
@ -3937,13 +3933,13 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event)
// this will help us recalculate the pane's proportion
if (dock.IsHorizontal())
new_pixsize = new_pos.x - pane_part->rect.x;
else
else
new_pixsize = new_pos.y - pane_part->rect.y;
// determine the size of the dock, based on orientation
if (dock.IsHorizontal())
dock_pixels = dock.rect.GetWidth();
else
else
dock_pixels = dock.rect.GetHeight();
// determine the total proportion of all resizable panes,
@ -3970,10 +3966,10 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event)
{
if (dock.IsHorizontal())
dock_pixels -= p.best_size.x;
else
else
dock_pixels -= p.best_size.y;
}
else
else
{
total_proportion += p.dock_proportion;
}
@ -4030,7 +4026,7 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event)
if (pane.HasCaption())
min_size += caption_size;
}
else
else
{
min_size += pane.min_size.x;
}
@ -4142,7 +4138,7 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
wxPoint pos = m_action_part->rect.GetPosition();
if (m_action_part->orientation == wxHORIZONTAL)
pos.y = wxMax(0, event.m_y - m_action_offset.y);
else
else
pos.x = wxMax(0, event.m_x - m_action_offset.x);
wxRect rect(m_frame->ClientToScreen(pos),
@ -4197,7 +4193,7 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
m_action_offset.x = 30;
}
}
else
else
{
m_action = actionDragToolbarPane;
m_action_window = pane_info->window;
@ -4269,14 +4265,14 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
}
}
else
else
{
if (m_hover_button)
{
m_hover_button = NULL;
Repaint();
}
else
else
{
event.Skip();
}
@ -4361,7 +4357,7 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt)
Update();
}
}
else if (evt.button == wxAUI_BUTTON_PIN)
else if (evt.button == wxAUI_BUTTON_PIN)
{
if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) &&
pane.IsFloatable())