don't declare inline function with dllexport declaration, this provokes mingw32 warni...

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

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 5761d72e1990f9ce3f43c378417bd09f2257529e..94f347b589a9a1fdc51889fc6c21294c49d2a466 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -21,26 +21,21 @@
 #if wxUSE_CONFIG && !wxUSE_UNICODE
 
 #ifndef   WX_PRECOMP
 #if wxUSE_CONFIG && !wxUSE_UNICODE
 
 #ifndef   WX_PRECOMP

-    #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/msw/wrapwin.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/log.h"

 #include  "wx/config.h"
 #include  "wx/file.h"
 
 #include  "wx/msw/iniconf.h"
 
 #include  "wx/config.h"
 #include  "wx/file.h"
 
 #include  "wx/msw/iniconf.h"
 

-// _WINDOWS_ is defined when windows.h is included,
-// __WXMSW__ is defined for MS Windows compilation
-#if       defined(__WXMSW__) && !defined(_WINDOWS_)
-  #include  "wx/msw/wrapwin.h"
-#endif  //windows.h
-

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -55,6 +50,7 @@
 // ----------------------------------------------------------------------------
 // ctor & dtor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ctor & dtor
 // ----------------------------------------------------------------------------

+IMPLEMENT_ABSTRACT_CLASS(wxIniConfig, wxConfigBase)

 
 wxIniConfig::wxIniConfig(const wxString& strAppName,
                          const wxString& strVendor,
 
 wxIniConfig::wxIniConfig(const wxString& strAppName,
                          const wxString& strVendor,


@@ -265,11 +261,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;


@@ -291,13 +287,13 @@ bool wxIniConfig::DoReadString(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(szBuf) ) {
+  if ( wxIsEmpty(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(szBuf) )
+  if ( wxIsEmpty(szBuf) )

     return false;
 
   *pstr = szBuf;
     return false;
 
   *pstr = szBuf;