restore the stream position in wxImageHandler itself instead of forcing all

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index a6107188c9419f6b6a9ac5a516b255d9ed5609eb..45ea8251d03830a30654293c25fae60f26b1f71a 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -46,10 +46,12 @@
 
 #include  "wx/utils.h"    // for wxGetHomeDir
 
 
 #include  "wx/utils.h"    // for wxGetHomeDir
 

-// _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(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
+
+#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


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

-
-  return str.ToLong(pl);
+  return str.ToLong(pl) ;

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