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

compilation problem under Windows fixed (Karsten, you should use a cast when

Browse Source 
calling a const function from a non-const one - gcc compiles it it, but it's
broken)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-08-05 21:51:47 +00:00
parent 123a7fddb8
commit df9067d85c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/fileconf.cpp
View File

@@ -220,18 +220,18 @@ wxFileConfig::wxFileConfig(const wxString& strLocal, const wxString& strGlobal)
: m_strLocalFile(strLocal), m_strGlobalFile(strGlobal) : m_strLocalFile(strLocal), m_strGlobalFile(strGlobal)
{ {
// if the path is not absolute, prepend the standard directory to it // if the path is not absolute, prepend the standard directory to it
if ( !strLocal.IsEmpty() && !wxIsAbsolutePath(strLocal) )
if ( !strLocal.IsEmpty() && !wxIsPathSeparator(strLocal[0u]) )
{ {
m_strLocalFile = GetLocalDir(); m_strLocalFile = GetLocalDir();
m_strLocalFile << strLocal; m_strLocalFile << strLocal;
} }
if ( !strGlobal.IsEmpty() && !wxIsPathSeparator(strGlobal[0u]) ) if ( !strGlobal.IsEmpty() && !wxIsAbsolutePath(strGlobal) )
{ {
m_strGlobalFile = GetGlobalDir(); m_strGlobalFile = GetGlobalDir();
m_strGlobalFile << strGlobal; m_strGlobalFile << strGlobal;
} }
Init(); Init();
} }
@@ -532,8 +532,8 @@ bool wxFileConfig::Read(wxString *pstr,
ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name()); ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
if (pEntry == NULL) { if (pEntry == NULL) {
if(IsRecordingDefaults()) if( IsRecordingDefaults() )
Write(szKey,szDefault); ((wxFileConfig *)this)->Write(szKey,szDefault);
*pstr = ExpandEnvVars(szDefault); *pstr = ExpandEnvVars(szDefault);
return FALSE; return FALSE;
} }