other cleanup; adjusted english in the UI

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

utils/screenshotgen/src/autocapture.cpp

@@ -89,6 +89,35 @@ wxBitmap Capture(wxRect rect)
 // AutoCaptureMechanism
 // ----------------------------------------------------------------------------
 
+void AutoCaptureMechanism::CaptureAll()
+{
+    m_notebook->SetSelection(0);
+    wxYield();
+
+    for(ControlList::iterator it = m_controlList.begin();
+        it != m_controlList.end();
+        ++it)
+    {
+        Control & ctrl = *it;
+
+        if(ctrl.flag == AJ_TurnPage) // Turn to next page
+        {
+            m_notebook->SetSelection(m_notebook->GetSelection() + 1);
+            wxYield();
+            continue;
+        }
+
+        wxBitmap screenshot = Capture(ctrl);
+
+        if(ctrl.flag & AJ_Union)
+        {
+            screenshot = Union(screenshot, Capture(*(++it)));
+        }
+
+        Save(screenshot, ctrl.name);
+    }
+}
+
 wxBitmap AutoCaptureMechanism::Capture(Control & ctrl)
 {
     if(ctrl.name == wxT("")) //no mannual specification for the control name