don't include windows.h unless neccessary

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

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index d3035015971b31c8bbbb4856ea4f50ddb7e64fc4..1c91682df33170f77f17c8405da3e8f8c3bc2d9c 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -2,37 +2,41 @@
 // Name:        src/msw/iniconf.cpp
 // Purpose:     implementation of wxIniConfig class
 // Author:      Vadim Zeitlin
 // Name:        src/msw/iniconf.cpp
 // Purpose:     implementation of wxIniConfig class
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     27.07.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Created:     27.07.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
+#ifdef __GNUG__
+#pragma implementation "iniconf.h"
+#endif

 
 

-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-#include  "wx/wxprec.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#ifdef    __BORLANDC__
-  #pragma hdrstop
-#endif  //__BORLANDC__
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif

 
 #ifndef   WX_PRECOMP
 
 #ifndef   WX_PRECOMP

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

 #endif  //WX_PRECOMP
 
 #endif  //WX_PRECOMP
 

-#include  <wx/dynarray.h>
-#include  <wx/log.h>
-#include  <wx/config.h>
+// Doesn't yet compile in Unicode mode

 
 

-#include  <wx/msw/iniconf.h>
+#if wxUSE_CONFIG && !wxUSE_UNICODE
+
+#include  "wx/dynarray.h"
+#include  "wx/log.h"
+#include  "wx/config.h"
+
+#include  "wx/msw/iniconf.h"

 
 // _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


@@ -55,47 +59,43 @@
 // ctor & dtor
 // ----------------------------------------------------------------------------
 
 // ctor & dtor
 // ----------------------------------------------------------------------------
 

-wxIniConfig::wxIniConfig(const wxString& strAppName, const wxString& strVendor,
-    const wxString& localFilename, const wxString& globalFilename, long style):
-     wxConfigBase(strAppName, strVendor, localFilename, globalFilename, style)
+wxIniConfig::wxIniConfig(const wxString& strAppName,
+                         const wxString& strVendor,
+                         const wxString& localFilename,
+                         const wxString& globalFilename,
+                         long style)
+           : 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,
+                          strVendor.IsEmpty() ? (wxTheApp ? wxTheApp->GetVendorName()
+                                                  : strAppName)
+                                      : strVendor,
+                          localFilename, globalFilename, style)
+#endif

 {
 {

-    if ( GetAppName().IsEmpty() )
-    {
-        wxString app;
-        if (wxTheApp)
-            app = wxTheApp->GetAppName();
-        wxASSERT( !app.IsEmpty() );
-        SetAppName(app);
-    }
-
-    // Vendor name is required in wxIniConfig.
-    // TODO: should it be required? Why isn't appName used instead? -- JACS
-    if ( GetVendorName().IsEmpty() )
-    {
-        wxString vendor;
-        if (wxTheApp)
-            vendor = wxTheApp->GetVendorName();
-        else
-            vendor = strAppName;
-        SetVendorName(vendor);
-    }
+    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('.') == NOT_FOUND )
+        m_strLocalFilename.Find(wxT('.')) == wxNOT_FOUND )

     {
     {

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

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

-    SetPath("");
+    SetPath(wxT(""));

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


@@ -143,7 +143,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) &&
   // 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) &&

-            (m_strGroup == PATH_SEP_REPLACE ||
+            (m_strGroup == wxString(PATH_SEP_REPLACE) ||

              m_strGroup.Last() != PATH_SEP_REPLACE) );
 }
 
              m_strGroup.Last() != PATH_SEP_REPLACE) );
 }
 


@@ -154,7 +154,7 @@ const wxString& wxIniConfig::GetPath() const
   // always return abs path
   s_str = wxCONFIG_PATH_SEPARATOR;
 
   // always return abs path
   s_str = wxCONFIG_PATH_SEPARATOR;
 

-  if ( m_strGroup == PATH_SEP_REPLACE ) {
+  if ( m_strGroup == wxString(PATH_SEP_REPLACE) ) {

     // we're at the root level, nothing to do
   }
   else {
     // we're at the root level, nothing to do
   }
   else {


@@ -185,7 +185,7 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 {
   wxString strKey;
 
 {
   wxString strKey;
 

-  if ( m_strGroup != PATH_SEP_REPLACE )
+  if ( m_strGroup != wxString(PATH_SEP_REPLACE) )

     strKey << m_strGroup << PATH_SEP_REPLACE;
   if ( !m_strPath.IsEmpty() )
     strKey << m_strPath << PATH_SEP_REPLACE;
     strKey << m_strGroup << PATH_SEP_REPLACE;
   if ( !m_strPath.IsEmpty() )
     strKey << m_strPath << PATH_SEP_REPLACE;


@@ -282,34 +282,7 @@ bool wxIniConfig::IsEmpty() const
 // read/write
 // ----------------------------------------------------------------------------
 
 // read/write
 // ----------------------------------------------------------------------------
 

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


@@ -328,15 +301,15 @@ bool wxIniConfig::Read(const wxString& szKey, wxString *pstr,
   }
 
   if ( ::IsEmpty(szBuf) ) {
   }
 
   if ( ::IsEmpty(szBuf) ) {

-    *pstr = szDefault;

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

+    *pstr = szBuf ;

     return TRUE;
   }
 }
 
     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());


@@ -355,19 +328,25 @@ bool wxIniConfig::Read(const wxString& szKey, long *pl) const
 
   // 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 == nMagic ) {
+  if ( lVal != nMagic2 ) {

     // the nMagic it returned was indeed read from the file
     *pl = lVal;
     return TRUE;
   }
 
     // the nMagic it returned was indeed read from the file
     *pl = lVal;
     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());


@@ -376,12 +355,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)


@@ -400,12 +379,18 @@ bool wxIniConfig::Flush(bool /* bCurrentOnly */)
 // delete
 // ----------------------------------------------------------------------------
 
 // delete
 // ----------------------------------------------------------------------------
 

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

 {
   // passing NULL as value to WritePrivateProfileString deletes the key
 {
   // passing NULL as value to WritePrivateProfileString deletes the key

-  if ( !Write(szKey, (const char *)NULL) )
+//  if ( !Write(szKey, (const char *)NULL) )
+//    return FALSE;
+  wxConfigPathChanger path(this, szKey);
+  wxString strKey = GetPrivateKeyName(path.Name());
+
+  if (WritePrivateProfileString(m_strGroup, szKey,
+                                         (const char*) NULL, m_strLocalFilename) == 0)

     return FALSE;
     return FALSE;

-    
+

   if ( !bGroupIfEmptyAlso || !IsEmpty() )
     return TRUE;
 
   if ( !bGroupIfEmptyAlso || !IsEmpty() )
     return TRUE;
 


@@ -414,26 +399,30 @@ bool wxIniConfig::DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso)
                                        NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )
                                        NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )

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

 
   return bOk;
 }
 
 
   return bOk;
 }
 

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

 {
   wxConfigPathChanger path(this, szKey);
 
 {
   wxConfigPathChanger path(this, szKey);
 

-  // passing NULL as section name to WritePrivateProfileString deletes the 
+  // passing NULL as section name to WritePrivateProfileString deletes the

   // whole section according to the docs
   bool bOk = WritePrivateProfileString(path.Name(), NULL,
                                        NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )
   // whole section according to the docs
   bool bOk = WritePrivateProfileString(path.Name(), NULL,
                                        NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )

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

 
   return bOk;
 }
 
 
   return bOk;
 }
 

+#ifndef MAX_PATH
+#define MAX_PATH 256
+#endif
+

 bool wxIniConfig::DeleteAll()
 {
   // first delete our group in win.ini
 bool wxIniConfig::DeleteAll()
 {
   // first delete our group in win.ini


@@ -443,17 +432,36 @@ bool wxIniConfig::DeleteAll()
   char szBuf[MAX_PATH];
   size_t nRc = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf));
   if ( nRc == 0 )
   char szBuf[MAX_PATH];
   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 ( !DeleteFile(strFile) ) {
+  if ( !wxRemoveFile(strFile) ) {

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

+
+bool wxIniConfig::RenameEntry(const wxString& oldName, const wxString& newName)
+{
+    // Not implemented
+    return FALSE;
+}
+
+bool wxIniConfig::RenameGroup(const wxString& oldName, const wxString& newName)
+{
+    // Not implemented
+    return FALSE;
+}
+
+#endif
+    // wxUSE_CONFIG && wxUSE_UNICODE