applying patch, fixes #10524

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

diff --git a/src/os2/iniconf.cpp b/src/os2/iniconf.cpp
index d5730815d09ac0dc0c25cb7d6eeccf902ee3ebd9..1aaa90877224a94525740fdc018fbefd5e0ab5d8 100644 (file)
--- a/src/os2/iniconf.cpp
+++ b/src/os2/iniconf.cpp
@@ -12,19 +12,19 @@
 // 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"
 


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


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


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