Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / palmos / prefconf.cpp

diff --git a/src/palmos/prefconf.cpp b/src/palmos/prefconf.cpp
index 5347007980bf8a1bb49c39c3a47d4d02cbc09d4c..d344e0333a8fad0557355cc5c0249f979a424727 100644 (file)
--- a/src/palmos/prefconf.cpp
+++ b/src/palmos/prefconf.cpp
@@ -6,7 +6,7 @@
 // Created:     28.12.2004
 // RCS-ID:      $Id$
 // Copyright:   (c) Wlodzimierz Skiba
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -178,11 +178,13 @@ bool wxPrefConfig::DoReadLong(const wxString& key, long *plResult) const
     return false;
 }
 
-bool DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const
+#if wxUSE_BASE64
+bool wxPrefConfig::DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const
 {
     /* TODO */
     return false;
 }
+#endif // wxUSE_BASE64
 
 bool wxPrefConfig::DoWriteString(const wxString& key, const wxString& szValue)
 {
@@ -196,11 +198,13 @@ bool wxPrefConfig::DoWriteLong(const wxString& key, long lValue)
     return false;
 }
 
-bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf)
+#if wxUSE_BASE64
+bool wxPrefConfig::DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf)
 {
     /* TODO */
     return false;
 }
+#endif // wxUSE_BASE64
 
 // ----------------------------------------------------------------------------
 // renaming