Compilation fix for old GCC versions.

[wxWidgets.git] / include / wx / fileconf.h

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index 5bb6b91fb12909c011fbb7eec99bf3f401415d6f..140b7071576452f273645771ba2897abf9236cd2 100644 (file)
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -13,10 +13,6 @@
 #ifndef   _FILECONF_H
 #define   _FILECONF_H
 
 #ifndef   _FILECONF_H
 #define   _FILECONF_H
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "fileconf.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_CONFIG
 #include "wx/defs.h"
 
 #if wxUSE_CONFIG


@@ -126,11 +122,11 @@ public:
                const wxString& localFilename = wxEmptyString,
                const wxString& globalFilename = wxEmptyString,
                long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE,
                const wxString& localFilename = wxEmptyString,
                const wxString& globalFilename = wxEmptyString,
                long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE,

-               wxMBConv& conv = wxConvUTF8);
+               const wxMBConv& conv = wxConvAuto());

 
 #if wxUSE_STREAMS
     // ctor that takes an input stream.
 
 #if wxUSE_STREAMS
     // ctor that takes an input stream.

-  wxFileConfig(wxInputStream &inStream, wxMBConv& conv = wxConvUTF8);
+  wxFileConfig(wxInputStream &inStream, const wxMBConv& conv = wxConvAuto());

 #endif // wxUSE_STREAMS
 
     // dtor will save unsaved data
 #endif // wxUSE_STREAMS
 
     // dtor will save unsaved data


@@ -173,7 +169,7 @@ public:
   // save the entire config file text to the given stream, note that the text
   // won't be saved again in dtor when Flush() is called if you use this method
   // as it won't be "changed" any more
   // save the entire config file text to the given stream, note that the text
   // won't be saved again in dtor when Flush() is called if you use this method
   // as it won't be "changed" any more

-  virtual bool Save(wxOutputStream& os, wxMBConv& conv = wxConvUTF8);
+  virtual bool Save(wxOutputStream& os, const wxMBConv& conv = wxConvAuto());

 #endif // wxUSE_STREAMS
 
 public:
 #endif // wxUSE_STREAMS
 
 public:


@@ -204,11 +200,15 @@ private:
   void CleanUp();
 
   // parse the whole file
   void CleanUp();
 
   // parse the whole file

-  void Parse(wxTextBuffer& buffer, bool bLocal);
+  void Parse(const wxTextBuffer& buffer, bool bLocal);

 
   // the same as SetPath("/")
   void SetRootPath();
 
 
   // the same as SetPath("/")
   void SetRootPath();
 

+  // real SetPath() implementation, returns true if path could be set or false
+  // if path doesn't exist and createMissingComponents == false
+  bool DoSetPath(const wxString& strPath, bool createMissingComponents);
+

   // set/test the dirty flag
   void SetDirty() { m_isDirty = true; }
   void ResetDirty() { m_isDirty = false; }
   // set/test the dirty flag
   void SetDirty() { m_isDirty = true; }
   void ResetDirty() { m_isDirty = false; }


@@ -227,7 +227,7 @@ private:
   wxFileConfigGroup *m_pRootGroup,      // the top (unnamed) group
                     *m_pCurrentGroup;   // the current group
 
   wxFileConfigGroup *m_pRootGroup,      // the top (unnamed) group
                     *m_pCurrentGroup;   // the current group
 

-  wxMBConv   &m_conv;
+  wxMBConv    *m_conv;

 
 #ifdef __UNIX__
   int m_umask;                          // the umask to use for file creation
 
 #ifdef __UNIX__
   int m_umask;                          // the umask to use for file creation