add wxUSE_BASE64 checks around DoRead/WriteBinary() functions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 58f3b646fbc024aa5a37368cafc66e69237965aa..39d06305b844675df9a0a2e3e0f0eb25ac8d5588 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -178,10 +178,12 @@ public:
   bool Read(const wxString& key, bool* val) const;
   bool Read(const wxString& key, bool* val, bool defVal) const;
 
+#if wxUSE_BASE64
     // read a binary data block
   bool Read(const wxString& key, wxMemoryBuffer* data) const
-   { return DoReadBinary(key, data); }
+    { return DoReadBinary(key, data); }
    // no default version since it does not make sense for binary data
+#endif // wxUSE_BASE64
 
   // convenience functions returning directly the value (we don't have them for
   // int/double/bool as there would be ambiguities with the long one then)
@@ -208,8 +210,10 @@ public:
   bool Write(const wxString& key, bool value)
     { return DoWriteBool(key, value); }
 
+#if wxUSE_BASE64
   bool Write(const wxString& key, const wxMemoryBuffer& buf)
     { return DoWriteBinary(key, buf); }
+#endif // wxUSE_BASE64
 
   // we have to provide a separate version for C strings as otherwise they
   // would be converted to bool and not to wxString as expected!
@@ -282,14 +286,18 @@ protected:
   virtual bool DoReadInt(const wxString& key, int *pi) const;
   virtual bool DoReadDouble(const wxString& key, double* val) const;
   virtual bool DoReadBool(const wxString& key, bool* val) const;
+#if wxUSE_BASE64
   virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const = 0;
+#endif // wxUSE_BASE64
 
   virtual bool DoWriteString(const wxString& key, const wxString& value) = 0;
   virtual bool DoWriteLong(const wxString& key, long value) = 0;
   virtual bool DoWriteInt(const wxString& key, int value);
   virtual bool DoWriteDouble(const wxString& key, double value);
   virtual bool DoWriteBool(const wxString& key, bool value);
+#if wxUSE_BASE64
   virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) = 0;
+#endif // wxUSE_BASE64
 
 private:
   // are we doing automatic environment variable expansion?

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index 276ad96f8a726d42907b37d49bc8729dec6d8540..accb4e6fac0dccfc0c4e18b9f41ba37edc980bf5 100644 (file)
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -194,11 +194,15 @@ public:
 protected:
   virtual bool DoReadString(const wxString& key, wxString *pStr) const;
   virtual bool DoReadLong(const wxString& key, long *pl) const;
+#if wxUSE_BASE64
   virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const;
+#endif // wxUSE_BASE64
 
   virtual bool DoWriteString(const wxString& key, const wxString& szValue);
   virtual bool DoWriteLong(const wxString& key, long lValue);
+#if wxUSE_BASE64
   virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf);
+#endif // wxUSE_BASE64
 
 private:
   // GetXXXFileName helpers: return ('/' terminated) directory names

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 229e7a8b8d55109357947f3b0fe000647de8574a..7a82bf45aebc553ce04dfa65a3fa61053904d81c 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -918,6 +918,8 @@ bool wxFileConfig::DoReadLong(const wxString& key, long *pl) const
     return str.ToLong(pl);
 }
 
+#if wxUSE_BASE64
+
 bool wxFileConfig::DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const
 {
     wxCHECK_MSG( buf, false, _T("NULL buffer") );
@@ -930,6 +932,8 @@ bool wxFileConfig::DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const
     return true;
 }
 
+#endif // wxUSE_BASE64
+
 bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
 {
     wxConfigPathChanger     path(this, key);
@@ -995,11 +999,15 @@ bool wxFileConfig::DoWriteLong(const wxString& key, long lValue)
   return Write(key, wxString::Format(_T("%ld"), lValue));
 }
 
+#if wxUSE_BASE64
+
 bool wxFileConfig::DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf)
 {
   return Write(key, wxBase64Encode(buf));
 }
 
+#endif // wxUSE_BASE64
+
 bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 {
   if ( !IsDirty() || !m_fnLocalFile.GetFullPath() )