Add comment about wxBitmap::SetPalette() not being implemented

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

diff --git a/include/wx/archive.h b/include/wx/archive.h
index fb5a647383fd8efef88156239a2f10fb8dcc2d54..e6003c66cb784445ebecb9c4737350ac4353e773 100644 (file)
--- a/include/wx/archive.h
+++ b/include/wx/archive.h
@@ -67,6 +67,7 @@ public:
 
 protected:
     wxArchiveEntry() : m_notifier(NULL) { }
 
 protected:
     wxArchiveEntry() : m_notifier(NULL) { }

+    wxArchiveEntry(const wxArchiveEntry& e) : wxObject(e), m_notifier(NULL) { }

 
     virtual void SetOffset(wxFileOffset offset) = 0;
     virtual wxArchiveEntry* DoClone() const = 0;
 
     virtual void SetOffset(wxFileOffset offset) = 0;
     virtual wxArchiveEntry* DoClone() const = 0;


@@ -149,7 +150,6 @@ public:
     virtual bool CopyArchiveMetaData(wxArchiveInputStream& stream) = 0;
 
     virtual bool CloseEntry() = 0;
     virtual bool CopyArchiveMetaData(wxArchiveInputStream& stream) = 0;
 
     virtual bool CloseEntry() = 0;

-    virtual bool Close() = 0;

 
 protected:
     wxArchiveOutputStream(wxOutputStream& stream, wxMBConv& conv);
 
 protected:
     wxArchiveOutputStream(wxOutputStream& stream, wxMBConv& conv);


@@ -212,14 +212,14 @@ private:
 #include <iterator>
 #include <utility>
 
 #include <iterator>
 #include <utility>
 

-template <class X, class Y>
-void WXDLLIMPEXP_BASE _wxSetArchiveIteratorValue(
+template <class X, class Y> inline
+void _wxSetArchiveIteratorValue(

     X& val, Y entry, void *WXUNUSED(d))
 {
     val = X(entry);
 }
     X& val, Y entry, void *WXUNUSED(d))
 {
     val = X(entry);
 }

-template <class X, class Y, class Z>
-void WXDLLIMPEXP_BASE _wxSetArchiveIteratorValue(
+template <class X, class Y, class Z> inline
+void _wxSetArchiveIteratorValue(

     std::pair<X, Y>& val, Z entry, Z WXUNUSED(d))
 {
     val = std::make_pair(X(entry->GetInternalName()), Y(entry));
     std::pair<X, Y>& val, Z entry, Z WXUNUSED(d))
 {
     val = std::make_pair(X(entry->GetInternalName()), Y(entry));


@@ -230,7 +230,7 @@ template <class Arc, class T = Arc::entry_type*>
 #else
 template <class Arc, class T = typename Arc::entry_type*>
 #endif
 #else
 template <class Arc, class T = typename Arc::entry_type*>
 #endif

-class WXDLLIMPEXP_BASE wxArchiveIterator
+class wxArchiveIterator

 {
 public:
     typedef std::input_iterator_tag iterator_category;
 {
 public:
     typedef std::input_iterator_tag iterator_category;


@@ -284,14 +284,12 @@ public:
         return it;
     }
 
         return it;
     }
 

-    friend bool operator ==(const wxArchiveIterator& i,
-                            const wxArchiveIterator& j) {
-        return i.m_rep == j.m_rep;
+    bool operator ==(const wxArchiveIterator& j) const {
+        return m_rep == j.m_rep;

     }
 
     }
 

-    friend bool operator !=(const wxArchiveIterator& i,
-                            const wxArchiveIterator& j) {
-        return !(i == j);
+    bool operator !=(const wxArchiveIterator& j) const {
+        return !(*this == j);

     }
 
 private:
     }
 
 private: