Whitespaces lined up.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index eb37327b70aaa73f5d676e31d066d7d2c5d9fa63..60e9955f5cba4dcaa41726f80d1b130417aab281 100644 (file)
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -363,7 +363,7 @@ void wxDefaultDockArt::DrawBorder(wxDC& dc, const wxRect& _rect,
             rect.Deflate(1);
         }
     }
             rect.Deflate(1);
         }
     }

-     else
+    else

     {
         for (i = 0; i < border_width; ++i)
         {
     {
         for (i = 0; i < border_width; ++i)
         {


@@ -385,7 +385,7 @@ void wxDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool
 
         dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
     }
 
         dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
     }

-     else
+    else

     {
         if (active)
         {
     {
         if (active)
         {


@@ -434,7 +434,7 @@ void wxDefaultDockArt::DrawCaption(wxDC& dc,
 
     if (pane.state & wxPaneInfo::optionActive)
         dc.SetTextForeground(m_active_caption_text_colour);
 
     if (pane.state & wxPaneInfo::optionActive)
         dc.SetTextForeground(m_active_caption_text_colour);

-     else
+    else

         dc.SetTextForeground(m_inactive_caption_text_colour);
 
 
         dc.SetTextForeground(m_inactive_caption_text_colour);
 
 

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 0f32eda42c530790c563f230c3e55958ea18ff73..8ceba22d207794e03538dbfb335ba15a2ff10584 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -675,7 +675,7 @@ bool wxFrameManager::InsertPane(wxWindow* window, const wxPaneInfo& pane_info,
     {
         return AddPane(window, pane_info);
     }
     {
         return AddPane(window, pane_info);
     }

-     else
+    else

     {
         if (pane_info.IsFloating())
         {
     {
         if (pane_info.IsFloating())
         {


@@ -1140,7 +1140,7 @@ void wxFrameManager::LayoutAddPane(wxSizer* cont,
     {
         sizer_item = vert_pane_sizer->Add(1, 1, 1, wxEXPAND);
     }
     {
         sizer_item = vert_pane_sizer->Add(1, 1, 1, wxEXPAND);
     }

-     else
+    else

     {
         sizer_item = vert_pane_sizer->Add(pane.window, 1, wxEXPAND);
         vert_pane_sizer->SetItemMinSize(pane.window, 1, 1);
     {
         sizer_item = vert_pane_sizer->Add(pane.window, 1, wxEXPAND);
         vert_pane_sizer->SetItemMinSize(pane.window, 1, 1);


@@ -1199,7 +1199,7 @@ void wxFrameManager::LayoutAddPane(wxSizer* cont,
         part.sizer_item = sizer_item;
         uiparts.Add(part);
     }
         part.sizer_item = sizer_item;
         uiparts.Add(part);
     }

-     else
+    else

     {
         sizer_item = cont->Add(horz_pane_sizer, pane_proportion, wxEXPAND);
     }
     {
         sizer_item = cont->Add(horz_pane_sizer, pane_proportion, wxEXPAND);
     }


@@ -1289,7 +1289,7 @@ void wxFrameManager::LayoutAddDock(wxSizer* cont,
         part.sizer_item = sizer_item;
         uiparts.Add(part);
     }
         part.sizer_item = sizer_item;
         uiparts.Add(part);
     }

-     else
+    else

     {
         for (pane_i = 0; pane_i < pane_count; ++pane_i)
         {
     {
         for (pane_i = 0; pane_i < pane_count; ++pane_i)
         {


@@ -2086,8 +2086,8 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
              Position(pt.y - GetDockPixelOffset(drop) - offset.y);
         return ProcessDockResult(target, drop);
     }
              Position(pt.y - GetDockPixelOffset(drop) - offset.y);
         return ProcessDockResult(target, drop);
     }

-     else if (pt.y < layer_insert_offset &&
-              pt.y > layer_insert_offset-auiLayerInsertPixels)
+    else if (pt.y < layer_insert_offset &&
+             pt.y > layer_insert_offset-auiLayerInsertPixels)

     {
         int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP),
                                     GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
     {
         int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP),
                                     GetMaxLayer(docks, wxAUI_DOCK_LEFT)),


@@ -2098,8 +2098,8 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
              Position(pt.x - GetDockPixelOffset(drop) - offset.x);
         return ProcessDockResult(target, drop);
     }
              Position(pt.x - GetDockPixelOffset(drop) - offset.x);
         return ProcessDockResult(target, drop);
     }

-     else if (pt.x >= cli_size.x - layer_insert_offset &&
-              pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels)
+    else if (pt.x >= cli_size.x - layer_insert_offset &&
+             pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels)

     {
         int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT),
                                     GetMaxLayer(docks, wxAUI_DOCK_TOP)),
     {
         int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT),
                                     GetMaxLayer(docks, wxAUI_DOCK_TOP)),


@@ -2110,8 +2110,8 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
              Position(pt.y - GetDockPixelOffset(drop) - offset.y);
         return ProcessDockResult(target, drop);
     }
              Position(pt.y - GetDockPixelOffset(drop) - offset.y);
         return ProcessDockResult(target, drop);
     }

-     else if (pt.y >= cli_size.y - layer_insert_offset &&
-              pt.y < cli_size.y - layer_insert_offset + auiLayerInsertPixels)
+    else if (pt.y >= cli_size.y - layer_insert_offset &&
+             pt.y < cli_size.y - layer_insert_offset + auiLayerInsertPixels)

     {
         int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_BOTTOM),
                                     GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
     {
         int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_BOTTOM),
                                     GetMaxLayer(docks, wxAUI_DOCK_LEFT)),


@@ -2944,7 +2944,7 @@ void wxFrameManager::UpdateButtonOnScreen(wxDockUIPart* button_ui_part,
              else
             state = wxAUI_BUTTON_STATE_HOVER;
     }
              else
             state = wxAUI_BUTTON_STATE_HOVER;
     }

-     else
+    else

     {
         if (event.LeftDown())
             state = wxAUI_BUTTON_STATE_HOVER;
     {
         if (event.LeftDown())
             state = wxAUI_BUTTON_STATE_HOVER;


@@ -3230,7 +3230,7 @@ void wxFrameManager::OnLeftUp(wxMouseEvent& event)
             Repaint(NULL);
         }
     }
             Repaint(NULL);
         }
     }

-     else if (m_action == actionClickButton)
+    else if (m_action == actionClickButton)

     {
         m_hover_button = NULL;
         m_frame->ReleaseMouse();
     {
         m_hover_button = NULL;
         m_frame->ReleaseMouse();


@@ -3246,15 +3246,15 @@ void wxFrameManager::OnLeftUp(wxMouseEvent& event)
             ProcessMgrEvent(e);
         }
     }
             ProcessMgrEvent(e);
         }
     }

-     else if (m_action == actionClickCaption)
+    else if (m_action == actionClickCaption)

     {
         m_frame->ReleaseMouse();
     }
     {
         m_frame->ReleaseMouse();
     }

-     else if (m_action == actionDragFloatingPane)
+    else if (m_action == actionDragFloatingPane)

     {
         m_frame->ReleaseMouse();
     }
     {
         m_frame->ReleaseMouse();
     }

-     else if (m_action == actionDragToolbarPane)
+    else if (m_action == actionDragToolbarPane)

     {
         m_frame->ReleaseMouse();
 
     {
         m_frame->ReleaseMouse();
 


@@ -3280,7 +3280,7 @@ void wxFrameManager::OnLeftUp(wxMouseEvent& event)
         pane.state &= ~wxPaneInfo::actionPane;
         Update();
     }
         pane.state &= ~wxPaneInfo::actionPane;
         Update();
     }

-     else
+    else

     {
         event.Skip();
     }
     {
         event.Skip();
     }


@@ -3321,7 +3321,7 @@ void wxFrameManager::OnMotion(wxMouseEvent& event)
         DrawResizeHint(dc, rect);
         m_action_hintrect = rect;
     }
         DrawResizeHint(dc, rect);
         m_action_hintrect = rect;
     }

-     else if (m_action == actionClickCaption)
+    else if (m_action == actionClickCaption)

     {
         int drag_x_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_X);
         int drag_y_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_Y);
     {
         int drag_x_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_X);
         int drag_y_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_Y);


@@ -3368,13 +3368,13 @@ void wxFrameManager::OnMotion(wxMouseEvent& event)
             }
         }
     }
             }
         }
     }

-     else if (m_action == actionDragFloatingPane)
+    else if (m_action == actionDragFloatingPane)

     {
         wxPoint pt = m_frame->ClientToScreen(event.GetPosition());
         m_action_window->Move(pt.x - m_action_offset.x,
                              pt.y - m_action_offset.y);
     }
     {
         wxPoint pt = m_frame->ClientToScreen(event.GetPosition());
         m_action_window->Move(pt.x - m_action_offset.x,
                              pt.y - m_action_offset.y);
     }

-     else if (m_action == actionDragToolbarPane)
+    else if (m_action == actionDragToolbarPane)

     {
         wxPaneInfo& pane = GetPane(m_action_window);
         wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
     {
         wxPaneInfo& pane = GetPane(m_action_window);
         wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));


@@ -3477,7 +3477,7 @@ void wxFrameManager::OnPaneButton(wxFrameManagerEvent& event)
         pane.Hide();
         Update();
     }
         pane.Hide();
         Update();
     }

-     else if (event.button == wxPaneInfo::buttonPin)
+    else if (event.button == wxPaneInfo::buttonPin)

     {
         if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) &&
             pane.IsFloatable())
     {
         if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) &&
             pane.IsFloatable())