corrected passing const char * to a function taking char * (part of the patch 543892)

[wxWidgets.git] / src / common / fileconf.cpp

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index b6f357dc6e657a6633c27cf16175385eb0fdfc64..45ea8251d03830a30654293c25fae60f26b1f71a 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -50,10 +50,8 @@
   #include  "wx/mac/private.h"  // includes mac headers
 #endif
 
   #include  "wx/mac/private.h"  // includes mac headers
 #endif
 

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

 #endif  //windows.h
 #if defined(__WXPM__)
   #define INCL_DOS
 #endif  //windows.h
 #if defined(__WXPM__)
   #define INCL_DOS


@@ -844,8 +842,7 @@ bool wxFileConfig::DoReadLong(const wxString& key, long *pl) const
   {
     return FALSE;
   }
   {
     return FALSE;
   }

-  *pl = str.ToLong(pl) ;
-  return TRUE ;
+  return str.ToLong(pl) ;

 }
 
 bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
 }
 
 bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)