using scan-line polygon conversion for constructing wxregion

[wxWidgets.git] / utils / screenshotgen / src / autocapture.cpp

diff --git a/utils/screenshotgen/src/autocapture.cpp b/utils/screenshotgen/src/autocapture.cpp
index c425010e54d714e7db6e5a25e0424c0e8ed9de33..1ad9723dbb736b765bbd6043334d89c29c651c27 100644 (file)
--- a/utils/screenshotgen/src/autocapture.cpp
+++ b/utils/screenshotgen/src/autocapture.cpp
@@ -3,7 +3,7 @@
 // Purpose:     Implement wxCtrlMaskOut class
 // Author:      Utensil Candel (UtensilCandel@@gmail.com)
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -141,7 +141,8 @@ void AutoCaptureMechanism::Save(wxBitmap* screenshot, const wxString& fileName)
     if (!wxDirExists(default_dir))
         wxMkdir(default_dir);
 
-    wxFileName fullFileName(default_dir, fileName + ".png");
+    wxFileName fullFileName(default_dir, "appear-" + fileName +
+        "-" + wxPlatformInfo::Get().GetPortIdShortName() + ".png");
 
     // do not overwrite already existing files with this name
     while (fullFileName.FileExists())
@@ -279,7 +280,7 @@ bool AutoCaptureMechanism::Union(wxBitmap* top, wxBitmap* bottom, wxBitmap* resu
 
 wxRect AutoCaptureMechanism::GetRect(wxWindow* ctrl, int flag)
 {
-    if( !(m_flag & AJ_DisableRegionAdjust) && (flag & AJ_RegionAdjust)
+    if( (!(m_flag & AJ_DisableRegionAdjust) && (flag & AJ_RegionAdjust))
         || (m_flag & AJ_AlwaysRegionAdjust) )
     {
         wxWindow * parent = ctrl->GetParent();