wxProcess-related code now works

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

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index ff65d00f8a3fdade858c87bdbe082f78bb36fb29..9bb3f31d92efe996126e6e2c5ac18a069f625133 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -23,7 +23,9 @@
 #ifndef   WX_PRECOMP
   #include  <wx/string.h>
   #include  <wx/intl.h>
 #ifndef   WX_PRECOMP
   #include  <wx/string.h>
   #include  <wx/intl.h>

+  #include  <wx/event.h>

   #include  <wx/app.h>
   #include  <wx/app.h>

+  #include  <wx/utils.h>

 #endif  //WX_PRECOMP
 
 #include  <wx/dynarray.h>
 #endif  //WX_PRECOMP
 
 #include  <wx/dynarray.h>


@@ -87,7 +89,7 @@ wxIniConfig::wxIniConfig(const wxString& strAppName, const wxString& strVendor,
     // 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('.') == wxNOT_FOUND )

     {
         m_strLocalFilename << ".ini";
     }
     {
         m_strLocalFilename << ".ini";
     }


@@ -152,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 == (const char*) 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 {


@@ -353,7 +355,7 @@ 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;


@@ -401,9 +403,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) )
+//  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;
 


@@ -459,3 +467,15 @@ bool wxIniConfig::DeleteAll()
 
   return TRUE;
 }
 
   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;
+}