Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use obsolete functions (mostly copystring() and Count()), remove their documentation (patch 1697956)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-11 00:23:19 +00:00
parent 325cf48f5a
commit b4a980f4f5
28 changed files with 143 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
src/common/docview.cpp
View File

@@ -59,6 +59,7 @@
#include "wx/file.h"
#include "wx/cmdproc.h"
#include "wx/tokenzr.h"
#include "wx/filename.h"
#include <stdio.h>
#include <string.h>
@@ -2085,50 +2086,28 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in
// File history processor
// ----------------------------------------------------------------------------
static inline wxChar* MYcopystring(const wxString& s)
{
wxChar* copy = new wxChar[s.length() + 1];
return wxStrcpy(copy, s.c_str());
}
static inline wxChar* MYcopystring(const wxChar* s)
{
wxChar* copy = new wxChar[wxStrlen(s) + 1];
return wxStrcpy(copy, s);
}
wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase)
{
m_fileMaxFiles = maxFiles;
m_idBase = idBase;
m_fileHistoryN = 0;
m_fileHistory = new wxChar *[m_fileMaxFiles];
}
wxFileHistory::~wxFileHistory()
{
size_t i;
for (i = 0; i < m_fileHistoryN; i++)
delete[] m_fileHistory[i];
delete[] m_fileHistory;
}
// File history management
void wxFileHistory::AddFileToHistory(const wxString& file)
{
wxFileName fn(file);
size_t i;
// Check we don't already have this file
for (i = 0; i < m_fileHistoryN; i++)
for (i = 0; i < m_fileHistory.GetCount(); i++)
{
#if defined( __WXMSW__ ) // Add any other OSes with case insensitive file names
wxString testString;
if ( m_fileHistory[i] )
testString = m_fileHistory[i];
if ( m_fileHistory[i] && ( file.Lower() == testString.Lower() ) )
#else
if ( m_fileHistory[i] && ( file == m_fileHistory[i] ) )
#endif
// we need to do a comparison using wxFileNames because it knows
// how to exactly compare files on the different platforms
// (e.g. handle case [in]sensitive filesystems)
if ( fn == wxFileName(m_fileHistory[i]) )
{
// we do have it, move it to the top of the history
RemoveFileFromHistory (i);
@@ -2138,43 +2117,36 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
}
// if we already have a full history, delete the one at the end
if ( m_fileMaxFiles == m_fileHistoryN )
if ( m_fileMaxFiles == m_fileHistory.GetCount() )
{
RemoveFileFromHistory (m_fileHistoryN - 1);
RemoveFileFromHistory (m_fileHistory.GetCount() - 1);
AddFileToHistory (file);
return;
}
// Add to the project file history:
// Move existing files (if any) down so we can insert file at beginning.
if (m_fileHistoryN < m_fileMaxFiles)
if (m_fileHistory.GetCount() < m_fileMaxFiles)
{
wxList::compatibility_iterator node = m_fileMenus.GetFirst();
while (node)
{
wxMenu* menu = (wxMenu*) node->GetData();
if ( m_fileHistoryN == 0 && menu->GetMenuItemCount() )
if ( m_fileHistory.IsEmpty() && menu->GetMenuItemCount() )
{
menu->AppendSeparator();
}
menu->Append(m_idBase+m_fileHistoryN, _("[EMPTY]"));
menu->Append(m_idBase+m_fileHistory.GetCount(), _("[EMPTY]"));
node = node->GetNext();
}
m_fileHistoryN ++;
}
// Shuffle filenames down
for (i = (m_fileHistoryN-1); i > 0; i--)
{
m_fileHistory[i] = m_fileHistory[i-1];
}
m_fileHistory[0] = MYcopystring(file);
m_fileHistory.Insert(file, 0);
// this is the directory of the last opened file
wxString pathCurrent;
wxSplitPath( m_fileHistory[0], &pathCurrent, NULL, NULL );
for (i = 0; i < m_fileHistoryN; i++)
{
if ( m_fileHistory[i] )
for (i = 0; i < m_fileHistory.GetCount(); i++)
{
// if in same directory just show the filename; otherwise the full
// path
@@ -2194,8 +2166,10 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
// we need to quote '&' characters which are used for mnemonics
pathInMenu.Replace(_T("&"), _T("&&"));
wxString buf;
buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());
wxList::compatibility_iterator node = m_fileMenus.GetFirst();
while (node)
{
@@ -2204,22 +2178,15 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
node = node->GetNext();
}
}
}
}
void wxFileHistory::RemoveFileFromHistory(size_t i)
{
wxCHECK_RET( i < m_fileHistoryN,
wxCHECK_RET( i < m_fileHistory.GetCount(),
wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
// delete the element from the array (could use memmove() too...)
delete [] m_fileHistory[i];
size_t j;
for ( j = i; j < m_fileHistoryN - 1; j++ )
{
m_fileHistory[j] = m_fileHistory[j + 1];
}
// delete the element from the array
m_fileHistory.RemoveAt(i);
wxList::compatibility_iterator node = m_fileMenus.GetFirst();
while ( node )
@@ -2228,23 +2195,23 @@ void wxFileHistory::RemoveFileFromHistory(size_t i)
// shuffle filenames up
wxString buf;
for ( j = i; j < m_fileHistoryN - 1; j++ )
for ( size_t j = i; j < m_fileHistory.GetCount(); j++ )
{
buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j]);
buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j].c_str());
menu->SetLabel(m_idBase + j, buf);
}
node = node->GetNext();
// delete the last menu item which is unused now
wxWindowID lastItemId = m_idBase + wx_truncate_cast(wxWindowID, m_fileHistoryN) - 1;
wxWindowID lastItemId = m_idBase + wx_truncate_cast(wxWindowID, m_fileHistory.GetCount());
if (menu->FindItem(lastItemId))
{
menu->Delete(lastItemId);
}
// delete the last separator too if no more files are left
if ( m_fileHistoryN == 1 )
if ( m_fileHistory.GetCount() == 0 )
{
wxMenuItemList::compatibility_iterator nodeLast = menu->GetMenuItems().GetLast();
if ( nodeLast )
@@ -2259,23 +2226,6 @@ void wxFileHistory::RemoveFileFromHistory(size_t i)
//else: menu is empty somehow
}
}
m_fileHistoryN--;
}
wxString wxFileHistory::GetHistoryFile(size_t i) const
{
wxString s;
if ( i < m_fileHistoryN )
{
s = m_fileHistory[i];
}
else
{
wxFAIL_MSG( wxT("bad index in wxFileHistory::GetHistoryFile") );
}
return s;
}
void wxFileHistory::UseMenu(wxMenu *menu)
@@ -2292,17 +2242,21 @@ void wxFileHistory::RemoveMenu(wxMenu *menu)
#if wxUSE_CONFIG
void wxFileHistory::Load(wxConfigBase& config)
{
m_fileHistoryN = 0;
m_fileHistory.Clear();
wxString buf;
buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
buf.Printf(wxT("file%d"), 1);
wxString historyFile;
while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (!historyFile.empty()))
while ((m_fileHistory.GetCount() < m_fileMaxFiles) &&
config.Read(buf, &historyFile) && !historyFile.empty())
{
m_fileHistory[m_fileHistoryN] = MYcopystring((const wxChar*) historyFile);
m_fileHistoryN ++;
buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
m_fileHistory.Add(historyFile);
buf.Printf(wxT("file%d"), (int)m_fileHistory.GetCount()+1);
historyFile = wxEmptyString;
}
AddFilesToMenu();
}
@@ -2313,7 +2267,7 @@ void wxFileHistory::Save(wxConfigBase& config)
{
wxString buf;
buf.Printf(wxT("file%d"), (int)i+1);
if (i < m_fileHistoryN)
if (i < m_fileHistory.GetCount())
config.Write(buf, wxString(m_fileHistory[i]));
else
config.Write(buf, wxEmptyString);
@@ -2323,7 +2277,7 @@ void wxFileHistory::Save(wxConfigBase& config)
void wxFileHistory::AddFilesToMenu()
{
if (m_fileHistoryN > 0)
if (m_fileHistory.GetCount() > 0)
{
wxList::compatibility_iterator node = m_fileMenus.GetFirst();
while (node)
@@ -2335,15 +2289,12 @@ void wxFileHistory::AddFilesToMenu()
}
size_t i;
for (i = 0; i < m_fileHistoryN; i++)
{
if (m_fileHistory[i])
for (i = 0; i < m_fileHistory.GetCount(); i++)
{
wxString buf;
buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i].c_str());
menu->Append(m_idBase+i, buf);
}
}
node = node->GetNext();
}
}
@@ -2351,7 +2302,7 @@ void wxFileHistory::AddFilesToMenu()
void wxFileHistory::AddFilesToMenu(wxMenu* menu)
{
if (m_fileHistoryN > 0)
if (m_fileHistory.GetCount() > 0)
{
if (menu->GetMenuItemCount())
{
@@ -2359,16 +2310,13 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu)
}
size_t i;
for (i = 0; i < m_fileHistoryN; i++)
{
if (m_fileHistory[i])
for (i = 0; i < m_fileHistory.GetCount(); i++)
{
wxString buf;
buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i].c_str());
menu->Append(m_idBase+i, buf);
}
}
}
}
// ----------------------------------------------------------------------------