X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..7a36d9c7c1a077ba7e05c248bcf19c4c9bb1356f:/utils/screenshotgen/src/autocapture.cpp diff --git a/utils/screenshotgen/src/autocapture.cpp b/utils/screenshotgen/src/autocapture.cpp index c425010e54..1ad9723dbb 100644 --- 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();