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

Include wx/dynarray.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-19 14:18:39 +00:00
parent 991d57f844
commit ad9835c97c
49 changed files with 400 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/msw/iniconf.cpp
View File

@@ -13,22 +13,22 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/utils.h"
#endif //WX_PRECOMP
// Doesn't yet compile in Unicode mode
#if wxUSE_CONFIG && !wxUSE_UNICODE
#include "wx/dynarray.h"
#ifndef WX_PRECOMP
#include "wx/dynarray.h"
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/utils.h"
#endif //WX_PRECOMP
#include "wx/log.h"
#include "wx/config.h"
#include "wx/file.h"
@@ -64,21 +64,21 @@ wxIniConfig::wxIniConfig(const wxString& strAppName,
: wxConfigBase(strAppName, strVendor, localFilename, globalFilename, style)
#if 0 // This is too complex for some compilers, e.g. BC++ 5.01
: wxConfigBase((strAppName.IsEmpty() && wxTheApp) ? wxTheApp->GetAppName()
: wxConfigBase((strAppName.empty() && wxTheApp) ? wxTheApp->GetAppName()
: strAppName,
strVendor.IsEmpty() ? (wxTheApp ? wxTheApp->GetVendorName()
strVendor.empty() ? (wxTheApp ? wxTheApp->GetVendorName()
: strAppName)
: strVendor,
localFilename, globalFilename, style)
#endif
{
if (strAppName.IsEmpty() && wxTheApp)
if (strAppName.empty() && wxTheApp)
SetAppName(wxTheApp->GetAppName());
if (strVendor.IsEmpty() && wxTheApp)
if (strVendor.empty() && wxTheApp)
SetVendorName(wxTheApp->GetVendorName());
m_strLocalFilename = localFilename;
if (m_strLocalFilename.IsEmpty())
if (m_strLocalFilename.empty())
{
m_strLocalFilename = GetAppName() + wxT(".ini");
}
@@ -107,7 +107,7 @@ void wxIniConfig::SetPath(const wxString& strPath)
{
wxArrayString aParts;
if ( strPath.IsEmpty() ) {
if ( strPath.empty() ) {
// nothing
}
else if ( strPath[0u] == wxCONFIG_PATH_SEPARATOR ) {
@@ -139,7 +139,7 @@ void wxIniConfig::SetPath(const wxString& strPath)
// other functions assume that all this is true, i.e. there are no trailing
// underscores at the end except if the group is the root one
wxASSERT( (m_strPath.IsEmpty() || m_strPath.Last() != PATH_SEP_REPLACE) &&
wxASSERT( (m_strPath.empty() || m_strPath.Last() != PATH_SEP_REPLACE) &&
(m_strGroup == wxString(PATH_SEP_REPLACE) ||
m_strGroup.Last() != PATH_SEP_REPLACE) );
}
@@ -156,7 +156,7 @@ const wxString& wxIniConfig::GetPath() const
}
else {
s_str << m_strGroup;
if ( !m_strPath.IsEmpty() )
if ( !m_strPath.empty() )
s_str << wxCONFIG_PATH_SEPARATOR;
for ( const char *p = m_strPath; *p != '\0'; p++ ) {
s_str << (*p == PATH_SEP_REPLACE ? wxCONFIG_PATH_SEPARATOR : *p);
@@ -170,7 +170,7 @@ wxString wxIniConfig::GetPrivateKeyName(const wxString& szKey) const
{
wxString strKey;
if ( !m_strPath.IsEmpty() )
if ( !m_strPath.empty() )
strKey << m_strPath << PATH_SEP_REPLACE;
strKey << szKey;
@@ -184,7 +184,7 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
if ( m_strGroup != wxString(PATH_SEP_REPLACE) )
strKey << m_strGroup << PATH_SEP_REPLACE;
if ( !m_strPath.IsEmpty() )
if ( !m_strPath.empty() )
strKey << m_strPath << PATH_SEP_REPLACE;
strKey << szKey;
@@ -199,30 +199,30 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
// not implemented
bool wxIniConfig::GetFirstGroup(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
{
wxFAIL_MSG("not implemented");
wxFAIL_MSG("not implemented");
return false;
return false;
}
bool wxIniConfig::GetNextGroup (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
{
wxFAIL_MSG("not implemented");
wxFAIL_MSG("not implemented");
return false;
return false;
}
bool wxIniConfig::GetFirstEntry(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
{
wxFAIL_MSG("not implemented");
wxFAIL_MSG("not implemented");
return false;
return false;
}
bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
{
wxFAIL_MSG("not implemented");
wxFAIL_MSG("not implemented");
return false;
return false;
}
// ----------------------------------------------------------------------------
@@ -232,47 +232,47 @@ bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex))
// not implemented
size_t wxIniConfig::GetNumberOfEntries(bool WXUNUSED(bRecursive)) const
{
wxFAIL_MSG("not implemented");
wxFAIL_MSG("not implemented");
return (size_t)-1;
return (size_t)-1;
}
size_t wxIniConfig::GetNumberOfGroups(bool WXUNUSED(bRecursive)) const
{
wxFAIL_MSG("not implemented");
wxFAIL_MSG("not implemented");
return (size_t)-1;
return (size_t)-1;
}
bool wxIniConfig::HasGroup(const wxString& WXUNUSED(strName)) const
{
wxFAIL_MSG("not implemented");
wxFAIL_MSG("not implemented");
return false;
return false;
}
bool wxIniConfig::HasEntry(const wxString& WXUNUSED(strName)) const
{
wxFAIL_MSG("not implemented");
wxFAIL_MSG("not implemented");
return false;
return false;
}
// is current group empty?
bool wxIniConfig::IsEmpty() const
{
char szBuf[1024];
char szBuf[1024];
GetPrivateProfileString(m_strGroup, NULL, "",
szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
if ( !::IsEmpty(szBuf) )
return false;
GetPrivateProfileString(m_strGroup, NULL, "",
szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
if ( !::IsEmpty(szBuf) )
return false;
GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
if ( !::IsEmpty(szBuf) )
return false;
GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
if ( !::IsEmpty(szBuf) )
return false;
return true;
return true;
}
// ----------------------------------------------------------------------------