GetParent() was always used in test for wxHSCROLL checked in in last commit; use...

[wxWidgets.git] / src / msw / iniconf.cpp

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index f3d0a6727bdde376d28e5107415288a76190c825..c072f913048dee7fa96463f0b6d8a3371fd4f68d 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -6,10 +6,10 @@
 // Created:     27.07.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     27.07.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "iniconf.h"
 #endif
 
 #pragma implementation "iniconf.h"
 #endif
 


@@ -28,16 +28,21 @@
   #include  "wx/utils.h"
 #endif  //WX_PRECOMP
 
   #include  "wx/utils.h"
 #endif  //WX_PRECOMP
 

+// Doesn't yet compile in Unicode mode
+
+#if wxUSE_CONFIG && !wxUSE_UNICODE
+

 #include  "wx/dynarray.h"
 #include  "wx/log.h"
 #include  "wx/config.h"
 #include  "wx/dynarray.h"
 #include  "wx/log.h"
 #include  "wx/config.h"

+#include  "wx/file.h"

 
 #include  "wx/msw/iniconf.h"
 
 // _WINDOWS_ is defined when windows.h is included,
 // __WXMSW__ is defined for MS Windows compilation
 #if       defined(__WXMSW__) && !defined(_WINDOWS_)
 
 #include  "wx/msw/iniconf.h"
 
 // _WINDOWS_ is defined when windows.h is included,
 // __WXMSW__ is defined for MS Windows compilation
 #if       defined(__WXMSW__) && !defined(_WINDOWS_)

-  #include  <windows.h>
+  #include  "wx/msw/wrapwin.h"

 #endif  //windows.h
 
 // ----------------------------------------------------------------------------
 #endif  //windows.h
 
 // ----------------------------------------------------------------------------


@@ -60,29 +65,38 @@ wxIniConfig::wxIniConfig(const wxString& strAppName,
                          const wxString& localFilename,
                          const wxString& globalFilename,
                          long style)
                          const wxString& localFilename,
                          const wxString& globalFilename,
                          long style)

-           : wxConfigBase(!strAppName && wxTheApp ? wxTheApp->GetAppName()
+           : 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()

                                                : strAppName,
                                                : strAppName,

-                          !strVendor ? (wxTheApp ? wxTheApp->GetVendorName()
+                          strVendor.IsEmpty() ? (wxTheApp ? wxTheApp->GetVendorName()

                                                   : strAppName)
                                       : strVendor,
                           localFilename, globalFilename, style)
                                                   : strAppName)
                                       : strVendor,
                           localFilename, globalFilename, style)

+#endif

 {
 {

+    if (strAppName.IsEmpty() && wxTheApp)
+        SetAppName(wxTheApp->GetAppName());
+    if (strVendor.IsEmpty() && wxTheApp)
+        SetVendorName(wxTheApp->GetVendorName());
+

     m_strLocalFilename = localFilename;
     if (m_strLocalFilename.IsEmpty())
     {
     m_strLocalFilename = localFilename;
     if (m_strLocalFilename.IsEmpty())
     {

-        m_strLocalFilename = GetAppName() + ".ini";
+        m_strLocalFilename = GetAppName() + wxT(".ini");

     }
 
     // append the extension if none given and it's not an absolute file name
     // (otherwise we assume that they know what they're doing)
     if ( !wxIsPathSeparator(m_strLocalFilename[0u]) &&
     }
 
     // append the extension if none given and it's not an absolute file name
     // (otherwise we assume that they know what they're doing)
     if ( !wxIsPathSeparator(m_strLocalFilename[0u]) &&

-        m_strLocalFilename.Find('.') == wxNOT_FOUND )
+        m_strLocalFilename.Find(wxT('.')) == wxNOT_FOUND )

     {
     {

-        m_strLocalFilename << ".ini";
+        m_strLocalFilename << wxT(".ini");

     }
 
     // set root path
     }
 
     // set root path

-    SetPath("");
+    SetPath(wxEmptyString);

 }
 
 wxIniConfig::~wxIniConfig()
 }
 
 wxIniConfig::~wxIniConfig()


@@ -187,32 +201,32 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 // ----------------------------------------------------------------------------
 
 // not implemented
 // ----------------------------------------------------------------------------
 
 // not implemented

-bool wxIniConfig::GetFirstGroup(wxString& str, long& lIndex) const
+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& str, long& lIndex) const
+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& str, long& lIndex) const
+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& str, long& lIndex) const
+bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const

 {
   wxFAIL_MSG("not implemented");
 
 {
   wxFAIL_MSG("not implemented");
 

-  return FALSE;
+  return false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -220,32 +234,32 @@ bool wxIniConfig::GetNextEntry (wxString& str, long& lIndex) const
 // ----------------------------------------------------------------------------
 
 // not implemented
 // ----------------------------------------------------------------------------
 
 // not implemented

-size_t wxIniConfig::GetNumberOfEntries(bool bRecursive) const
+size_t wxIniConfig::GetNumberOfEntries(bool WXUNUSED(bRecursive)) const

 {
   wxFAIL_MSG("not implemented");
 
   return (size_t)-1;
 }
 
 {
   wxFAIL_MSG("not implemented");
 
   return (size_t)-1;
 }
 

-size_t wxIniConfig::GetNumberOfGroups(bool bRecursive) const
+size_t wxIniConfig::GetNumberOfGroups(bool WXUNUSED(bRecursive)) const

 {
   wxFAIL_MSG("not implemented");
 
   return (size_t)-1;
 }
 
 {
   wxFAIL_MSG("not implemented");
 
   return (size_t)-1;
 }
 

-bool wxIniConfig::HasGroup(const wxString& strName) const
+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& strName) const
+bool wxIniConfig::HasEntry(const wxString& WXUNUSED(strName)) const

 {
   wxFAIL_MSG("not implemented");
 
 {
   wxFAIL_MSG("not implemented");
 

-  return FALSE;
+  return false;

 }
 
 // is current group empty?
 }
 
 // is current group empty?


@@ -256,20 +270,20 @@ bool wxIniConfig::IsEmpty() const
   GetPrivateProfileString(m_strGroup, NULL, "",
                           szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
   if ( !::IsEmpty(szBuf) )
   GetPrivateProfileString(m_strGroup, NULL, "",
                           szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
   if ( !::IsEmpty(szBuf) )

-    return FALSE;
+    return false;

 
   GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
   if ( !::IsEmpty(szBuf) )
 
   GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
   if ( !::IsEmpty(szBuf) )

-    return FALSE;
+    return false;

 
 

-  return TRUE;
+  return true;

 }
 
 // ----------------------------------------------------------------------------
 // read/write
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // read/write
 // ----------------------------------------------------------------------------
 

-bool wxIniConfig::Read(const wxString& szKey, wxString *pstr) const
+bool wxIniConfig::DoReadString(const wxString& szKey, wxString *pstr) const

 {
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 {
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());


@@ -287,45 +301,14 @@ bool wxIniConfig::Read(const wxString& szKey, wxString *pstr) const
     GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
   }
 
     GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
   }
 

-  if ( ::IsEmpty(szBuf) ) {
-    return FALSE;
-  }
-  else {
-    *pstr = szBuf ;
-    return TRUE;
-  }
-}
-
-bool wxIniConfig::Read(const wxString& szKey, wxString *pstr,
-                       const wxString& szDefault) const
-{
-  wxConfigPathChanger path(this, szKey);
-  wxString strKey = GetPrivateKeyName(path.Name());
-
-  char szBuf[1024]; // @@ should dynamically allocate memory...
-
-  // first look in the private INI file
+  if ( ::IsEmpty(szBuf) )
+    return false;

 
 

-  // NB: the lpDefault param to GetPrivateProfileString can't be NULL
-  GetPrivateProfileString(m_strGroup, strKey, "",
-                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
-  if ( ::IsEmpty(szBuf) ) {
-    // now look in win.ini
-    wxString strKey = GetKeyName(path.Name());
-    GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
-  }
-
-  if ( ::IsEmpty(szBuf) ) {
-    *pstr = szDefault;
-    return FALSE;
-  }
-  else {
-    *pstr = szBuf ;
-    return TRUE;
-  }
+  *pstr = szBuf;
+  return true;

 }
 
 }
 

-bool wxIniConfig::Read(const wxString& szKey, long *pl) const
+bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const

 {
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 {
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());


@@ -339,24 +322,30 @@ bool wxIniConfig::Read(const wxString& szKey, long *pl) const
   if ( lVal != nMagic ) {
     // the value was read from the file
     *pl = lVal;
   if ( lVal != nMagic ) {
     // the value was read from the file
     *pl = lVal;

-    return TRUE;
+    return true;

   }
 
   // is it really nMagic?
   lVal = GetPrivateProfileInt(m_strGroup, strKey, nMagic2, m_strLocalFilename);
   }
 
   // is it really nMagic?
   lVal = GetPrivateProfileInt(m_strGroup, strKey, nMagic2, m_strLocalFilename);

-  if ( lVal == nMagic2 ) {
+  if ( lVal != nMagic2 ) {

     // the nMagic it returned was indeed read from the file
     *pl = lVal;
     // the nMagic it returned was indeed read from the file
     *pl = lVal;

-    return TRUE;
+    return true;

   }
 
   }
 

+  // CS : I have no idea why they should look up in win.ini
+  // and if at all they have to do the same procedure using the two magic numbers
+  // otherwise it always returns true, even if the key was not there at all
+#if 0

   // no, it was just returning the default value, so now look in win.ini
   // no, it was just returning the default value, so now look in win.ini

-  *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl);
+ *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl);

 
 

-  return TRUE;
+  return true;
+#endif
+  return false ;

 }
 
 }
 

-bool wxIniConfig::Write(const wxString& szKey, const wxString& szValue)
+bool wxIniConfig::DoWriteString(const wxString& szKey, const wxString& szValue)

 {
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 {
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());


@@ -365,12 +354,12 @@ bool wxIniConfig::Write(const wxString& szKey, const wxString& szValue)
                                        szValue, m_strLocalFilename) != 0;
 
   if ( !bOk )
                                        szValue, m_strLocalFilename) != 0;
 
   if ( !bOk )

-    wxLogLastError("WritePrivateProfileString");
+    wxLogLastError(wxT("WritePrivateProfileString"));

 
   return bOk;
 }
 
 
   return bOk;
 }
 

-bool wxIniConfig::Write(const wxString& szKey, long lValue)
+bool wxIniConfig::DoWriteLong(const wxString& szKey, long lValue)

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


@@ -392,24 +381,22 @@ bool wxIniConfig::Flush(bool /* bCurrentOnly */)
 bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso)
 {
   // passing NULL as value to WritePrivateProfileString deletes the key
 bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso)
 {
   // passing NULL as value to WritePrivateProfileString deletes the key

-//  if ( !Write(szKey, (const char *)NULL) )
-//    return FALSE;

   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 

-  if (WritePrivateProfileString(m_strGroup, szKey,
+  if (WritePrivateProfileString(m_strGroup, strKey,

                                          (const char*) NULL, m_strLocalFilename) == 0)
                                          (const char*) NULL, m_strLocalFilename) == 0)

-    return FALSE;
+    return false;

 
   if ( !bGroupIfEmptyAlso || !IsEmpty() )
 
   if ( !bGroupIfEmptyAlso || !IsEmpty() )

-    return TRUE;
+    return true;

 
   // delete the current group too
   bool bOk = WritePrivateProfileString(m_strGroup, NULL,
                                        NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )
 
   // delete the current group too
   bool bOk = WritePrivateProfileString(m_strGroup, NULL,
                                        NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )

-    wxLogLastError("WritePrivateProfileString");
+    wxLogLastError(wxT("WritePrivateProfileString"));

 
   return bOk;
 }
 
   return bOk;
 }


@@ -424,7 +411,7 @@ bool wxIniConfig::DeleteGroup(const wxString& szKey)
                                        NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )
                                        NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )

-    wxLogLastError("WritePrivateProfileString");
+    wxLogLastError(wxT("WritePrivateProfileString"));

 
   return bOk;
 }
 
   return bOk;
 }


@@ -443,32 +430,37 @@ bool wxIniConfig::DeleteAll()
   size_t nRc = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf));
   if ( nRc == 0 )
   {
   size_t nRc = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf));
   if ( nRc == 0 )
   {

-    wxLogLastError("GetWindowsDirectory");
+    wxLogLastError(wxT("GetWindowsDirectory"));

   }
   else if ( nRc > WXSIZEOF(szBuf) )
   {
   }
   else if ( nRc > WXSIZEOF(szBuf) )
   {

-    wxFAIL_MSG("buffer is too small for Windows directory.");
+    wxFAIL_MSG(wxT("buffer is too small for Windows directory."));

   }
 
   wxString strFile = szBuf;
   strFile << '\\' << m_strLocalFilename;
 
   }
 
   wxString strFile = szBuf;
   strFile << '\\' << m_strLocalFilename;
 

-  if ( !wxRemoveFile(strFile) ) {
+  if ( wxFile::Exists(strFile) && !wxRemoveFile(strFile) ) {

     wxLogSysError(_("Can't delete the INI file '%s'"), strFile.c_str());
     wxLogSysError(_("Can't delete the INI file '%s'"), strFile.c_str());

-    return FALSE;
+    return false;

   }
 
   }
 

-  return TRUE;
+  return true;

 }
 
 }
 

-bool wxIniConfig::RenameEntry(const wxString& oldName, const wxString& newName)
+bool wxIniConfig::RenameEntry(const wxString& WXUNUSED(oldName),
+                              const wxString& WXUNUSED(newName))

 {
     // Not implemented
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 
 }
 

-bool wxIniConfig::RenameGroup(const wxString& oldName, const wxString& newName)
+bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName),
+                              const wxString& WXUNUSED(newName))

 {
     // Not implemented
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 }

+
+#endif
+    // wxUSE_CONFIG && wxUSE_UNICODE