no message

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 454dc463ad9c613ca0d75c8bd28dee97643ba4f8..cb7ca2fa106b25d321e936f226124d9763502d58 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -28,16 +28,19 @@
 #endif  //__BORLANDC__
 
 #ifndef   WX_PRECOMP
 #endif  //__BORLANDC__
 
 #ifndef   WX_PRECOMP

-  #include  <wx/string.h>
-  #include  <wx/intl.h>
+  #include  "wx/string.h"
+  #include  "wx/intl.h"

 #endif  //WX_PRECOMP
 
 #endif  //WX_PRECOMP
 

-#include  <wx/dynarray.h>
-#include  <wx/file.h>
-#include  <wx/log.h>
-#include  <wx/textfile.h>
-#include  <wx/config.h>
-#include  <wx/fileconf.h>
+#include  "wx/app.h"
+#include  "wx/dynarray.h"
+#include  "wx/file.h"
+#include  "wx/log.h"
+#include  "wx/textfile.h"
+#include  "wx/config.h"
+#include  "wx/fileconf.h"
+
+#include  "wx/utils.h"    // for wxGetHomeDir

 
 // _WINDOWS_ is defined when windows.h is included,
 // __WXMSW__ is defined for MS Windows compilation
 
 // _WINDOWS_ is defined when windows.h is included,
 // __WXMSW__ is defined for MS Windows compilation


@@ -53,6 +56,13 @@
 // ----------------------------------------------------------------------------
 #define CONST_CAST ((wxFileConfig *)this)->
 
 // ----------------------------------------------------------------------------
 #define CONST_CAST ((wxFileConfig *)this)->
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+#ifndef MAX_PATH
+  #define MAX_PATH 512
+#endif
+

 // ----------------------------------------------------------------------------
 // global functions declarations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global functions declarations
 // ----------------------------------------------------------------------------


@@ -86,15 +96,10 @@ wxString wxFileConfig::GetGlobalDir()
   #ifdef __UNIX__
     strDir = "/etc/";
   #elif defined(__WXSTUBS__)
   #ifdef __UNIX__
     strDir = "/etc/";
   #elif defined(__WXSTUBS__)

-    // TODO
-    wxASSERT( TRUE ) ;
+    wxASSERT_MSG( FALSE, "TODO" ) ;

   #else // Windows
   #else // Windows

-    #ifndef _MAX_PATH
-      #define _MAX_PATH 512
-    #endif
-
-    char szWinDir[_MAX_PATH];
-    ::GetWindowsDirectory(szWinDir, _MAX_PATH);
+    char szWinDir[MAX_PATH];
+    ::GetWindowsDirectory(szWinDir, MAX_PATH);

 
     strDir = szWinDir;
     strDir << '\\';
 
     strDir = szWinDir;
     strDir << '\\';


@@ -106,30 +111,8 @@ wxString wxFileConfig::GetGlobalDir()
 wxString wxFileConfig::GetLocalDir()
 {
   wxString strDir;
 wxString wxFileConfig::GetLocalDir()
 {
   wxString strDir;

-
-  #ifdef __UNIX__
-    const char *szHome = getenv("HOME");
-    if ( szHome == NULL ) {
-      // we're homeless...
-      wxLogWarning(_("can't find user's HOME, using current directory."));
-      strDir = ".";
-    }
-    else
-       strDir = szHome;
-    strDir << '/'; // a double slash is no problem, a missin one yes
-  #else   // Windows
-    #ifdef  __WIN32__
-      const char *szHome = getenv("HOMEDRIVE");
-      if ( szHome != NULL )
-        strDir << szHome;
-      szHome = getenv("HOMEPATH");
-      if ( szHome != NULL )
-        strDir << szHome;
-    #else   // Win16
-      // Win16 has no idea about home, so use the current directory instead
-      strDir = ".\\";
-    #endif  // WIN16/32
-  #endif  // UNIX/Win
+  
+  wxGetHomeDir(&strDir);

 
   return strDir;
 }
 
   return strDir;
 }


@@ -207,32 +190,51 @@ void wxFileConfig::Init()
   }
 }
 
   }
 }
 

-wxFileConfig::wxFileConfig(const char *szAppName, bool bLocalOnly)
+// constructor supports creation of wxFileConfig objects of any type
+wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
+                           const wxString& strLocal, const wxString& strGlobal,
+                           long style)
+            : wxConfigBase(appName, vendorName, strLocal, strGlobal, style),
+              m_strLocalFile(strLocal), m_strGlobalFile(strGlobal)

 {
 {

-  wxASSERT( !IsEmpty(szAppName) ); // invent a name for your application!
+  // Make up an application name if not supplied
+  if (appName.IsEmpty() && wxTheApp)
+  {
+    SetAppName(wxTheApp->GetAppName());
+  }
+
+  // Make up names for files if empty
+  if ( m_strLocalFile.IsEmpty() && (style & wxCONFIG_USE_LOCAL_FILE) )
+  {
+    m_strLocalFile = GetLocalFileName(GetAppName());
+  }

 
 

-  m_strLocalFile = GetLocalFileName(szAppName);
-  if ( !bLocalOnly )
-    m_strGlobalFile = GetGlobalFileName(szAppName);
-  //else: it's going to be empty and we won't use the global file
+  if ( m_strGlobalFile.IsEmpty() && (style & wxCONFIG_USE_GLOBAL_FILE) )
+  {
+    m_strGlobalFile = GetGlobalFileName(GetAppName());
+  }

 
 

-  Init();
-}
+  // Check if styles are not supplied, but filenames are, in which case
+  // add the correct styles.
+  if ( !m_strLocalFile.IsEmpty() )
+    SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
+
+  if ( !m_strGlobalFile.IsEmpty() )
+    SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE);

 
 

-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
   // if the path is not absolute, prepend the standard directory to it

-  if ( !strLocal.IsEmpty() && !wxIsAbsolutePath(strLocal) )
+  if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) )

   {
   {

-     m_strLocalFile = GetLocalDir();
-     m_strLocalFile << strLocal;
+    wxString strLocal = m_strLocalFile;
+    m_strLocalFile = GetLocalDir();
+    m_strLocalFile << strLocal;

   }
   }

-  
-  if ( !strGlobal.IsEmpty() && !wxIsAbsolutePath(strGlobal) )
+
+  if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )

   {
   {

-     m_strGlobalFile = GetGlobalDir();
-     m_strGlobalFile << strGlobal;
+    wxString strGlobal = m_strGlobalFile;
+    m_strGlobalFile = GetGlobalDir();
+    m_strGlobalFile << strGlobal;

   }
 
   Init();
   }
 
   Init();


@@ -509,7 +511,7 @@ size_t wxFileConfig::GetNumberOfGroups(bool bRecursive) const
 
 bool wxFileConfig::HasGroup(const wxString& strName) const
 {
 
 bool wxFileConfig::HasGroup(const wxString& strName) const
 {

-  PathChanger path(this, strName);
+  wxConfigPathChanger path(this, strName);

 
   ConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name());
   return pGroup != NULL;
 
   ConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name());
   return pGroup != NULL;


@@ -517,7 +519,7 @@ bool wxFileConfig::HasGroup(const wxString& strName) const
 
 bool wxFileConfig::HasEntry(const wxString& strName) const
 {
 
 bool wxFileConfig::HasEntry(const wxString& strName) const
 {

-  PathChanger path(this, strName);
+  wxConfigPathChanger path(this, strName);

 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   return pEntry != NULL;
 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   return pEntry != NULL;


@@ -527,50 +529,54 @@ bool wxFileConfig::HasEntry(const wxString& strName) const
 // read/write values
 // ----------------------------------------------------------------------------
 
 // read/write values
 // ----------------------------------------------------------------------------
 

-bool wxFileConfig::Read(wxString   *pstr,
-                        const char *szKey,
-                        const char *szDefault) const
+bool wxFileConfig::Read(const wxString& key,
+                        wxString* pStr) const

 {
 {

-  PathChanger path(this, szKey);
+  wxConfigPathChanger path(this, key);

 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   if (pEntry == NULL) {
 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   if (pEntry == NULL) {

-    if( IsRecordingDefaults() )
-      ((wxFileConfig *)this)->Write(szKey,szDefault);
-    *pstr = ExpandEnvVars(szDefault);

     return FALSE;
   }
   else {
     return FALSE;
   }
   else {

-    *pstr = ExpandEnvVars(pEntry->Value());
+    *pStr = ExpandEnvVars(pEntry->Value());

     return TRUE;
   }
 }
 
     return TRUE;
   }
 }
 

-const char *wxFileConfig::Read(const char *szKey,
-                               const char *szDefault) const
+bool wxFileConfig::Read(const wxString& key,
+                        wxString* pStr, const wxString& defVal) const

 {
 {

-  static wxString s_str;
-  Read(&s_str, szKey, szDefault);
+  wxConfigPathChanger path(this, key);

 
 

-  return s_str.c_str();
+  ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
+  if (pEntry == NULL) {
+    if( IsRecordingDefaults() )
+      ((wxFileConfig *)this)->Write(key,defVal);
+    *pStr = ExpandEnvVars(defVal);
+    return FALSE;
+  }
+  else {
+    *pStr = ExpandEnvVars(pEntry->Value());
+    return TRUE;
+  }

 }
 
 }
 

-bool wxFileConfig::Read(long *pl, const char *szKey, long lDefault) const
+bool wxFileConfig::Read(const wxString& key, long *pl) const

 {
   wxString str;
 {
   wxString str;

-  if ( Read(&str, szKey) ) {
+  if ( Read(key, & str) ) {

     *pl = atol(str);
     return TRUE;
   }
   else {
     *pl = atol(str);
     return TRUE;
   }
   else {

-    *pl = lDefault;

     return FALSE;
   }
 }
 
     return FALSE;
   }
 }
 

-bool wxFileConfig::Write(const char *szKey, const char *szValue)
+bool wxFileConfig::Write(const wxString& key, const wxString& szValue)

 {
 {

-  PathChanger path(this, szKey);
+  wxConfigPathChanger path(this, key);

 
   wxString strName = path.Name();
   if ( strName.IsEmpty() ) {
 
   wxString strName = path.Name();
   if ( strName.IsEmpty() ) {


@@ -611,12 +617,12 @@ bool wxFileConfig::Write(const char *szKey, const char *szValue)
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxFileConfig::Write(const char *szKey, long lValue)
+bool wxFileConfig::Write(const wxString& key, long lValue)

 {
   // ltoa() is not ANSI :-(
   char szBuf[40];   // should be good for sizeof(long) <= 16 (128 bits)
   sprintf(szBuf, "%ld", lValue);
 {
   // ltoa() is not ANSI :-(
   char szBuf[40];   // should be good for sizeof(long) <= 16 (128 bits)
   sprintf(szBuf, "%ld", lValue);

-  return Write(szKey, szBuf);
+  return Write(key, szBuf);

 }
 
 bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 }
 
 bool wxFileConfig::Flush(bool /* bCurrentOnly */)


@@ -646,9 +652,9 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 // delete groups/entries
 // ----------------------------------------------------------------------------
 
 // delete groups/entries
 // ----------------------------------------------------------------------------
 

-bool wxFileConfig::DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso)
+bool wxFileConfig::DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso)

 {
 {

-  PathChanger path(this, szKey);
+  wxConfigPathChanger path(this, key);

 
   if ( !m_pCurrentGroup->DeleteEntry(path.Name()) )
     return FALSE;
 
   if ( !m_pCurrentGroup->DeleteEntry(path.Name()) )
     return FALSE;


@@ -665,9 +671,9 @@ bool wxFileConfig::DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso)
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxFileConfig::DeleteGroup(const char *szKey)
+bool wxFileConfig::DeleteGroup(const wxString& key)

 {
 {

-  PathChanger path(this, szKey);
+  wxConfigPathChanger path(this, key);

 
   return m_pCurrentGroup->DeleteSubgroupByName(path.Name());
 }
 
   return m_pCurrentGroup->DeleteSubgroupByName(path.Name());
 }


@@ -853,7 +859,7 @@ wxFileConfig::LineList *wxFileConfig::ConfigGroup::GetGroupLine()
     // this group wasn't present in local config file, add it now
     if ( pParent != NULL ) {
       wxString strFullName;
     // this group wasn't present in local config file, add it now
     if ( pParent != NULL ) {
       wxString strFullName;

-      strFullName << "[" << GetFullName().c_str() + 1 << "]"; // +1: no '/'
+      strFullName << "[" << (GetFullName().c_str() + 1) << "]"; // +1: no '/'

       m_pLine = m_pConfig->LineListInsert(strFullName,
                                           pParent->GetLastGroupLine());
       pParent->SetLastGroup(this);  // we're surely after all the others
       m_pLine = m_pConfig->LineListInsert(strFullName,
                                           pParent->GetLastGroupLine());
       pParent->SetLastGroup(this);  // we're surely after all the others