don't declare inline function with dllexport declaration, this provokes mingw32 warni...

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

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index f774bc97da8943f3dcf82deaf20782901c64920f..94f347b589a9a1fdc51889fc6c21294c49d2a466 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -9,41 +9,33 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "iniconf.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef   WX_PRECOMP
-  #include  "wx/string.h"
-  #include  "wx/intl.h"
-  #include  "wx/event.h"
-  #include  "wx/app.h"
-  #include  "wx/utils.h"
-#endif  //WX_PRECOMP
-

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

-#include  "wx/dynarray.h"
-#include  "wx/log.h"
+#ifndef   WX_PRECOMP
+    #include "wx/msw/wrapwin.h"
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/log.h"
+#endif  //WX_PRECOMP
+

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

+#include  "wx/file.h"

 
 #include  "wx/msw/iniconf.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/wrapwin.h"
-#endif  //windows.h
-

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -58,6 +50,7 @@
 // ----------------------------------------------------------------------------
 // ctor & dtor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ctor & dtor
 // ----------------------------------------------------------------------------

+IMPLEMENT_ABSTRACT_CLASS(wxIniConfig, wxConfigBase)

 
 wxIniConfig::wxIniConfig(const wxString& strAppName,
                          const wxString& strVendor,
 
 wxIniConfig::wxIniConfig(const wxString& strAppName,
                          const wxString& strVendor,


@@ -67,21 +60,21 @@ wxIniConfig::wxIniConfig(const wxString& strAppName,
            : wxConfigBase(strAppName, strVendor, localFilename, globalFilename, style)
 
 #if 0 // This is too complex for some compilers, e.g. BC++ 5.01
            : 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()
+           : wxConfigBase((strAppName.empty() && wxTheApp) ? wxTheApp->GetAppName()

                                                : strAppName,
                                                : strAppName,

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

                                                   : strAppName)
                                       : strVendor,
                           localFilename, globalFilename, style)
 #endif
 {
                                                   : strAppName)
                                       : strVendor,
                           localFilename, globalFilename, style)
 #endif
 {

-    if (strAppName.IsEmpty() && wxTheApp)
+    if (strAppName.empty() && wxTheApp)

         SetAppName(wxTheApp->GetAppName());
         SetAppName(wxTheApp->GetAppName());

-    if (strVendor.IsEmpty() && wxTheApp)
+    if (strVendor.empty() && wxTheApp)

         SetVendorName(wxTheApp->GetVendorName());
 
     m_strLocalFilename = localFilename;
         SetVendorName(wxTheApp->GetVendorName());
 
     m_strLocalFilename = localFilename;

-    if (m_strLocalFilename.IsEmpty())
+    if (m_strLocalFilename.empty())

     {
         m_strLocalFilename = GetAppName() + wxT(".ini");
     }
     {
         m_strLocalFilename = GetAppName() + wxT(".ini");
     }


@@ -110,7 +103,7 @@ void wxIniConfig::SetPath(const wxString& strPath)
 {
   wxArrayString aParts;
 
 {
   wxArrayString aParts;
 

-  if ( strPath.IsEmpty() ) {
+  if ( strPath.empty() ) {

     // nothing
   }
   else if ( strPath[0u] == wxCONFIG_PATH_SEPARATOR ) {
     // nothing
   }
   else if ( strPath[0u] == wxCONFIG_PATH_SEPARATOR ) {


@@ -142,7 +135,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
 
   // 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) &&
+  wxASSERT( (m_strPath.empty() || m_strPath.Last() != PATH_SEP_REPLACE) &&

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


@@ -159,7 +152,7 @@ const wxString& wxIniConfig::GetPath() const
   }
   else {
     s_str << m_strGroup;
   }
   else {
     s_str << m_strGroup;

-    if ( !m_strPath.IsEmpty() )
+    if ( !m_strPath.empty() )

       s_str << wxCONFIG_PATH_SEPARATOR;
     for ( const char *p = m_strPath; *p != '\0'; p++ ) {
       s_str << (*p == PATH_SEP_REPLACE ? wxCONFIG_PATH_SEPARATOR : *p);
       s_str << wxCONFIG_PATH_SEPARATOR;
     for ( const char *p = m_strPath; *p != '\0'; p++ ) {
       s_str << (*p == PATH_SEP_REPLACE ? wxCONFIG_PATH_SEPARATOR : *p);


@@ -173,7 +166,7 @@ wxString wxIniConfig::GetPrivateKeyName(const wxString& szKey) const
 {
   wxString strKey;
 
 {
   wxString strKey;
 

-  if ( !m_strPath.IsEmpty() )
+  if ( !m_strPath.empty() )

     strKey << m_strPath << PATH_SEP_REPLACE;
 
   strKey << szKey;
     strKey << m_strPath << PATH_SEP_REPLACE;
 
   strKey << szKey;


@@ -187,7 +180,7 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 
   if ( m_strGroup != wxString(PATH_SEP_REPLACE) )
     strKey << m_strGroup << PATH_SEP_REPLACE;
 
   if ( m_strGroup != wxString(PATH_SEP_REPLACE) )
     strKey << m_strGroup << PATH_SEP_REPLACE;

-  if ( !m_strPath.IsEmpty() )
+  if ( !m_strPath.empty() )

     strKey << m_strPath << PATH_SEP_REPLACE;
 
   strKey << szKey;
     strKey << m_strPath << PATH_SEP_REPLACE;
 
   strKey << szKey;


@@ -202,30 +195,30 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 // not implemented
 bool wxIniConfig::GetFirstGroup(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
 // not implemented
 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& WXUNUSED(str), long& WXUNUSED(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& WXUNUSED(str), long& WXUNUSED(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& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
 }
 
 bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {

-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");

 
 

-  return FALSE;
+    return false;

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


@@ -235,47 +228,47 @@ bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex))
 // not implemented
 size_t wxIniConfig::GetNumberOfEntries(bool WXUNUSED(bRecursive)) const
 {
 // not implemented
 size_t wxIniConfig::GetNumberOfEntries(bool WXUNUSED(bRecursive)) const
 {

-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");

 
 

-  return (size_t)-1;
+    return (size_t)-1;

 }
 
 size_t wxIniConfig::GetNumberOfGroups(bool WXUNUSED(bRecursive)) const
 {
 }
 
 size_t wxIniConfig::GetNumberOfGroups(bool WXUNUSED(bRecursive)) const
 {

-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");

 
 

-  return (size_t)-1;
+    return (size_t)-1;

 }
 
 bool wxIniConfig::HasGroup(const wxString& WXUNUSED(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& WXUNUSED(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?
 bool wxIniConfig::IsEmpty() const
 {
 }
 
 // is current group empty?
 bool wxIniConfig::IsEmpty() const
 {

-  char szBuf[1024];
+    char szBuf[1024];

 
 

-  GetPrivateProfileString(m_strGroup, NULL, "",
-                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
-  if ( !::IsEmpty(szBuf) )
-    return FALSE;
+    GetPrivateProfileString(m_strGroup, NULL, "",
+                            szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
+    if ( !wxIsEmpty(szBuf) )
+        return false;

 
 

-  GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
-  if ( !::IsEmpty(szBuf) )
-    return FALSE;
+    GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
+    if ( !wxIsEmpty(szBuf) )
+        return false;

 
 

-  return TRUE;
+    return true;

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


@@ -294,17 +287,17 @@ bool wxIniConfig::DoReadString(const wxString& szKey, wxString *pstr) const
   // NB: the lpDefault param to GetPrivateProfileString can't be NULL
   GetPrivateProfileString(m_strGroup, strKey, "",
                           szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
   // NB: the lpDefault param to GetPrivateProfileString can't be NULL
   GetPrivateProfileString(m_strGroup, strKey, "",
                           szBuf, WXSIZEOF(szBuf), m_strLocalFilename);

-  if ( ::IsEmpty(szBuf) ) {
+  if ( wxIsEmpty(szBuf) ) {

     // now look in win.ini
     wxString strKey = GetKeyName(path.Name());
     GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
   }
 
     // now look in win.ini
     wxString strKey = GetKeyName(path.Name());
     GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
   }
 

-  if ( ::IsEmpty(szBuf) )
-    return FALSE;
+  if ( wxIsEmpty(szBuf) )
+    return false;

 
   *pstr = szBuf;
 
   *pstr = szBuf;

-  return TRUE;
+  return true;

 }
 
 bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
 }
 
 bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const


@@ -321,7 +314,7 @@ bool wxIniConfig::DoReadLong(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?
   }
 
   // is it really nMagic?


@@ -329,7 +322,7 @@ bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
   if ( lVal != nMagic2 ) {
     // the nMagic it returned was indeed read from the file
     *pl = lVal;
   if ( lVal != nMagic2 ) {
     // 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
   }
 
   // CS : I have no idea why they should look up in win.ini


@@ -339,9 +332,9 @@ bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
   // no, it was just returning the default value, so now look in win.ini
  *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl);
 
   // no, it was just returning the default value, so now look in win.ini
  *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl);
 

-  return TRUE;
+  return true;

 #endif
 #endif

-  return FALSE ;
+  return false ;

 }
 
 bool wxIniConfig::DoWriteString(const wxString& szKey, const wxString& szValue)
 }
 
 bool wxIniConfig::DoWriteString(const wxString& szKey, const wxString& szValue)


@@ -380,17 +373,15 @@ 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,
 
   // delete the current group too
   bool bOk = WritePrivateProfileString(m_strGroup, NULL,


@@ -441,26 +432,26 @@ bool wxIniConfig::DeleteAll()
   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& WXUNUSED(oldName),
                               const wxString& WXUNUSED(newName))
 {
     // Not implemented
 }
 
 bool wxIniConfig::RenameEntry(const wxString& WXUNUSED(oldName),
                               const wxString& WXUNUSED(newName))
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 
 bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName),
                               const wxString& WXUNUSED(newName))
 {
     // Not implemented
 }
 
 bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName),
                               const wxString& WXUNUSED(newName))
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 
 #endif
 }
 
 #endif