Enable variadic macros for VC9 and later.

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

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 8a97072e4be914469b198baea61f8e0373e0de1c..604a4529626ae012e3ab8990ecb758b6f734bbd6 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -16,7 +16,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_CONFIG
+#if wxUSE_INICONF

 
 #ifndef   WX_PRECOMP
     #include "wx/msw/wrapwin.h"
 
 #ifndef   WX_PRECOMP
     #include "wx/msw/wrapwin.h"


@@ -257,13 +257,13 @@ bool wxIniConfig::IsEmpty() const
 {
     wxChar szBuf[1024];
 
 {
     wxChar szBuf[1024];
 

-    GetPrivateProfileString(m_strGroup.wx_str(), NULL, _T(""),
+    GetPrivateProfileString(m_strGroup.wx_str(), NULL, wxT(""),

                             szBuf, WXSIZEOF(szBuf),
                             m_strLocalFilename.wx_str());
     if ( !wxIsEmpty(szBuf) )
         return false;
 
                             szBuf, WXSIZEOF(szBuf),
                             m_strLocalFilename.wx_str());
     if ( !wxIsEmpty(szBuf) )
         return false;
 

-    GetProfileString(m_strGroup.wx_str(), NULL, _T(""), szBuf, WXSIZEOF(szBuf));
+    GetProfileString(m_strGroup.wx_str(), NULL, wxT(""), szBuf, WXSIZEOF(szBuf));

     if ( !wxIsEmpty(szBuf) )
         return false;
 
     if ( !wxIsEmpty(szBuf) )
         return false;
 


@@ -284,14 +284,14 @@ bool wxIniConfig::DoReadString(const wxString& szKey, wxString *pstr) const
   // first look in the private INI file
 
   // NB: the lpDefault param to GetPrivateProfileString can't be NULL
   // first look in the private INI file
 
   // NB: the lpDefault param to GetPrivateProfileString can't be NULL

-  GetPrivateProfileString(m_strGroup.wx_str(), strKey.wx_str(), _T(""),
+  GetPrivateProfileString(m_strGroup.wx_str(), strKey.wx_str(), wxT(""),

                           szBuf, WXSIZEOF(szBuf),
                           m_strLocalFilename.wx_str());
   if ( wxIsEmpty(szBuf) ) {
     // now look in win.ini
     wxString strKey = GetKeyName(path.Name());
     GetProfileString(m_strGroup.wx_str(), strKey.wx_str(),
                           szBuf, WXSIZEOF(szBuf),
                           m_strLocalFilename.wx_str());
   if ( wxIsEmpty(szBuf) ) {
     // now look in win.ini
     wxString strKey = GetKeyName(path.Name());
     GetProfileString(m_strGroup.wx_str(), strKey.wx_str(),

-                     _T(""), szBuf, WXSIZEOF(szBuf));
+                     wxT(""), szBuf, WXSIZEOF(szBuf));

   }
 
   if ( wxIsEmpty(szBuf) )
   }
 
   if ( wxIsEmpty(szBuf) )


@@ -350,14 +350,16 @@ bool wxIniConfig::DoWriteString(const wxString& szKey, const wxString& szValue)
                                        m_strLocalFilename.wx_str()) != 0;
 
   if ( !bOk )
                                        m_strLocalFilename.wx_str()) != 0;
 
   if ( !bOk )

+  {

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

+  }

 
   return bOk;
 }
 
 bool wxIniConfig::DoWriteLong(const wxString& szKey, long lValue)
 {
 
   return bOk;
 }
 
 bool wxIniConfig::DoWriteLong(const wxString& szKey, long lValue)
 {

-  return Write(szKey, wxString::Format(_T("%ld"), lValue));
+  return Write(szKey, wxString::Format(wxT("%ld"), lValue));

 }
 
 bool wxIniConfig::DoReadBinary(const wxString& WXUNUSED(key),
 }
 
 bool wxIniConfig::DoReadBinary(const wxString& WXUNUSED(key),


@@ -405,7 +407,9 @@ bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso)
                                        NULL, m_strLocalFilename.wx_str()) != 0;
 
   if ( !bOk )
                                        NULL, m_strLocalFilename.wx_str()) != 0;
 
   if ( !bOk )

+  {

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

+  }

 
   return bOk;
 }
 
   return bOk;
 }


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

+  {

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

+  }

 
   return bOk;
 }
 
   return bOk;
 }


@@ -471,4 +477,4 @@ bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName),
     return false;
 }
 
     return false;
 }
 

-#endif // wxUSE_CONFIG
+#endif // wxUSE_INICONF