Fixed filename in wxOSX-Cocoa's file dialog using extension of wrong file type.

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

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 87dd3b1053bfb68285c08bdf480ee64afd3c36d2..604a4529626ae012e3ab8990ecb758b6f734bbd6 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -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) )


@@ -359,7 +359,7 @@ bool wxIniConfig::DoWriteString(const wxString& szKey, const wxString& szValue)
 
 bool wxIniConfig::DoWriteLong(const wxString& szKey, long lValue)
 {
 
 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),