setting correct 'default' for m_filterIndex, closes #11541

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

diff --git a/src/os2/iniconf.cpp b/src/os2/iniconf.cpp
index 9e01efedbdaf5981636f56d778b0674fd6161281..5b352380e66ab6481a771556fa26728202fc5b90 100644 (file)
--- a/src/os2/iniconf.cpp
+++ b/src/os2/iniconf.cpp
@@ -4,6 +4,7 @@
 // Author:      David Webster
 // Modified by:
 // Created:     10/09/99
 // Author:      David Webster
 // Modified by:
 // Created:     10/09/99

+// RCS-ID:      $Id$

 // Copyright:   David Webster
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   David Webster
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -11,21 +12,21 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_CONFIG
+

 #ifndef   WX_PRECOMP
 #ifndef   WX_PRECOMP

-  #include  <wx/string.h>
-  #include  <wx/intl.h>
-  #include  <wx/event.h>
-  #include  <wx/app.h>
-  #include  <wx/utils.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
 
 #endif  //WX_PRECOMP
 

-#include  <wx/dynarray.h>
-#include  <wx/log.h>
+#include  "wx/config.h"

 
 

-#include  <wx/config.h>
-#if wxUSE_CONFIG
-
-#include  <wx/os2/iniconf.h>
+#include  "wx/os2/iniconf.h"

 
 #define INCL_PM
 #include  <os2.h>
 
 #define INCL_PM
 #include  <os2.h>


@@ -72,7 +73,7 @@ wxIniConfig::wxIniConfig(const wxString& strAppName,
     }
 
     // set root path
     }
 
     // set root path

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

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


@@ -254,11 +255,11 @@ bool wxIniConfig::IsEmpty() const
 
 //  GetPrivateProfileString(m_strGroup, NULL, "",
 //                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
 
 //  GetPrivateProfileString(m_strGroup, NULL, "",
 //                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);

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

         return false;
 
 //  GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
         return false;
 
 //  GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));

-//  if ( !::IsEmpty(szBuf) )
+//  if ( !::wxIsEmpty(szBuf) )

 //      return false;
 
     return true;
 //      return false;
 
     return true;


@@ -280,14 +281,14 @@ bool wxIniConfig::Read(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((PSZ)szBuf) )
+    if ( ::wxIsEmpty((PSZ)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((PSZ)szBuf) )
+    if ( ::wxIsEmpty((PSZ)szBuf) )

     {
         return false;
     }
     {
         return false;
     }


@@ -299,61 +300,67 @@ bool wxIniConfig::Read(const wxString& szKey, wxString *pstr) const
 bool wxIniConfig::Read(const wxString& szKey, wxString *pstr,
                        const wxString& szDefault) const
 {
 bool wxIniConfig::Read(const wxString& szKey, wxString *pstr,
                        const wxString& szDefault) const
 {

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

 
 

-  wxChar szBuf[1024]; // @@ should dynamically allocate memory...
+    wxChar szBuf[1024]; // @@ should dynamically allocate memory...

 
 

-  // first look in the private INI file
+    // 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((PSZ)szBuf) ) {
-    // now look in win.ini
-    wxString strKey = GetKeyName(path.Name());
-//    GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
-  }
+    // NB: the lpDefault param to GetPrivateProfileString can't be NULL
+    // GetPrivateProfileString(m_strGroup, strKey, "",
+    //                         szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
+    if ( ::wxIsEmpty((PSZ)szBuf) )
+    {
+      // now look in win.ini
+      wxString strKey = GetKeyName(path.Name());
+      // GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
+    }

 
 

-  if ( ::IsEmpty((PSZ)szBuf) ) {
-    *pstr = szDefault;
-    return FALSE;
-  }
-  else {
-    *pstr = szBuf ;
-    return TRUE;
-  }
+    if ( ::wxIsEmpty((PSZ)szBuf) )
+    {
+        *pstr = szDefault;
+        return false;
+    }
+    else
+    {
+        *pstr = szBuf ;
+        return true;
+    }

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

-  wxConfigPathChanger path(this, szKey);
-  wxString strKey = GetPrivateKeyName(path.Name());
-
-  // hack: we have no mean to know if it really found the default value or
-  // didn't find anything, so we call it twice
-
-  static const int nMagic  = 17; // 17 is some "rare" number
-  static const int nMagic2 = 28; // arbitrary number != nMagic
-  long lVal = 0; // = GetPrivateProfileInt(m_strGroup, strKey, nMagic, m_strLocalFilename);
-  if ( lVal != nMagic ) {
-    // the value was read from the file
-    *pl = lVal;
-    return TRUE;
-  }
+    wxConfigPathChanger path(this, szKey);
+    wxString strKey = GetPrivateKeyName(path.Name());

 
 

-  // is it really nMagic?
-//  lVal = GetPrivateProfileInt(m_strGroup, strKey, nMagic2, m_strLocalFilename);
-  if ( lVal == nMagic2 ) {
-    // the nMagic it returned was indeed read from the file
-    *pl = lVal;
-    return TRUE;
-  }
+    // hack: we have no mean to know if it really found the default value or
+    // didn't find anything, so we call it twice
+
+    static const int nMagic  = 17; // 17 is some "rare" number
+    static const int nMagic2 = 28; // arbitrary number != nMagic
+    long lVal = 0; // = GetPrivateProfileInt(m_strGroup, strKey, nMagic, m_strLocalFilename);
+
+    if ( lVal != nMagic )
+    {
+        // the value was read from the file
+        *pl = lVal;
+        return true;
+    }

 
 

-  // no, it was just returning the default value, so now look in win.ini
-//  *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl);
+    // is it really nMagic?
+    // lVal = GetPrivateProfileInt(m_strGroup, strKey, nMagic2, m_strLocalFilename);
+    if ( lVal == nMagic2 )
+    {
+        // the nMagic it returned was indeed read from the file
+        *pl = lVal;
+        return true;
+    }
+
+    // no, it was just returning the default value, so now look in win.ini
+    // *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl);

 
 

-  return TRUE;
+    return true;

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


@@ -365,7 +372,9 @@ bool wxIniConfig::Write(const wxString& szKey, const wxString& WXUNUSED(szValue)
 //                                       szValue, m_strLocalFilename) != 0;
 
     if ( !bOk )
 //                                       szValue, m_strLocalFilename) != 0;
 
     if ( !bOk )

+    {

         wxLogLastError(wxT("WritePrivateProfileString"));
         wxLogLastError(wxT("WritePrivateProfileString"));

+    }

 
     return bOk;
 }
 
     return bOk;
 }


@@ -381,9 +390,9 @@ bool wxIniConfig::Write(const wxString& szKey, long lValue)
 
 bool wxIniConfig::Flush(bool /* bCurrentOnly */)
 {
 
 bool wxIniConfig::Flush(bool /* bCurrentOnly */)
 {

-  // this is just the way it works
-//  return WritePrivateProfileString(NULL, NULL, NULL, m_strLocalFilename) != 0;
-  return FALSE;
+    // this is just the way it works
+    // return WritePrivateProfileString(NULL, NULL, NULL, m_strLocalFilename) != 0;
+    return false;

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


@@ -392,27 +401,29 @@ bool wxIniConfig::Flush(bool /* bCurrentOnly */)
 
 bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso)
 {
 
 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());
+    // 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());

 
 

-//  if (WritePrivateProfileString(m_strGroup, szKey,
-//                                         (const char*) NULL, m_strLocalFilename) == 0)
-//    return FALSE;
+    // if (WritePrivateProfileString(m_strGroup, szKey,
+    //                               (const char*) NULL, m_strLocalFilename) == 0)
+    //    return false;

 
 

-  if ( !bGroupIfEmptyAlso || !IsEmpty() )
-    return TRUE;
+    if ( !bGroupIfEmptyAlso || !IsEmpty() )
+        return true;

 
 

-  // delete the current group too
-  bool bOk = FALSE; // = WritePrivateProfileString(m_strGroup, NULL,
-//                                       NULL, m_strLocalFilename) != 0;
+    // delete the current group too
+    bool bOk = false; // = WritePrivateProfileString(m_strGroup, NULL,
+                      //                             NULL, m_strLocalFilename) != 0;

 
 

-  if ( !bOk )
-    wxLogLastError(wxT("WritePrivateProfileString"));
+    if ( !bOk )
+    {
+        wxLogLastError(wxT("WritePrivateProfileString"));
+    }

 
 

-  return bOk;
+    return bOk;

 }
 
 bool wxIniConfig::DeleteGroup(const wxString& szKey)
 }
 
 bool wxIniConfig::DeleteGroup(const wxString& szKey)


@@ -421,11 +432,13 @@ bool wxIniConfig::DeleteGroup(const wxString& szKey)
 
   // passing NULL as section name to WritePrivateProfileString deletes the
   // whole section according to the docs
 
   // passing NULL as section name to WritePrivateProfileString deletes the
   // whole section according to the docs

-  bool bOk = FALSE; // = WritePrivateProfileString(path.Name(), NULL,
-  //                                     NULL, m_strLocalFilename) != 0;
+  bool bOk = false; // = WritePrivateProfileString(path.Name(), NULL,
+                    //                             NULL, m_strLocalFilename) != 0;

 
   if ( !bOk )
 
   if ( !bOk )

+  {

     wxLogLastError(wxT("WritePrivateProfileString"));
     wxLogLastError(wxT("WritePrivateProfileString"));

+  }

 
   return bOk;
 }
 
   return bOk;
 }


@@ -436,30 +449,31 @@ bool wxIniConfig::DeleteGroup(const wxString& szKey)
 
 bool wxIniConfig::DeleteAll()
 {
 
 bool wxIniConfig::DeleteAll()
 {

-  // first delete our group in win.ini
-//  WriteProfileString(GetVendorName(), NULL, NULL);
+    // first delete our group in win.ini
+    // WriteProfileString(GetVendorName(), NULL, NULL);

 
 

-  // then delete our own ini file
-  wxChar szBuf[MAX_PATH];
-  size_t nRc = 0; // = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf));
-  if ( nRc == 0 )
-  {
-    wxLogLastError(wxT("GetWindowsDirectory"));
-  }
-  else if ( nRc > WXSIZEOF(szBuf) )
-  {
-    wxFAIL_MSG(_("buffer is too small for Windows directory."));
-  }
+    // then delete our own ini file
+    wxChar szBuf[MAX_PATH];
+    size_t nRc = 0; // = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf));
+    if ( nRc == 0 )
+    {
+        wxLogLastError(wxT("GetWindowsDirectory"));
+    }
+    else if ( nRc > WXSIZEOF(szBuf) )
+    {
+        wxFAIL_MSG(_("buffer is too small for Windows directory."));
+    }

 
 

-  wxString strFile = szBuf;
-  strFile << wxT('\\') << m_strLocalFilename;
+    wxString strFile = szBuf;
+    strFile << wxT('\\') << m_strLocalFilename;

 
 

-  if ( !wxRemoveFile(strFile) ) {
-    wxLogSysError(_("Can't delete the INI file '%s'"), strFile.c_str());
-    return FALSE;
-  }
+    if ( !wxRemoveFile(strFile) )
+    {
+        wxLogSysError(_("Can't delete the INI file '%s'"), strFile.c_str());
+        return false;
+    }

 
 

-  return TRUE;
+    return true;

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