VZ: I removed (CASTWNDPROC) from ::CallWndProc - it doesn't compile here with it

[wxWidgets.git] / src / common / fileconf.cpp

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index e2ba1c0aaf1fda257c60edcb00fd884f6a119a48..7cc86f423d7e151bf5bd30c6fe887eed8319b02d 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -220,18 +220,18 @@ wxFileConfig::wxFileConfig(const wxString& strLocal, const wxString& strGlobal)
             : m_strLocalFile(strLocal), m_strGlobalFile(strGlobal)
 {
   // if the path is not absolute, prepend the standard directory to it
             : m_strLocalFile(strLocal), m_strGlobalFile(strGlobal)
 {
   // if the path is not absolute, prepend the standard directory to it

-
-  if ( !strLocal.IsEmpty() && !wxIsPathSeparator(strLocal[0u]) )
+  if ( !strLocal.IsEmpty() && !wxIsAbsolutePath(strLocal) )

   {
      m_strLocalFile = GetLocalDir();
      m_strLocalFile << strLocal;
   }
   
   {
      m_strLocalFile = GetLocalDir();
      m_strLocalFile << strLocal;
   }
   

-  if ( !strGlobal.IsEmpty() && !wxIsPathSeparator(strGlobal[0u]) )
+  if ( !strGlobal.IsEmpty() && !wxIsAbsolutePath(strGlobal) )

   {
      m_strGlobalFile = GetGlobalDir();
      m_strGlobalFile << strGlobal;
   }
   {
      m_strGlobalFile = GetGlobalDir();
      m_strGlobalFile << strGlobal;
   }

+

   Init();
 }
 
   Init();
 }
 


@@ -532,8 +532,8 @@ bool wxFileConfig::Read(wxString   *pstr,
 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   if (pEntry == NULL) {
 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   if (pEntry == NULL) {

-     if(IsRecordingDefaults())
-        Write(szKey,szDefault);
+    if( IsRecordingDefaults() )
+      ((wxFileConfig *)this)->Write(szKey,szDefault);

     *pstr = ExpandEnvVars(szDefault);
     return FALSE;
   }
     *pstr = ExpandEnvVars(szDefault);
     return FALSE;
   }