Fixed wxMessageBox with only an OK button returning wxCANCEL under MSW.

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

diff --git a/src/os2/iniconf.cpp b/src/os2/iniconf.cpp
index db81983a3a003ea68ab59d339c67d55cb6f3ee79..5b352380e66ab6481a771556fa26728202fc5b90 100644 (file)
--- a/src/os2/iniconf.cpp
+++ b/src/os2/iniconf.cpp
@@ -21,10 +21,9 @@
     #include  "wx/event.h"
     #include  "wx/app.h"
     #include  "wx/utils.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/log.h"
-

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


@@ -256,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;


@@ -282,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;
     }


@@ -311,14 +310,14 @@ bool wxIniConfig::Read(const wxString& szKey, wxString *pstr,
     // 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) )

     {
         *pstr = szDefault;
         return false;
     {
         *pstr = szDefault;
         return false;


@@ -373,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;
 }


@@ -418,7 +419,9 @@ bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso)
                       //                             NULL, m_strLocalFilename) != 0;
 
     if ( !bOk )
                       //                             NULL, m_strLocalFilename) != 0;
 
     if ( !bOk )

+    {

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

+    }

 
     return bOk;
 }
 
     return bOk;
 }


@@ -433,7 +436,9 @@ bool wxIniConfig::DeleteGroup(const wxString& szKey)
                     //                             NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )
                     //                             NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )

+  {

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

+  }

 
   return bOk;
 }
 
   return bOk;
 }